- Merge with v0.10.3

- Disable enable_verification in tests because of ToString() - Make DropPropertyGraphInfo inherit from DropInfo
cwida · Jun 4, 2024 · 460be19 · 460be19
2 parents d88b7f9 + a86093f
commit 460be19
Show file tree

Hide file tree

Showing 22 changed files with 48 additions and 43 deletions.
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -14,9 +14,9 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: cwida/extension-ci-tools/.github/workflows/[email protected].2
+    uses: cwida/extension-ci-tools/.github/workflows/[email protected].3
     with:
-      duckdb_version: v0.10.2
+      duckdb_version: v0.10.3
       extension_name: duckpgq
 
   duckdb-stable-deploy:
@@ -25,6 +25,6 @@ jobs:
     uses: ./.github/workflows/_extension_deploy.yml
     secrets: inherit
     with:
-      duckdb_version: v0.10.2
+      duckdb_version: v0.10.3
       extension_name: duckpgq
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 # Set extension name here <<<<<<< HEAD set(TARGET_NAME duckpgq)
 #

diff --git a/duckdb b/duckdb
diff --git a/duckdb-pgq b/duckdb-pgq
diff --git a/extension-ci-tools b/extension-ci-tools
diff --git a/src/duckpgq_extension.cpp b/src/duckpgq_extension.cpp
@@ -172,14 +172,12 @@ duckpgq_handle_statement(SQLStatement *statement, DuckPGQState &duckpgq_state) {
   }
   if (statement->type == StatementType::EXPLAIN_STATEMENT) {
     auto &explain_statement = statement->Cast<ExplainStatement>();
-    // auto select_statement =
-    // dynamic_cast<SelectStatement*>(explain_statement.stmt.get());
     duckpgq_handle_statement(explain_statement.stmt.get(), duckpgq_state);
   }
   if (statement->type == StatementType::COPY_STATEMENT) {
     const auto &copy_statement = statement->Cast<CopyStatement>();
     const auto select_node =
-        dynamic_cast<SelectNode *>(copy_statement.select_statement.get());
+        dynamic_cast<SelectNode *>(copy_statement.info->select_statement.get());
     duckpgq_find_match_function(select_node->from_table.get(), duckpgq_state);
     throw Exception(ExceptionType::BINDER, "use duckpgq_bind instead");
   }
