VladPolskiy/mariadb-connector-cpp
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-cpp.git synced 2025-08-05 18:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build fix

Browse Source 
Lately to fix one test build with certain VS version, not portable
change has been made, that broke build on other platforms.

Fix of couple of tests for older server versions.
This commit is contained in:
Lawrin Novitsky
2020-11-30 14:42:22 +01:00
parent d6e84b938f
commit c03f6aa5e5
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/unit/bugs/bugs.cpp
View File

@ -545,7 +545,7 @@ void bugs::bug72700()
res.reset(stmt->getResultSet());
checkResultSetScrolling(res);
ResultSetMetaData meta(res->getMetaData());
ASSERT_EQUALS((getServerVersion(con) < 102000 || getServerVersion(con) > 103000) ? sql::Types::LONGVARCHAR : sql::Types::VARCHAR, meta->getColumnType(1));
ASSERT_EQUALS((getServerVersion(con) > 103000) ? sql::Types::LONGVARCHAR : sql::Types::VARCHAR, meta->getColumnType(1));
ASSERT_EQUALS("LONGTEXT", meta->getColumnTypeName(1));
}
catch (::sql::SQLException & /*e*/)
@ -1096,6 +1096,10 @@ void bugs::bug21152054()
void bugs::bug22292073()
{
if ((getServerVersion(con) < 102000))
{
SKIP("Server does not support tested functionality(JSON type)")
}
stmt->execute("DROP TABLE IF EXISTS bug22292073");
stmt->execute("create table bug22292073 (jdoc JSON);" );
stmt->execute("insert into bug22292073 values('{ \"name\": \"abc\", \"age\": 1 , \"misc\":\

13
test/unit/classes/statement.cpp
View File

@ -616,6 +616,7 @@ void statement::queryTimeout()
void statement::addBatch()
{
Statement st2(con->createStatement());
stmt->executeUpdate("DROP TABLE IF EXISTS testAddBatch");
stmt->executeUpdate("CREATE TABLE testAddBatch "
"(id int not NULL)");
@ -626,12 +627,7 @@ void statement::addBatch()
const sql::Ints& batchRes= stmt->executeBatch();
ASSERT_EQUALS(3UI64, static_cast<uint64_t>(batchRes.size()));
ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[0]);
ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[1]);
ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[2]);
res.reset(stmt->executeQuery("SELECT MIN(id), MAX(id), SUM(id), count(*) FROM testAddBatch"));
res.reset(st2->executeQuery("SELECT MIN(id), MAX(id), SUM(id), count(*) FROM testAddBatch"));
ASSERT(res->next());
@ -639,9 +635,12 @@ void statement::addBatch()
ASSERT_EQUALS(3, res->getInt(2));
ASSERT_EQUALS(6, res->getInt(3));
ASSERT_EQUALS(3, res->getInt(4));
ASSERT_EQUALS(3ULL, static_cast<uint64_t>(batchRes.size()));
ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[0]);
ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[1]);
ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[2]);
stmt->executeUpdate("DROP TABLE IF EXISTS testAddBatch");
}
} /* namespace statement */