From 5cad99a7040fc6610a5ca5ed08cf81915f732faa Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Fri, 30 Jun 2017 16:51:07 +0200 Subject: [PATCH] fix test table name --- Data/MySQL/testsuite/src/MySQLTest.cpp | 4 +- Data/ODBC/testsuite/src/ODBCDB2Test.cpp | 4 +- Data/ODBC/testsuite/src/ODBCMySQLTest.cpp | 4 +- Data/ODBC/testsuite/src/ODBCOracleTest.cpp | 36 +++++++-------- .../ODBC/testsuite/src/ODBCPostgreSQLTest.cpp | 4 +- Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp | 4 +- Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp | 4 +- Data/ODBC/testsuite/src/ODBCSybaseTest.cpp | 4 +- Data/ODBC/testsuite/src/SQLExecutor.cpp | 44 +++++++++---------- Data/ODBC/testsuite/src/SQLExecutor.h | 5 +++ .../testsuite/src/PostgreSQLTest.cpp | 4 +- 11 files changed, 61 insertions(+), 56 deletions(-) diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp index f8db41c99..18c932227 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.cpp +++ b/Data/MySQL/testsuite/src/MySQLTest.cpp @@ -793,8 +793,8 @@ void MySQLTest::recreatePersonTimeTable() void MySQLTest::recreateIntsTable() { - dropTable("Strings"); - try { *_pSession << "CREATE TABLE Strings (str INTEGER)", now; } + dropTable("Ints"); + try { *_pSession << "CREATE TABLE Ints (str INTEGER)", now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateIntsTable()"); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateIntsTable()"); } } diff --git a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp index 9dd16d3d9..cef5e8cb2 100644 --- a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp +++ b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp @@ -626,8 +626,8 @@ void ODBCDB2Test::recreatePersonDateTimeTable() void ODBCDB2Test::recreateIntsTable() { - dropObject("TABLE", ExecUtil::strings()); - try { session() << "CREATE TABLE " << ExecUtil::strings() << " (str INTEGER)", now; } + dropObject("TABLE", ExecUtil::ints()); + try { session() << "CREATE TABLE " << ExecUtil::ints() << " (str INTEGER)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateIntsTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateIntsTable()"); } } diff --git a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp index 58fe6dc31..b977418e1 100644 --- a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp @@ -304,8 +304,8 @@ void ODBCMySQLTest::recreatePersonDateTimeTable() void ODBCMySQLTest::recreateIntsTable() { - dropObject("TABLE", ExecUtil::strings()); - try { *_pSession << "CREATE TABLE " << ExecUtil::strings() << " (str INTEGER)", now; } + dropObject("TABLE", ExecUtil::ints()); + try { *_pSession << "CREATE TABLE " << ExecUtil::ints() << " (str INTEGER)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateIntsTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateIntsTable()"); } } diff --git a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp index 375f6fd2f..a1913e0eb 100644 --- a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp @@ -617,18 +617,18 @@ void ODBCOracleTest::testAutoTransaction() recreateIntsTable(); session().setFeature("autoCommit", true); - session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (1)", now; - localSession << "SELECT count(*) FROM " << ExecUtil::person() , into(count), now; + session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (1)", now; + localSession << "SELECT count(*) FROM " << ExecUtil::ints() , into(count), now; assert (1 == count); - session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (2)", now; - localSession << "SELECT count(*) FROM " << ExecUtil::strings(), into(count), now; + session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (2)", now; + localSession << "SELECT count(*) FROM " << ExecUtil::ints(), into(count), now; assert (2 == count); - session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (3)", now; - localSession << "SELECT count(*) FROM " << ExecUtil::strings(), into(count), now; + session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (3)", now; + localSession << "SELECT count(*) FROM " << ExecUtil::ints(), into(count), now; assert (3 == count); - session() << "DELETE FROM " << ExecUtil::strings(), now; - localSession << "SELECT count(*) FROM " << ExecUtil::strings(), into(count), now; + session() << "DELETE FROM " << ExecUtil::ints(), now; + localSession << "SELECT count(*) FROM " << ExecUtil::ints(), into(count), now; assert (0 == count); session().setFeature("autoCommit", false); @@ -636,26 +636,26 @@ void ODBCOracleTest::testAutoTransaction() try { AutoTransaction at(session()); - session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (1)", now; - session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (2)", now; + session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (1)", now; + session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (2)", now; session() << "BAD QUERY", now; } catch (Poco::Exception&) {} - session() << "SELECT count(*) FROM " << ExecUtil::strings(), into(count), now; + session() << "SELECT count(*) FROM " << ExecUtil::ints(), into(count), now; assert (0 == count); AutoTransaction at(session()); - session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (1)", now; - session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (2)", now; - session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (3)", now; + session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (1)", now; + session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (2)", now; + session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (3)", now; - localSession << "SELECT count(*) FROM " << ExecUtil::strings(), into(count), now; + localSession << "SELECT count(*) FROM " << ExecUtil::ints(), into(count), now; assert (0 == count); at.commit(); - localSession << "SELECT count(*) FROM " << ExecUtil::strings(), into(count), now; + localSession << "SELECT count(*) FROM " << ExecUtil::ints(), into(count), now; assert (3 == count); session().setFeature("autoCommit", ac); @@ -745,8 +745,8 @@ void ODBCOracleTest::recreatePersonDateTable() void ODBCOracleTest::recreateIntsTable() { - dropObject("TABLE", ExecUtil::strings()); - try { *_pSession << "CREATE TABLE " << ExecUtil::strings() <<" (str INTEGER)", now; } + dropObject("TABLE", ExecUtil::ints()); + try { *_pSession << "CREATE TABLE " << ExecUtil::ints() <<" (str INTEGER)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateIntsTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateIntsTable()"); } } diff --git a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp index 67ca19b12..e13345376 100644 --- a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp @@ -482,8 +482,8 @@ void ODBCPostgreSQLTest::recreatePersonTimeTable() void ODBCPostgreSQLTest::recreateIntsTable() { - dropObject("TABLE", ExecUtil::strings()); - try { session() << "CREATE TABLE " << ExecUtil::strings() <<" (str INTEGER)", now; } + dropObject("TABLE", ExecUtil::ints()); + try { session() << "CREATE TABLE " << ExecUtil::ints() <<" (str INTEGER)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateIntsTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateIntsTable()"); } } diff --git a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp index 2b95ab449..d08cf03d3 100644 --- a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp @@ -589,8 +589,8 @@ void ODBCSQLServerTest::recreatePersonDateTimeTable() void ODBCSQLServerTest::recreateIntsTable() { - dropObject("TABLE", ExecUtil::strings()); - try { session() << "CREATE TABLE " << ExecUtil::strings() <<" (str INTEGER)", now; } + dropObject("TABLE", ExecUtil::ints()); + try { session() << "CREATE TABLE " << ExecUtil::ints() <<" (str INTEGER)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateIntsTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateIntsTable()"); } } diff --git a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp index 4e7b600c9..91a0f50a5 100644 --- a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp @@ -205,8 +205,8 @@ void ODBCSQLiteTest::recreatePersonDateTimeTable() void ODBCSQLiteTest::recreateIntsTable() { - dropObject("TABLE", ExecUtil::strings()); - try { session() << "CREATE TABLE " << ExecUtil::strings() <<" (str INTEGER)", now; } + dropObject("TABLE", ExecUtil::ints()); + try { session() << "CREATE TABLE " << ExecUtil::ints() <<" (str INTEGER)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateIntsTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateIntsTable()"); } } diff --git a/Data/ODBC/testsuite/src/ODBCSybaseTest.cpp b/Data/ODBC/testsuite/src/ODBCSybaseTest.cpp index 145e60386..87debf885 100644 --- a/Data/ODBC/testsuite/src/ODBCSybaseTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSybaseTest.cpp @@ -205,8 +205,8 @@ void SybaseODBC::recreatePersonDateTimeTable() void SybaseODBC::recreateIntsTable() { - dropObject("TABLE", ExecUtil::strings()); - try { session() << "CREATE TABLE " << ExecUtil::strings() << " (str INTEGER)", now; } + dropObject("TABLE", ExecUtil::ints()); + try { session() << "CREATE TABLE " << ExecUtil::ints() << " (str INTEGER)", now; } catch (ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail("recreateIntsTable()"); } catch (StatementException& se){ std::cout << se.toString() << std::endl; fail("recreateIntsTable()"); } } diff --git a/Data/ODBC/testsuite/src/SQLExecutor.cpp b/Data/ODBC/testsuite/src/SQLExecutor.cpp index 6b20e153b..0791909a4 100644 --- a/Data/ODBC/testsuite/src/SQLExecutor.cpp +++ b/Data/ODBC/testsuite/src/SQLExecutor.cpp @@ -1517,7 +1517,7 @@ void SQLExecutor::insertSingleBulk() { std::string funct = "insertSingleBulk()"; int x = 0; - Statement stmt((session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (?)", use(x))); + Statement stmt((session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (?)", use(x))); for (x = 0; x < 100; ++x) { @@ -1525,12 +1525,12 @@ void SQLExecutor::insertSingleBulk() assert (1 == i); } int count = 0; - try { session() << "SELECT COUNT(*) FROM " << ExecUtil::strings(), into(count), now; } + try { session() << "SELECT COUNT(*) FROM " << ExecUtil::ints(), into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 100); - try { session() << "SELECT SUM(str) FROM " << ExecUtil::strings(), into(count), now; } + try { session() << "SELECT SUM(str) FROM " << ExecUtil::ints(), into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == ((0+99)*100/2)); @@ -1591,16 +1591,16 @@ void SQLExecutor::insertSingleBulkVec() for (int x = 0; x < 100; ++x) data.push_back(x); - Statement stmt((session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (?)", use(data))); + Statement stmt((session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (?)", use(data))); stmt.execute(); int count = 0; - try { session() << "SELECT COUNT(*) FROM " << ExecUtil::strings(), into(count), now; } + try { session() << "SELECT COUNT(*) FROM " << ExecUtil::ints(), into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 100); - try { session() << "SELECT SUM(str) FROM " << ExecUtil::strings(), into(count), now; } + try { session() << "SELECT SUM(str) FROM " << ExecUtil::ints(), into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == ((0+99)*100/2)); @@ -1616,12 +1616,12 @@ void SQLExecutor::limits() data.push_back(x); } - try { session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (?)", use(data), now; } + try { session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (?)", use(data), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } std::vector retData; - try { session() << "SELECT * FROM " << ExecUtil::strings(), into(retData), limit(50), now; } + try { session() << "SELECT * FROM " << ExecUtil::ints(), into(retData), limit(50), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (retData.size() == 50); @@ -1641,12 +1641,12 @@ void SQLExecutor::limitZero() data.push_back(x); } - try { session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (?)", use(data), now; } + try { session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (?)", use(data), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } std::vector retData; - try { session() << "SELECT * FROM " << ExecUtil::strings(), into(retData), limit(0), now; }// stupid test, but at least we shouldn't crash + try { session() << "SELECT * FROM " << ExecUtil::ints(), into(retData), limit(0), now; }// stupid test, but at least we shouldn't crash catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (retData.size() == 0); @@ -1662,12 +1662,12 @@ void SQLExecutor::limitOnce() data.push_back(x); } - try { session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (?)", use(data), now; } + try { session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (?)", use(data), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } std::vector retData; - Statement stmt = (session() << "SELECT * FROM " << ExecUtil::strings(), into(retData), limit(50), now); + Statement stmt = (session() << "SELECT * FROM " << ExecUtil::ints(), into(retData), limit(50), now); assert (!stmt.done()); assert (retData.size() == 50); stmt.execute(); @@ -1695,14 +1695,14 @@ void SQLExecutor::limitPrepare() try { - Statement stmt = (session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (?)", use(data)); + Statement stmt = (session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (?)", use(data)); assert (100 == stmt.execute()); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } std::vector retData; - Statement stmt = (session() << "SELECT * FROM " << ExecUtil::strings(), into(retData), limit(50)); + Statement stmt = (session() << "SELECT * FROM " << ExecUtil::ints(), into(retData), limit(50)); assert (retData.size() == 0); assert (!stmt.done()); @@ -1738,12 +1738,12 @@ void SQLExecutor::prepare() } { - Statement stmt((session() << "INSERT INTO " << ExecUtil::strings() << " VALUES (?)", use(data))); + Statement stmt((session() << "INSERT INTO " << ExecUtil::ints() << " VALUES (?)", use(data))); } // stmt should not have been executed when destroyed int count = 100; - try { session() << "SELECT COUNT(*) FROM " << ExecUtil::strings(), into(count), now; } + try { session() << "SELECT COUNT(*) FROM " << ExecUtil::ints(), into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 0); @@ -3265,12 +3265,12 @@ void SQLExecutor::asynchronous(int rowCount) if (!_connInitSql.empty()) tmp << _connInitSql, now; std::vector data(rowCount); - Statement stmt = (tmp << "INSERT INTO " << ExecUtil::strings() << " VALUES(?)", use(data)); + Statement stmt = (tmp << "INSERT INTO " << ExecUtil::ints() << " VALUES(?)", use(data)); Statement::Result result = stmt.executeAsync(); assert (!stmt.isAsync()); result.wait(); - Statement stmt1 = (tmp << "SELECT * FROM " << ExecUtil::strings(), into(data), async, now); + Statement stmt1 = (tmp << "SELECT * FROM " << ExecUtil::ints(), into(data), async, now); assert (stmt1.isAsync()); assert (stmt1.wait() == rowCount); @@ -3288,7 +3288,7 @@ void SQLExecutor::asynchronous(int rowCount) } // --- - stmt = tmp << "SELECT * FROM " << ExecUtil::strings(), into(data), async, now; + stmt = tmp << "SELECT * FROM " << ExecUtil::ints(), into(data), async, now; assert (stmt.isAsync()); stmt.wait(); assert (stmt.execute() == 0); @@ -3312,7 +3312,7 @@ void SQLExecutor::asynchronous(int rowCount) assert (!stmt.isAsync()); assert (stmt.execute() == rowCount); - stmt = tmp << "SELECT * FROM " << ExecUtil::strings(), into(data), sync, now; + stmt = tmp << "SELECT * FROM " << ExecUtil::ints(), into(data), sync, now; assert (!stmt.isAsync()); assert (stmt.wait() == 0); assert (stmt.execute() == rowCount); @@ -3324,7 +3324,7 @@ void SQLExecutor::asynchronous(int rowCount) assert (0 == rowCount % 10); int step = (int) (rowCount/10); data.clear(); - Statement stmt2 = (tmp << "SELECT * FROM " << ExecUtil::strings(), into(data), async, limit(step)); + Statement stmt2 = (tmp << "SELECT * FROM " << ExecUtil::ints(), into(data), async, limit(step)); assert (data.size() == 0); assert (!stmt2.done()); std::size_t rows = 0; @@ -3339,7 +3339,7 @@ void SQLExecutor::asynchronous(int rowCount) assert (stmt2.done()); assert (rowCount == data.size()); - stmt2 = tmp << "SELECT * FROM " << ExecUtil::strings(), reset; + stmt2 = tmp << "SELECT * FROM " << ExecUtil::ints(), reset; assert (!stmt2.isAsync()); assert ("deque" == stmt2.getStorage()); assert (stmt2.execute() == rowCount); diff --git a/Data/ODBC/testsuite/src/SQLExecutor.h b/Data/ODBC/testsuite/src/SQLExecutor.h index 317ad12e0..137f3e342 100644 --- a/Data/ODBC/testsuite/src/SQLExecutor.h +++ b/Data/ODBC/testsuite/src/SQLExecutor.h @@ -88,6 +88,11 @@ struct ExecUtil return mangleTable("Strings"); } + static std::string ints() + { + return mangleTable("Ints"); + } + static std::string tuples() { return mangleTable("Tuples"); diff --git a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp index c78b04cc7..deef3f3fa 100644 --- a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp +++ b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp @@ -952,8 +952,8 @@ void PostgreSQLTest::recreatePersonTimeTable() void PostgreSQLTest::recreateIntsTable() { - dropTable("Strings"); - try { *_pSession << "CREATE TABLE Strings (str INTEGER)", now; } + dropTable("Ints"); + try { *_pSession << "CREATE TABLE " << ExecUtil::ints() << " (str INTEGER)", now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateIntsTable()"); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateIntsTable()"); } }