Merge pull request #872 from MonsieurNicolas/sociFix

prepare statement soci fix Reviewed-by: jedmccaleb
stellar · Oct 21, 2015 · 0a50758 · 0a50758
2 parents f105538 + 54c018b
commit 0a50758
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/lib/soci/src/backends/sqlite3/statement.cpp b/lib/soci/src/backends/sqlite3/statement.cpp
@@ -193,6 +193,7 @@ sqlite3_statement_backend::bind_and_execute(int number)
     statement_backend::exec_fetch_result retVal = ef_no_data;
 
     long long rowsAffectedBulkTemp = 0;
+    rowsAffectedBulk_ = -1;
 
     int const rows = static_cast<int>(useData_.size());
     for (int row = 0; row < rows; ++row)

diff --git a/src/database/Database.cpp b/src/database/Database.cpp
@@ -123,9 +123,9 @@ Database::upgradeToCurrentSchema()
         CLOG(INFO, "Database") << "Applying DB schema upgrade to version "
                                << vers;
         applySchemaUpgrade(*this, vers);
+        putSchemaVersion(vers);
     }
     assert(vers == SCHEMA_VERSION);
-    putSchemaVersion(SCHEMA_VERSION);
 }
 
 void

diff --git a/src/main/Config.cpp b/src/main/Config.cpp
@@ -301,6 +301,15 @@ Config::load(std::string const& filename)
                 }
                 ARTIFICIALLY_SET_CLOSE_TIME_FOR_TESTING = (uint32_t)f;
             }
+            else if (item.first == "ALLOW_LOCALHOST_FOR_TESTING")
+            {
+                if (!item.second->as<bool>())
+                {
+                    throw std::invalid_argument(
+                        "invalid ALLOW_LOCALHOST_FOR_TESTING");
+                }
+                ALLOW_LOCALHOST_FOR_TESTING = item.second->as<bool>()->value();
+            }
             else if (item.first == "MANUAL_CLOSE")
             {
                 if (!item.second->as<bool>())