Merge pull request #1857 from kuzudb/create-macro-trx

Add create-macro transaction constraints

src/include/common/statement_type.h

@@ -33,8 +33,12 @@ class StatementTypeUtils {
         return statementType == StatementType::COPY;
     }
 
-    static bool isDDLOrCopyCSV(StatementType statementType) {
-        return isDDL(statementType) || isCopyCSV(statementType);
+    static bool isCreateMacro(StatementType statementType) {
+        return statementType == StatementType::CREATE_MACRO;
+    }
+
+    static bool allowActiveTransaction(StatementType statementType) {
+        return isDDL(statementType) || isCopyCSV(statementType) || isCreateMacro(statementType);
     }
 };
 

src/main/connection.cpp

@@ -404,7 +404,7 @@ void Connection::beginTransactionIfAutoCommit(PreparedStatement* preparedStateme
     }
     if (!preparedStatement->allowActiveTransaction() && activeTransaction) {
         throw ConnectionException(
-            "DDL and CopyCSV statements are automatically wrapped in a "
+            "DDL, CopyCSV, createMacro statements are automatically wrapped in a "
             "transaction and committed. As such, they cannot be part of an "
             "active transaction, please commit or rollback your previous transaction and "
             "issue a ddl query without opening a transaction.");

src/main/prepared_statement.cpp

@@ -8,7 +8,7 @@ namespace kuzu {
 namespace main {
 
 bool PreparedStatement::allowActiveTransaction() const {
-    return !common::StatementTypeUtils::isDDLOrCopyCSV(preparedSummary.statementType);
+    return !common::StatementTypeUtils::allowActiveTransaction(preparedSummary.statementType);
 }
 
 bool PreparedStatement::isSuccess() const {

test/runner/e2e_copy_transaction_test.cpp

@@ -229,9 +229,9 @@ TEST_F(TinySnbCopyCSVTransactionTest, CopyCSVStatementWithActiveTransactionError
     conn->beginWriteTransaction();
     auto result = conn->query(copyPersonTableCMD);
     ASSERT_EQ(result->getErrorMessage(),
-        "DDL and CopyCSV statements are automatically wrapped in a transaction and committed. "
-        "As such, they cannot be part of an active transaction, please commit or rollback your "
-        "previous transaction and issue a ddl query without opening a transaction.");
+        "DDL, CopyCSV, createMacro statements are automatically wrapped in a transaction and "
+        "committed. As such, they cannot be part of an active transaction, please commit or "
+        "rollback your previous transaction and issue a ddl query without opening a transaction.");
 }
 
 } // namespace testing

test/runner/e2e_create_macro_test.cpp

@@ -100,5 +100,13 @@ TEST_F(CreateMacroTestTrxTest, createMacroReadTrxError) {
         "Can't execute a write query inside a read-only transaction.");
 }
 
+TEST_F(CreateMacroTestTrxTest, createMacroWithActiveTrxError) {
+    conn->beginWriteTransaction();
+    ASSERT_EQ(conn->query("CREATE MACRO var_macro(x) AS x")->getErrorMessage(),
+        "DDL, CopyCSV, createMacro statements are automatically wrapped in a transaction and "
+        "committed. As such, they cannot be part of an active transaction, please commit or "
+        "rollback your previous transaction and issue a ddl query without opening a transaction.");
+}
+
 } // namespace testing
 } // namespace kuzu

test/runner/e2e_ddl_test.cpp

@@ -264,9 +264,10 @@ class TinySnbDDLTest : public DBTest {
         auto result = conn->query(query);
         ASSERT_FALSE(result->isSuccess());
         ASSERT_EQ(result->getErrorMessage(),
-            "DDL and CopyCSV statements are automatically wrapped in a transaction and committed. "
-            "As such, they cannot be part of an active transaction, please commit or rollback your "
-            "previous transaction and issue a ddl query without opening a transaction.");
+            "DDL, CopyCSV, createMacro statements are automatically wrapped in a transaction and "
+            "committed. As such, they cannot be part of an active transaction, please commit or "
+            "rollback your previous transaction and issue a ddl query without opening a "
+            "transaction.");
     }
 
     void executeQueryWithoutCommit(std::string query) {