feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Sqlite: Fix strict table

Browse Source 
Change-Id: I1650e99ef24c236b2d630649f1a728de9d020190
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Marco Bubke
2022-07-21 13:22:39 +02:00
parent 981ebfe488
commit 5fb450fd02
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/sqlite/createtablesqlstatementbuilder.h
View File

@@ -323,11 +323,15 @@ private:
void bindWithoutRowId() const void bindWithoutRowId() const
{ {
if (m_useWithoutRowId) if (m_useWithoutRowId) {
if constexpr (std::is_same_v<ColumnType, ::Sqlite::ColumnType>)
m_sqlStatementBuilder.bind("$withoutRowId", " WITHOUT ROWID"); m_sqlStatementBuilder.bind("$withoutRowId", " WITHOUT ROWID");
else else
m_sqlStatementBuilder.bind("$withoutRowId", " WITHOUT ROWID,");
} else {
m_sqlStatementBuilder.bindEmptyText("$withoutRowId"); m_sqlStatementBuilder.bindEmptyText("$withoutRowId");
} }
}
void bindIfNotExists() const void bindIfNotExists() const
{ {

2
src/libs/sqlite/sqlitetable.h
View File

@@ -103,7 +103,7 @@ public:
} }
Column &addForeignKeyColumn(Utils::SmallStringView name, Column &addForeignKeyColumn(Utils::SmallStringView name,
const Column &referencedColumn, const BasicColumn<ColumnType> &referencedColumn,
ForeignKeyAction foreignKeyupdateAction = {}, ForeignKeyAction foreignKeyupdateAction = {},
ForeignKeyAction foreignKeyDeleteAction = {}, ForeignKeyAction foreignKeyDeleteAction = {},
Enforment foreignKeyEnforcement = {}, Enforment foreignKeyEnforcement = {},

2
tests/unit/unittest/createtablesqlstatementbuilder-test.cpp
View File

@@ -690,7 +690,7 @@ TEST_F(CreateStrictTableSqlStatementBuilder, SetWitoutRowId)
ASSERT_THAT( ASSERT_THAT(
builder.sqlStatement(), builder.sqlStatement(),
"CREATE TABLE test(id INTEGER PRIMARY KEY, name TEXT, number ANY) WITHOUT ROWID STRICT"); "CREATE TABLE test(id INTEGER PRIMARY KEY, name TEXT, number ANY) WITHOUT ROWID, STRICT");
} }
TEST_F(CreateStrictTableSqlStatementBuilder, SetColumnDefinitions) TEST_F(CreateStrictTableSqlStatementBuilder, SetColumnDefinitions)

2
tests/unit/unittest/sqlitetable-test.cpp
View File

@@ -386,7 +386,7 @@ TEST_F(StrictSqliteTable, InitializeTable)
EXPECT_CALL(databaseMock, EXPECT_CALL(databaseMock,
execute(Eq("CREATE TEMPORARY TABLE IF NOT EXISTS testTable(name ANY, value ANY) " execute(Eq("CREATE TEMPORARY TABLE IF NOT EXISTS testTable(name ANY, value ANY) "
"WITHOUT ROWID STRICT"))); "WITHOUT ROWID, STRICT")));
table.initialize(databaseMock); table.initialize(databaseMock);
} }