From c6f65e94c815b24073d3c0b267f7cb43f2d1e42f Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 30 Jan 2018 15:13:52 +0100 Subject: [PATCH] Sqlite: Add unique index to table Some times we need the constraint for an index. Change-Id: I81332238d36b88196ef03e26b4edcc1307de46e0 Reviewed-by: Ivan Donchevskii --- src/libs/sqlite/sqliteindex.h | 18 +++++++++++++++--- src/libs/sqlite/sqlitetable.h | 9 +++++++++ tests/unit/unittest/sqliteindex-test.cpp | 10 ++++++++++ tests/unit/unittest/sqlitetable-test.cpp | 17 +++++++++++++++++ 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/libs/sqlite/sqliteindex.h b/src/libs/sqlite/sqliteindex.h index 503a6cc341c..61c2a3041c4 100644 --- a/src/libs/sqlite/sqliteindex.h +++ b/src/libs/sqlite/sqliteindex.h @@ -34,12 +34,21 @@ namespace Sqlite { +enum class IndexType +{ + Normal, + Unique +}; + class Index { public: - Index(Utils::SmallString &&tableName, Utils::SmallStringVector &&columnNames) + Index(Utils::SmallString &&tableName, + Utils::SmallStringVector &&columnNames, + IndexType indexType=IndexType::Normal) : m_tableName(std::move(tableName)), - m_columnNames(std::move(columnNames)) + m_columnNames(std::move(columnNames)), + m_indexType(indexType) { } @@ -48,7 +57,9 @@ public: checkTableName(); checkColumns(); - return {"CREATE INDEX IF NOT EXISTS index_", + return {"CREATE ", + m_indexType == IndexType::Unique ? "UNIQUE " : "", + "INDEX IF NOT EXISTS index_", m_tableName, "_", m_columnNames.join("_"), @@ -75,6 +86,7 @@ public: private: Utils::SmallString m_tableName; Utils::SmallStringVector m_columnNames; + IndexType m_indexType; }; using SqliteIndices = std::vector; diff --git a/src/libs/sqlite/sqlitetable.h b/src/libs/sqlite/sqlitetable.h index d692bf6c236..ef0725ab41f 100644 --- a/src/libs/sqlite/sqlitetable.h +++ b/src/libs/sqlite/sqlitetable.h @@ -90,6 +90,15 @@ public: return m_sqliteIndices.back(); } + Index &addUniqueIndex(const SqliteColumnConstReferences &columns) + { + m_sqliteIndices.emplace_back(m_tableName.clone(), + sqliteColumnNames(columns), + IndexType::Unique); + + return m_sqliteIndices.back(); + } + const SqliteColumns &columns() const { return m_sqliteColumns; diff --git a/tests/unit/unittest/sqliteindex-test.cpp b/tests/unit/unittest/sqliteindex-test.cpp index 4c21c7f9356..f6fb4e8be30 100644 --- a/tests/unit/unittest/sqliteindex-test.cpp +++ b/tests/unit/unittest/sqliteindex-test.cpp @@ -31,6 +31,7 @@ namespace { using Sqlite::Exception; using Sqlite::Index; +using Sqlite::IndexType; TEST(Index, OneColumn) { @@ -63,4 +64,13 @@ TEST(Index, EmptyColumns) ASSERT_THROW(index.sqlStatement(), Exception); } + +TEST(Index, UniqueIndex) +{ + Index index{"tableName", {"column1"}, IndexType::Unique}; + + auto sqlStatement = index.sqlStatement(); + + ASSERT_THAT(sqlStatement, Eq("CREATE UNIQUE INDEX IF NOT EXISTS index_tableName_column1 ON tableName(column1)")); +} } diff --git a/tests/unit/unittest/sqlitetable-test.cpp b/tests/unit/unittest/sqlitetable-test.cpp index 658e593b629..c5ce8e325dd 100644 --- a/tests/unit/unittest/sqlitetable-test.cpp +++ b/tests/unit/unittest/sqlitetable-test.cpp @@ -110,4 +110,21 @@ TEST_F(SqliteTable, InitializeTableWithIndex) table.initialize(mockDatabase); } + +TEST_F(SqliteTable, InitializeTableWithUniqueIndex) +{ + InSequence sequence; + table.setName(tableName.clone()); + auto &column = table.addColumn("name"); + auto &column2 = table.addColumn("value"); + table.addUniqueIndex({column}); + table.addIndex({column2}); + + EXPECT_CALL(mockDatabase, execute(Eq("CREATE TABLE testTable(name NUMERIC, value NUMERIC)"))); + EXPECT_CALL(mockDatabase, execute(Eq("CREATE UNIQUE INDEX IF NOT EXISTS index_testTable_name ON testTable(name)"))); + EXPECT_CALL(mockDatabase, execute(Eq("CREATE INDEX IF NOT EXISTS index_testTable_value ON testTable(value)"))); + + table.initialize(mockDatabase); +} + }