From d76fc20498a0c0d771976936c51e5e96923f368c Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 1 Jan 2017 21:18:09 +0000 Subject: Force mock DB names to lower case --- libpqpp/pq-mock.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libpqpp/pq-mock.cpp') diff --git a/libpqpp/pq-mock.cpp b/libpqpp/pq-mock.cpp index f72c01f..2d081d1 100644 --- a/libpqpp/pq-mock.cpp +++ b/libpqpp/pq-mock.cpp @@ -4,6 +4,7 @@ #include #include #include +#include NAMEDFACTORY("postgresql", PQ::Mock, DB::MockDatabaseFactory); @@ -21,7 +22,7 @@ AdHocFormatter(MockConnStr, "user=postgres dbname=%?"); DB::Connection * Mock::openConnection() const { - return new Connection(MockConnStr::get(testDbName)); + return new Connection(MockConnStr::get(boost::algorithm::to_lower_copy(testDbName))); } AdHocFormatter(MockSetUnlogged, "ALTER TABLE %?.%? SET UNLOGGED"); @@ -29,7 +30,7 @@ void Mock::SetTablesToUnlogged() const { auto c = DB::ConnectionPtr(openConnection()); - auto s = c->select(R"SQL( + auto s = c->select(R"SQL( SELECT n.nspname, c.relname FROM pg_class c, pg_namespace n WHERE c.relkind = 'r' @@ -64,7 +65,7 @@ Mock::~Mock() void Mock::DropDatabase() const { - auto t = master->modify("SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = ?"); + auto t = master->modify("SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE LOWER(datname) = LOWER(?)"); t->bindParamS(0, testDbName); t->execute(); MockServerDatabase::DropDatabase(); -- cgit v1.2.3