Merge pull request #367 from arvanus/master

Bunch of small fixes
mariuz · Jan 30, 2024 · 88e7d86 · 88e7d86
2 parents 717537a + e7533b2
commit 88e7d86
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,9 @@ The following people also made a significant non-coding contributions:
 * Alex Stanciu
 * Barbara Del Vecchio
 
+Notice:
+Now you can download latest Windows snapshot builds directly from the `Build Flamerobin for Windows` Action
+
 License
 ---------------------------
 FlameRobin code is licensed under the MIT license.

diff --git a/src/core/StringUtils.cpp b/src/core/StringUtils.cpp
@@ -259,7 +259,7 @@ wxString wrapText(const wxString& text, size_t maxWidth, size_t indent)
             if (lastSpace != text.end())
             {
                 size_t width = line.Length();
-                if (width > maxWidth - indentStr.Length())
+                if ((width > maxWidth - indentStr.Length()) && (wrapState == none))
                 {
                     // remove the last word from this line
                     line.erase(lastSpace - lineStart, it + 1 - lineStart);

diff --git a/src/gui/ExecuteSqlFrame.cpp b/src/gui/ExecuteSqlFrame.cpp
@@ -2495,14 +2495,18 @@ bool ExecuteSqlFrame::execute(wxString sql, const wxString& terminator,
                         databaseM->getCharsetConverter()));
                     wxString aliasname(std2wxIdentifier(statementM->ColumnAlias(i),
                         databaseM->getCharsetConverter()));
-                    log(wxString::Format(_("Field #%02d: %s.%s Alias:%s Type:%s"),
+                    log(wxString::Format(_("Field #%02d: %s.%s Alias:%s Type:%s sqlype: %d subtype: %d len: %d scale: %d"),
                         i, tablename.c_str(), colname.c_str(), aliasname.c_str(),
                         IBPPtype2string(
                             databaseM,
                             statementM->ColumnType(i),
                             statementM->ColumnSubtype(i),
                             statementM->ColumnSize(i),
-                            statementM->ColumnScale(i)).c_str()
+                            statementM->ColumnScale(i)).c_str(),
+                            statementM->ColumnSQLType(i),
+                            statementM->ColumnSubtype(i),
+                            statementM->ColumnSize(i),
+                            statementM->ColumnScale(i)
                         ), ttSql);
                 }
             }

diff --git a/src/gui/InsertParametersDialog.cpp b/src/gui/InsertParametersDialog.cpp
@@ -686,6 +686,7 @@ void InsertParametersDialog::OnOkButtonClick(wxCommandEvent& WXUNUSED(event))
             row = (*it)-1;
             IBPP::SDT parameterType = statementM->ParameterType(parameterslist.back()); //statementM->ParameterType(row + 1);
             int subtype = statementM->ParameterSubtype(parameterslist.back());
+            int scale = statementM->ParameterScale(parameterslist.back());
 
             if (sel == ioNull)
             {
@@ -780,6 +781,14 @@ void InsertParametersDialog::OnOkButtonClick(wxCommandEvent& WXUNUSED(event))
                 statementM->Set(row + 1, (int)d1);
                 break;
             case IBPP::SDT::sdLargeint:
+                if (scale != 0)
+                {
+                    double d3;
+                    if (!value.ToDouble(&d3))
+                        throw FRError(_("Invalid float numeric value"));
+                    statementM->Set(row + 1, (float)d3);
+                    break;
+                }
                 wxLongLong_t d2;
                 if (!value.ToLongLong(&d2))
                     throw FRError(_("Invalid large integer value"));

diff --git a/src/ibpp/_ibpp.h b/src/ibpp/_ibpp.h
@@ -1072,6 +1072,7 @@ class RowImpl : public IBPP::IRow
     const char* ColumnAlias(int);
     const char* ColumnTable(int);
     IBPP::SDT ColumnType(int);
+    int ColumnSQLType(int);
     int ColumnSubtype(int);
     int ColumnSize(int);
     int ColumnScale(int);
@@ -1241,6 +1242,7 @@ class StatementImpl : public IBPP::IStatement
     const char* ColumnAlias(int);
     const char* ColumnTable(int);
     IBPP::SDT ColumnType(int);
+    int ColumnSQLType(int);
     int ColumnSubtype(int);
     int ColumnSize(int);
     int ColumnScale(int);

diff --git a/src/ibpp/ibpp.h b/src/ibpp/ibpp.h
@@ -935,6 +935,7 @@ namespace IBPP
         virtual const char* ColumnAlias(int) = 0;
         virtual const char* ColumnTable(int) = 0;
         virtual SDT ColumnType(int) = 0;
+        virtual int ColumnSQLType(int) = 0;
         virtual int ColumnSubtype(int) = 0;
         virtual int ColumnSize(int) = 0;
         virtual int ColumnScale(int) = 0;

diff --git a/src/ibpp/row.cpp b/src/ibpp/row.cpp
@@ -733,6 +733,18 @@ const char* RowImpl::ColumnTable(int varnum)
 	return var->relname;
 }
 
+int RowImpl::ColumnSQLType(int varnum)
+{
+    if (mDescrArea == 0)
+        throw LogicExceptionImpl("Row::ColumnType", _("The row is not initialized."));
+    if (varnum < 1 || varnum > mDescrArea->sqld)
+        throw LogicExceptionImpl("Row::ColumnType", _("Variable index out of range."));
+
+    IBPP::SDT value;
+    XSQLVAR* var = &(mDescrArea->sqlvar[varnum - 1]);
+    return var->sqltype & ~1;
+}
+
 IBPP::SDT RowImpl::ColumnType(int varnum)
 {
 	if (mDescrArea == 0)

diff --git a/src/ibpp/statement.cpp b/src/ibpp/statement.cpp
@@ -1474,6 +1474,16 @@ const char* StatementImpl::ColumnTable(int varnum)
 	return mOutRow->ColumnTable(varnum);
 }
 
+int StatementImpl::ColumnSQLType(int varnum)
+{
+    if (mHandle == 0)
+        throw LogicExceptionImpl("Statement::ColumnType", _("No statement has been prepared."));
+    if (mOutRow == 0)
+        throw LogicExceptionImpl("Statement::ColumnType", _("The statement does not return results."));
+
+    return mOutRow->ColumnSQLType(varnum);
+}
+
 IBPP::SDT StatementImpl::ColumnType(int varnum)
 {
 	if (mHandle == 0)