From bab43e7902f033bb30fd0622c51932f53e693f98 Mon Sep 17 00:00:00 2001 From: MonsieurNicolas Date: Tue, 20 Oct 2015 14:14:14 -0700 Subject: [PATCH 1/3] update schema version as updates are applied --- src/database/Database.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/database/Database.cpp b/src/database/Database.cpp index ccfbc0fc47..cdce973095 100644 --- 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 From e8627acd470d680c90bb1c20a47186988e90d332 Mon Sep 17 00:00:00 2001 From: MonsieurNicolas Date: Tue, 20 Oct 2015 14:15:08 -0700 Subject: [PATCH 2/3] make it possible to set ALLOW_LOCALHOST_FOR_TESTING from the config file useful when running multiple instances locally --- src/main/Config.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/Config.cpp b/src/main/Config.cpp index 86aaed1acc..d1dfe6c365 100644 --- 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()) + { + throw std::invalid_argument( + "invalid ALLOW_LOCALHOST_FOR_TESTING"); + } + ALLOW_LOCALHOST_FOR_TESTING = item.second->as()->value(); + } else if (item.first == "MANUAL_CLOSE") { if (!item.second->as()) From 54c018bcfe5dea4fd5ff24424a65f0937d4c7186 Mon Sep 17 00:00:00 2001 From: MonsieurNicolas Date: Tue, 20 Oct 2015 14:16:00 -0700 Subject: [PATCH 3/3] soci bug fix: get_affected_rows was broken when re-using prepared statements --- lib/soci/src/backends/sqlite3/statement.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/soci/src/backends/sqlite3/statement.cpp b/lib/soci/src/backends/sqlite3/statement.cpp index 9192a4c4d9..1129b9853f 100644 --- 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(useData_.size()); for (int row = 0; row < rows; ++row)