Check if catalog table is in RTE_SUBQUERY

duckdb · May 13, 2024 · c40d805 · c40d805
1 parent 9e092f5
commit c40d805
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/quack_heap_seq_scan.cpp b/src/quack_heap_seq_scan.cpp
@@ -14,7 +14,6 @@ extern "C" {
 #include <thread>
 
 namespace quack {
-
 PostgresHeapSeqScan::PostgresHeapSeqScan(RangeTblEntry *table)
     : m_tableEntry(table), m_rel(nullptr), m_snapshot(nullptr) {
 }

diff --git a/src/quack_hooks.cpp b/src/quack_hooks.cpp
@@ -20,6 +20,12 @@ is_catalog_table(List *tables) {
 	ListCell *lc;
 	foreach (lc, tables) {
 		RangeTblEntry *table = (RangeTblEntry *)lfirst(lc);
+		if (table->rtekind == RTE_SUBQUERY) {
+			/* Check Subquery rtable list if any table is from PG catalog */
+			if (is_catalog_table(table->subquery->rtable)) {
+				return true;
+			};
+		}
 		if (table->relid) {
 			auto rel = RelationIdGetRelation(table->relid);
 			auto namespaceOid = RelationGetNamespace(rel);

diff --git a/src/quack_planner.cpp b/src/quack_planner.cpp
@@ -16,13 +16,13 @@ extern "C" {
 
 namespace quack {
 
-static duckdb::DuckDB *
+static duckdb::unique_ptr<duckdb::DuckDB>
 quack_open_database() {
 	duckdb::DBConfig config;
 	// config.SetOption("memory_limit", "2GB");
 	// config.SetOption("threads", "8");
 	// config.allocator = duckdb::make_uniq<duckdb::Allocator>(QuackAllocate, QuackFree, QuackReallocate, nullptr);
-	return new duckdb::DuckDB(nullptr, &config);
+	return duckdb::make_uniq<duckdb::DuckDB>(nullptr, &config);
 }
 
 } // namespace quack
@@ -82,7 +82,7 @@ quack_create_plan(Query *parse, const char *query) {
 		}
 	}
 
-	quackNode->custom_private = list_make2(db, preparedQuery.release());
+	quackNode->custom_private = list_make2(db.release(), preparedQuery.release());
 	quackNode->methods = &quack_scan_scan_methods;
 
 	return (Plan *)quackNode;