@@ -199,7 +197,7 @@ duckpgq_plan(ParserExtensionInfo *, ClientContext &context,
   auto duckpgq_state_entry = context.registered_state.find("duckpgq");
   DuckPGQState *duckpgq_state;
   if (duckpgq_state_entry == context.registered_state.end()) {
-    auto state = make_shared<DuckPGQState>(std::move(parse_data));
+    auto state = make_shared_ptr<DuckPGQState>(std::move(parse_data));
     context.registered_state["duckpgq"] = state;
     duckpgq_state = state.get();
   } else {

diff --git a/src/functions/tablefunctions/drop_property_graph.cpp b/src/functions/tablefunctions/drop_property_graph.cpp
@@ -1,5 +1,6 @@
 #include "duckpgq/functions/tablefunctions/drop_property_graph.hpp"
 
+#include "duckdb/parser/parsed_data/drop_property_graph_info.hpp"
 #include <duckpgq_extension.hpp>
 
 namespace duckdb {
@@ -22,7 +23,7 @@ DropPropertyGraphFunction::DropPropertyGraphBind(
   }
   auto statement =
       dynamic_cast<DropStatement *>(duckpgq_parse_data->statement.get());
-  auto info = dynamic_cast<DropInfo *>(statement->info.get());
+  auto info = dynamic_cast<DropPropertyGraphInfo *>(statement->info.get());
   return make_uniq<DropPropertyGraphBindData>(info);
 }
 
@@ -43,9 +44,9 @@ void DropPropertyGraphFunction::DropPropertyGraphFunc(
   }
   auto duckpgq_state = (DuckPGQState *)lookup->second.get();
   auto registered_pg =
-      duckpgq_state->registered_property_graphs.find(pg_info->name);
+      duckpgq_state->registered_property_graphs.find(pg_info->property_graph_name);
   if (registered_pg == duckpgq_state->registered_property_graphs.end()) {
-    throw BinderException("Property graph %s does not exist.", pg_info->name);
+    throw BinderException("Property graph %s does not exist.", pg_info->property_graph_name);
   }
   duckpgq_state->registered_property_graphs.erase(registered_pg);
 }

diff --git a/src/include/duckpgq/functions/tablefunctions/drop_property_graph.hpp b/src/include/duckpgq/functions/tablefunctions/drop_property_graph.hpp
@@ -10,6 +10,8 @@
 #include "duckdb/function/table_function.hpp"
 #include "duckdb/parser/statement/drop_statement.hpp"
 
+#include <duckdb/parser/parsed_data/drop_property_graph_info.hpp>
+
 namespace duckdb {
 
 class DropPropertyGraphFunction : public TableFunction {
@@ -22,10 +24,10 @@ class DropPropertyGraphFunction : public TableFunction {
   }
 
   struct DropPropertyGraphBindData : public TableFunctionData {
-    explicit DropPropertyGraphBindData(DropInfo *pg_info)
+    explicit DropPropertyGraphBindData(DropPropertyGraphInfo *pg_info)
         : drop_pg_info(pg_info) {}
 
-    DropInfo *drop_pg_info;
+    DropPropertyGraphInfo *drop_pg_info;
   };
 
   struct DropPropertyGraphGlobalData : public GlobalTableFunctionState {

diff --git a/src/include/duckpgq_extension.hpp b/src/include/duckpgq_extension.hpp
@@ -52,7 +52,7 @@ struct DuckPGQParserExtension : public ParserExtension {
   DuckPGQParserExtension() : ParserExtension() {
     parse_function = duckpgq_parse;
     plan_function = duckpgq_plan;
-    parser_info = make_shared<DuckPGQParserExtensionInfo>();
+    parser_info = make_shared_ptr<DuckPGQParserExtensionInfo>();
   }
 };
 
@@ -64,6 +64,10 @@ struct DuckPGQParseData : ParserExtensionParseData {
         statement->Copy());
   }
 
+  string ToString() const override {
+    return statement->ToString();
+  };
+
   explicit DuckPGQParseData(unique_ptr<SQLStatement> statement)
       : statement(std::move(statement)) {}
 };

diff --git a/test/sql/altering_table.test b/test/sql/altering_table.test
@@ -2,8 +2,8 @@
 # group: [sql]
 # issue: https://github.com/cwida/duckpgq-extension/issues/44
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 require duckpgq
 

diff --git a/test/sql/create_pg/all_properties.test b/test/sql/create_pg/all_properties.test
@@ -1,8 +1,8 @@
 # name: test/sql/sqlpgq/all_properties.test
 # group: [sqlpgq]
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 require duckpgq
 

diff --git a/test/sql/create_pg/create_property_graph.test b/test/sql/create_pg/create_property_graph.test
@@ -3,8 +3,8 @@
 
 require duckpgq
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 statement error
 -CREATE PROPERTY GRAPH pg4

diff --git a/test/sql/create_pg/drop_property_graph.test b/test/sql/create_pg/drop_property_graph.test
@@ -3,8 +3,8 @@
 
 require duckpgq
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 statement ok
 CREATE TABLE Student(id BIGINT, name VARCHAR);

diff --git a/test/sql/create_pg/except_properties.test b/test/sql/create_pg/except_properties.test
@@ -1,8 +1,8 @@
 # name: test/sql/sqlpgq/except_properties.test
 # group: [sqlpgq]
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 require duckpgq
 

diff --git a/test/sql/create_pg/no_properties.test b/test/sql/create_pg/no_properties.test
@@ -1,8 +1,8 @@
 # name: test/sql/sqlpgq/no_properties.test
 # group: [sqlpgq]
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 require duckpgq
 

diff --git a/test/sql/path_finding/shortest_path.test b/test/sql/path_finding/shortest_path.test
@@ -1,8 +1,8 @@
 # name: test/sql/sqlpgq/shortest_path.test
 # group: [sqlpgq]
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 require duckpgq
 

diff --git a/test/sql/path_finding/subpath_match.test b/test/sql/path_finding/subpath_match.test
@@ -1,8 +1,8 @@
 # name: test/sql/sqlpgq/subpath_match.test
 # group: [sqlpgq]
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 require duckpgq
 

diff --git a/test/sql/pattern_matching/basic_match.test b/test/sql/pattern_matching/basic_match.test
@@ -1,8 +1,8 @@
 # name: test/sql/sqlpgq/basic_match.test
 # group: [sqlpgq]
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 require duckpgq
 

diff --git a/test/sql/pattern_matching/inheritance_support.test b/test/sql/pattern_matching/inheritance_support.test
@@ -1,8 +1,8 @@
 # name: test/sql/sqlpgq/inheritance_support.test
 # group: [sqlpgq]
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 require duckpgq
 

diff --git a/test/sql/pattern_matching/path_modes.test b/test/sql/pattern_matching/path_modes.test
@@ -1,8 +1,8 @@
 # name: test/sql/sqlpgq/shortest_path.test
 # group: [sqlpgq]
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 require duckpgq
 

diff --git a/test/sql/pattern_matching/undirected_edges.test b/test/sql/pattern_matching/undirected_edges.test
@@ -1,8 +1,8 @@
 # name: test/sql/sqlpgq/undirected_edges.test
 # group: [duckpgq]
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 require duckpgq
 

diff --git a/test/sql/pgq_keywords.test b/test/sql/pgq_keywords.test
@@ -1,8 +1,8 @@
 # name: test/sql/sqlpgq/pgq_keywords.test
 # group: [sqlpgq]
 
-statement ok
-pragma enable_verification
+#statement ok
+#pragma enable_verification
 
 require duckpgq
+12 −8		.github/workflows/_extension_distribution.yml
+7 −5		README.md
+10 −9		makefiles/duckdb_extension.Makefile