forked from qt-creator/qt-creator
Revert "Merge remote-tracking branch 'origin/4.15'"
This reverts commit 888ca0dd20.
Reason for revert: wrong patchset
Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -93,9 +93,7 @@ TEST_F(SqliteTable, InitializeTable)
|
||||
table.addColumn("name");
|
||||
table.addColumn("value");
|
||||
|
||||
EXPECT_CALL(databaseMock,
|
||||
execute(Eq(
|
||||
"CREATE TEMPORARY TABLE IF NOT EXISTS testTable(name, value) WITHOUT ROWID")));
|
||||
EXPECT_CALL(databaseMock, execute(Eq("CREATE TEMPORARY TABLE IF NOT EXISTS testTable(name NUMERIC, value NUMERIC) WITHOUT ROWID")));
|
||||
|
||||
table.initialize(databaseMock);
|
||||
}
|
||||
@@ -109,7 +107,7 @@ TEST_F(SqliteTable, InitializeTableWithIndex)
|
||||
table.addIndex({column});
|
||||
table.addIndex({column2});
|
||||
|
||||
EXPECT_CALL(databaseMock, execute(Eq("CREATE TABLE testTable(name, value)")));
|
||||
EXPECT_CALL(databaseMock, execute(Eq("CREATE TABLE testTable(name NUMERIC, value NUMERIC)")));
|
||||
EXPECT_CALL(databaseMock, execute(Eq("CREATE INDEX IF NOT EXISTS index_testTable_name ON testTable(name)")));
|
||||
EXPECT_CALL(databaseMock, execute(Eq("CREATE INDEX IF NOT EXISTS index_testTable_value ON testTable(value)")));
|
||||
|
||||
@@ -301,7 +299,9 @@ TEST_F(SqliteTable, AddPrimaryTableContraint)
|
||||
const auto &nameColumn = table.addColumn("name");
|
||||
table.addPrimaryKeyContraint({idColumn, nameColumn});
|
||||
|
||||
EXPECT_CALL(databaseMock, execute(Eq("CREATE TABLE testTable(id, name, PRIMARY KEY(id, name))")));
|
||||
EXPECT_CALL(databaseMock,
|
||||
execute(
|
||||
Eq("CREATE TABLE testTable(id NUMERIC, name NUMERIC, PRIMARY KEY(id, name))")));
|
||||
|
||||
table.initialize(databaseMock);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user