Added constraint resolution clauses to Table Constraints. Version 1.9…

…9.7.0 Signed-off-by: Federico Fuga <[email protected]>
studiofuga · Nov 27, 2023 · 24ed64b · 24ed64b
1 parent 74c092f
commit 24ed64b
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.8)
-project(msqlitecpp VERSION 1.99.6.3 LANGUAGES C CXX)
+project(msqlitecpp VERSION 1.99.7.0 LANGUAGES C CXX)
 
 set(msqlitecpp_DESCRIPTION "a Modern SQLite CPP library")
 

diff --git a/include/msqlitecpp/v1/sqlitestatementformatters.h b/include/msqlitecpp/v1/sqlitestatementformatters.h
@@ -529,6 +529,29 @@ class CreateTable : public StatementFormatter {
     }
 
     struct TableConstraint {
+        struct OnConflict {
+            struct Rollback {
+                [[nodiscard]] const char *toString() const { return " ON CONFLICT ROLLBACK"; }
+            };
+            struct Abort {
+                [[nodiscard]] const char *toString() const { return " ON CONFLICT ABORT"; }
+            };
+            struct Fail {
+                [[nodiscard]] const char *toString() const { return " ON CONFLICT FAIL"; }
+            };
+            struct Ignore {
+                [[nodiscard]] const char *toString() const { return " ON CONFLICT IGNORE"; }
+            };
+            struct Replace {
+                [[nodiscard]] const char *toString() const { return " ON CONFLICT REPLACE"; }
+            };
+
+            template<typename T>
+            static const char *toString(T t) {
+                return t.toString();
+            }
+        };
+
         class ForeignKey {
             std::string statement;
             std::string actionString;
@@ -596,6 +619,7 @@ class CreateTable : public StatementFormatter {
 
         class Unique {
             std::string statement;
+            std::string conflictClause;
         public:
             template<typename ...FLDS>
             explicit
@@ -607,16 +631,22 @@ class CreateTable : public StatementFormatter {
                    << ")";
                 statement = ss.str();
             }
-            std::string toString() const
+            [[nodiscard]] std::string toString() const
             {
                 std::ostringstream ss;
-                ss << statement;
+                ss << statement << conflictClause;
                 return ss.str();
             }
+
+            template <typename T>
+            void onConflict(T t) {
+                conflictClause = statements::CreateTable::TableConstraint::OnConflict::toString(t);
+            }
         };
 
         class PrimaryKey {
             std::string statement;
+            std::string conflictClause;
         public:
             template<typename ...FLDS>
             explicit
@@ -628,12 +658,17 @@ class CreateTable : public StatementFormatter {
                    << ")";
                 statement = ss.str();
             }
-            std::string toString() const
+            [[nodiscard]] std::string toString() const
             {
                 std::ostringstream ss;
-                ss << statement;
+                ss << statement << conflictClause;
                 return ss.str();
             }
+
+            template <typename T>
+            void onConflict(T t) {
+                conflictClause = statements::CreateTable::TableConstraint::OnConflict::toString(t);
+            }
         };
     };
 };

diff --git a/tests/v1/sqlformatting.cpp b/tests/v1/sqlformatting.cpp
@@ -218,11 +218,31 @@ TEST(V1SqlFormatting, UniqueAndPrimaryKey)
     sqlite::statements::CreateTable::TableConstraint::Unique c2("u", fldId, fldName);
     ASSERT_EQ(c2.toString(), "CONSTRAINT u UNIQUE (id,name)");
 
+    sqlite::statements::CreateTable::TableConstraint::Unique c3("u", fldId, fldName);
+    c3.onConflict(sqlite::statements::CreateTable::TableConstraint::OnConflict::Replace {});
+    ASSERT_EQ(c3.toString(), "CONSTRAINT u UNIQUE (id,name) ON CONFLICT REPLACE");
+
+    sqlite::statements::CreateTable::TableConstraint::Unique c4("u", fldId, fldName);
+    c4.onConflict(sqlite::statements::CreateTable::TableConstraint::OnConflict::Abort {});
+    ASSERT_EQ(c4.toString(), "CONSTRAINT u UNIQUE (id,name) ON CONFLICT ABORT");
+
+    sqlite::statements::CreateTable::TableConstraint::Unique c5("u", fldId, fldName);
+    c5.onConflict(sqlite::statements::CreateTable::TableConstraint::OnConflict::Fail {});
+    ASSERT_EQ(c5.toString(), "CONSTRAINT u UNIQUE (id,name) ON CONFLICT FAIL");
+
+    sqlite::statements::CreateTable::TableConstraint::Unique c6("u", fldId, fldName);
+    c6.onConflict(sqlite::statements::CreateTable::TableConstraint::OnConflict::Ignore {});
+    ASSERT_EQ(c6.toString(), "CONSTRAINT u UNIQUE (id,name) ON CONFLICT IGNORE");
+
     sqlite::statements::CreateTable::TableConstraint::PrimaryKey p1("pk", fldId);
     ASSERT_EQ(p1.toString(), "CONSTRAINT pk PRIMARY KEY (id)");
 
     sqlite::statements::CreateTable::TableConstraint::PrimaryKey p2("pk", fldId, fldName);
     ASSERT_EQ(p2.toString(), "CONSTRAINT pk PRIMARY KEY (id,name)");
+
+    sqlite::statements::CreateTable::TableConstraint::PrimaryKey p3("pk", fldId, fldName);
+    p3.onConflict(sqlite::statements::CreateTable::TableConstraint::OnConflict::Rollback {});
+    ASSERT_EQ(p3.toString(), "CONSTRAINT pk PRIMARY KEY (id,name) ON CONFLICT ROLLBACK");
 }
 
 TEST(V1SqlFormatting, createTableStatement)