Skip to content

Commit 9f831a9

Browse files
committed
Add test for drop macro: commit, rollback, commit recovery, rollback recovery
1 parent 7d0cbf3 commit 9f831a9

File tree

2 files changed

+72
-1
lines changed

2 files changed

+72
-1
lines changed

src/catalog/catalog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void Catalog::dropMacroEntry(Transaction* transaction, const kuzu::common::oid_t
175175
}
176176

177177
void Catalog::dropMacroEntry(Transaction* transaction, const ScalarMacroCatalogEntry* entry) {
178-
functions->dropEntry(transaction, entry->getName(), entry->getOID());
178+
macros->dropEntry(transaction, entry->getName(), entry->getOID());
179179
}
180180

181181
void Catalog::alterTableEntry(Transaction* transaction, const BoundAlterInfo& info) {

test/test_files/transaction/ddl/macro.test

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,3 +269,74 @@ CASE_MACRO2|CREATE MACRO `CASE_MACRO2` (x) AS CASE x WHEN 35 THEN x + 1 END;
269269
---- ok
270270
-STATEMENT call show_macros() return *
271271
---- 0
272+
273+
-CASE DropMacroCommit
274+
-STATEMENT CREATE MACRO case_macro(x) AS CASE x WHEN 35 THEN x + 1 ELSE x - 5 END
275+
---- ok
276+
-STATEMENT CREATE MACRO case_macro2(x) AS CASE x WHEN 35 THEN x + 1 END
277+
---- ok
278+
-STATEMENT BEGIN TRANSACTION
279+
---- ok
280+
-STATEMENT DROP MACRO case_macro2
281+
---- ok
282+
-STATEMENT COMMIT
283+
---- ok
284+
-STATEMENT CALL show_macros() RETURN *
285+
---- 1
286+
CASE_MACRO|CREATE MACRO `CASE_MACRO` (x) AS CASE x WHEN 35 THEN x + 1 ELSE x - 5 END;
287+
288+
-CASE DropMacroRollback
289+
-STATEMENT CREATE MACRO case_macro(x) AS CASE x WHEN 35 THEN x + 1 ELSE x - 5 END
290+
---- ok
291+
-STATEMENT CREATE MACRO case_macro2(x) AS CASE x WHEN 35 THEN x + 1 END
292+
---- ok
293+
-STATEMENT BEGIN TRANSACTION
294+
---- ok
295+
-STATEMENT DROP MACRO case_macro2
296+
---- ok
297+
-STATEMENT ROLLBACK
298+
---- ok
299+
-STATEMENT CALL show_macros() RETURN *
300+
---- 2
301+
CASE_MACRO|CREATE MACRO `CASE_MACRO` (x) AS CASE x WHEN 35 THEN x + 1 ELSE x - 5 END;
302+
CASE_MACRO2|CREATE MACRO `CASE_MACRO2` (x) AS CASE x WHEN 35 THEN x + 1 END;
303+
304+
-CASE DropMacroCommitRecovery
305+
-STATEMENT CREATE MACRO case_macro(x) AS CASE x WHEN 35 THEN x + 1 ELSE x - 5 END
306+
---- ok
307+
-STATEMENT CREATE MACRO case_macro2(x) AS CASE x WHEN 35 THEN x + 1 END
308+
---- ok
309+
-STATEMENT BEGIN TRANSACTION
310+
---- ok
311+
-STATEMENT DROP MACRO case_macro2
312+
---- ok
313+
-STATEMENT COMMIT
314+
---- ok
315+
-STATEMENT CALL show_macros() RETURN *
316+
---- 1
317+
CASE_MACRO|CREATE MACRO `CASE_MACRO` (x) AS CASE x WHEN 35 THEN x + 1 ELSE x - 5 END;
318+
-RELOADDB
319+
-STATEMENT CALL show_macros() RETURN *
320+
---- 1
321+
CASE_MACRO|CREATE MACRO `CASE_MACRO` (x) AS CASE x WHEN 35 THEN x + 1 ELSE x - 5 END;
322+
323+
-CASE DropMacroRollbackRecovery
324+
-STATEMENT CREATE MACRO case_macro(x) AS CASE x WHEN 35 THEN x + 1 ELSE x - 5 END
325+
---- ok
326+
-STATEMENT CREATE MACRO case_macro2(x) AS CASE x WHEN 35 THEN x + 1 END
327+
---- ok
328+
-STATEMENT BEGIN TRANSACTION
329+
---- ok
330+
-STATEMENT DROP MACRO case_macro2
331+
---- ok
332+
-STATEMENT ROLLBACK
333+
---- ok
334+
-STATEMENT CALL show_macros() RETURN *
335+
---- 2
336+
CASE_MACRO|CREATE MACRO `CASE_MACRO` (x) AS CASE x WHEN 35 THEN x + 1 ELSE x - 5 END;
337+
CASE_MACRO2|CREATE MACRO `CASE_MACRO2` (x) AS CASE x WHEN 35 THEN x + 1 END;
338+
-RELOADDB
339+
-STATEMENT CALL show_macros() RETURN *
340+
---- 2
341+
CASE_MACRO|CREATE MACRO `CASE_MACRO` (x) AS CASE x WHEN 35 THEN x + 1 ELSE x - 5 END;
342+
CASE_MACRO2|CREATE MACRO `CASE_MACRO2` (x) AS CASE x WHEN 35 THEN x + 1 END;

0 commit comments

Comments
 (0)