From b7566c5f58958f0551e8e3a8b47f6cdbae49bde2 Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Wed, 20 Nov 2024 15:54:46 +0100 Subject: [PATCH 01/12] Minor logic error fix --- duckdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/duckdb b/duckdb index 2b8d5929..b9d3917b 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 2b8d5929fde8c7d742cb2889a535e3497e7f008f +Subproject commit b9d3917b25f109ed63a4d5097652e7d95bf787a0 From 20047781df64d4c1dab4e1a49b3e98b1ea7d9ca1 Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Wed, 20 Nov 2024 16:03:14 +0100 Subject: [PATCH 02/12] Removed unused rules --- duckdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/duckdb b/duckdb index b9d3917b..83b43d06 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit b9d3917b25f109ed63a4d5097652e7d95bf787a0 +Subproject commit 83b43d062f8905c45620ffb112ea6afbe4b0b367 From 6e6190e97e90a0faff62b89bdf142c05718a180c Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Mon, 25 Nov 2024 09:53:36 +0100 Subject: [PATCH 03/12] Adding some test cases --- test/sql/path_finding/kleene_star.test | 117 +++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 test/sql/path_finding/kleene_star.test diff --git a/test/sql/path_finding/kleene_star.test b/test/sql/path_finding/kleene_star.test new file mode 100644 index 00000000..edc8e5ea --- /dev/null +++ b/test/sql/path_finding/kleene_star.test @@ -0,0 +1,117 @@ +require duckpgq + +statement ok +CREATE TABLE nodes (id INTEGER); + +statement ok +CREATE TABLE edges (src INTEGER, dst INTEGER); + +statement ok +INSERT INTO nodes VALUES (1), (2), (3); + +statement ok +-CREATE PROPERTY GRAPH testgraph + VERTEX TABLES ( + nodes LABEL N + ) + EDGE TABLES ( + edges SOURCE KEY (src) REFERENCES nodes (id) + DESTINATION KEY (dst) REFERENCES nodes (id) + LABEL E +); + +query IIIII +-FROM GRAPH_TABLE(testgraph + MATCH p = ANY SHORTEST (n1:N)-[e:E]->*(n2:N) + COLUMNS (n1.id, n2.id, element_id(p), edges(p) AS path_edges, path_length(p)) +); +---- +1 1 [0] [] 0 +2 2 [1] [] 0 +3 3 [2] [] 0 + +query IIIII +-FROM GRAPH_TABLE(testgraph + MATCH p = ANY SHORTEST (n1:N)-[e:E]->+(n2:N) + COLUMNS (n1.id, n2.id, element_id(p), edges(p) AS path_edges, path_length(p)) +); +---- + +query IIIII +-FROM GRAPH_TABLE(testgraph + MATCH p = ANY SHORTEST (n1:N)-[e:E]->{1,3}(n2:N) + COLUMNS (n1.id, n2.id, element_id(p), edges(p) AS path_edges, path_length(p)) +); +---- + +query IIIII +-FROM GRAPH_TABLE(testgraph + MATCH p = ANY SHORTEST (n1:N)-[e:E]->{0,3}(n2:N) + COLUMNS (n1.id, n2.id, element_id(p), edges(p) AS path_edges, path_length(p)) +); +---- +1 1 [0] [] 0 +2 2 [1] [] 0 +3 3 [2] [] 0 + +query IIIII +-FROM GRAPH_TABLE(testgraph + MATCH p = ANY SHORTEST (n1:N)-[e:E]->{,3}(n2:N) + COLUMNS (n1.id, n2.id, element_id(p), edges(p) AS path_edges, path_length(p)) +); +---- +1 1 [0] [] 0 +2 2 [1] [] 0 +3 3 [2] [] 0 + + +statement error +-FROM GRAPH_TABLE(testgraph + MATCH p = ANY SHORTEST (n1:N)*<-[e:E]->(n2:N) + COLUMNS (n1.id, n2.id, element_id(p), edges(p) AS path_edges, path_length(p)) +); +---- +Parser Error: PGQ expected an arrow instead of *< operator. at or near "*<" + +statement error +-FROM GRAPH_TABLE(testgraph + MATCH p = ANY SHORTEST (n1:N)*-[e:E]->(n2:N) + COLUMNS (n1.id, n2.id, element_id(p), edges(p) AS path_edges, path_length(p)) +); +---- +Parser Error: syntax error at or near "*" + +statement error +-FROM GRAPH_TABLE(testgraph + MATCH p = ANY SHORTEST (n1:N)-[e:E]->{3,1}(n2:N) + COLUMNS (n1.id, n2.id, element_id(p), edges(p) AS path_edges, path_length(p)) +); +---- +Constraint Error: Lower bound greater than upper bound + +query IIIII +-FROM GRAPH_TABLE(testgraph + MATCH p = ANY SHORTEST (n1:N)-[e:E]->{,}(n2:N) + COLUMNS (n1.id, n2.id, element_id(p), edges(p) AS path_edges, path_length(p)) +); +---- +1 1 [0] [] 0 +2 2 [1] [] 0 +3 3 [2] [] 0 + + +query IIIII +-FROM GRAPH_TABLE(testgraph + MATCH p = ANY SHORTEST (n1:N)-[e:E]->{1,1}(n2:N) + COLUMNS (n1.id, n2.id, element_id(p), edges(p) AS path_edges, path_length(p)) +); +---- + +statement error +-FROM GRAPH_TABLE(testgraph + MATCH p = ANY SHORTEST (n1:N)-[e:E]->*(n2:N + COLUMNS (n1.id, n2.id, element_id(p), edges(p) AS path_edges, path_length(p)) +); +---- +Parser Error: syntax error at or near "COLUMNS" + From 03c91e5ea578ed5de25d37b6f06b02e921c6a24f Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Mon, 25 Nov 2024 10:03:39 +0100 Subject: [PATCH 04/12] Remove pkg-config because it started failing --- extension-ci-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension-ci-tools b/extension-ci-tools index 83f847f8..2bd74f94 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit 83f847f8467a760f6c66dc7996c13300210220a8 +Subproject commit 2bd74f94b85227edb9990b62d86827840c04ea20 From c30a995f7824778c897023e1eb958ce5368c7089 Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Mon, 25 Nov 2024 10:20:22 +0100 Subject: [PATCH 05/12] Bump for CI --- test/sql/path_finding/kleene_star.test | 1 - 1 file changed, 1 deletion(-) diff --git a/test/sql/path_finding/kleene_star.test b/test/sql/path_finding/kleene_star.test index edc8e5ea..7cfc25d7 100644 --- a/test/sql/path_finding/kleene_star.test +++ b/test/sql/path_finding/kleene_star.test @@ -99,7 +99,6 @@ query IIIII 2 2 [1] [] 0 3 3 [2] [] 0 - query IIIII -FROM GRAPH_TABLE(testgraph MATCH p = ANY SHORTEST (n1:N)-[e:E]->{1,1}(n2:N) From 2ddc0ad250706bcd7688e12b5ae282f55c6501f8 Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Mon, 25 Nov 2024 11:13:54 +0100 Subject: [PATCH 06/12] Bump extension-ci-tools --- extension-ci-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension-ci-tools b/extension-ci-tools index 2bd74f94..570d7ddb 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit 2bd74f94b85227edb9990b62d86827840c04ea20 +Subproject commit 570d7ddb4dc2e9f343f9416c2e78fa3018c88168 From dc3df950c02c73590dc98981681179a629989e5f Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Mon, 25 Nov 2024 11:21:07 +0100 Subject: [PATCH 07/12] Bump extension-ci-tools --- extension-ci-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension-ci-tools b/extension-ci-tools index 570d7ddb..46a8dd68 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit 570d7ddb4dc2e9f343f9416c2e78fa3018c88168 +Subproject commit 46a8dd6850b218b2c1a0ede5daf5053bdc225102 From 5aad25eadcc096ee6a5da80fcb437d107eae6041 Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Mon, 25 Nov 2024 11:47:10 +0100 Subject: [PATCH 08/12] Update readme --- duckdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/duckdb b/duckdb index 83b43d06..02ff2766 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 83b43d062f8905c45620ffb112ea6afbe4b0b367 +Subproject commit 02ff27668cf93f643a02d15c43f494272956a4a9 From be09f526a8b3beec2d2b499d0160aba587881aa3 Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Mon, 25 Nov 2024 12:56:22 +0100 Subject: [PATCH 09/12] Update duckdb ref to point to parser changes --- duckdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/duckdb b/duckdb index 02ff2766..6236d0b5 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 02ff27668cf93f643a02d15c43f494272956a4a9 +Subproject commit 6236d0b555a3a6a400fcea2f024eaa245324dca1 From 5060acb24a4b032b36855b189f4676260882a83c Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Mon, 25 Nov 2024 14:04:45 +0100 Subject: [PATCH 10/12] Update extension-ci-tools --- extension-ci-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension-ci-tools b/extension-ci-tools index 46a8dd68..51219556 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit 46a8dd6850b218b2c1a0ede5daf5053bdc225102 +Subproject commit 5121955637acac20ba5ef7abf0b8957b0f0c849b From df14b721acd5fde31e58840ba13087200a12c11b Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Mon, 25 Nov 2024 15:36:36 +0100 Subject: [PATCH 11/12] Point to main extension-ci-tools --- extension-ci-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension-ci-tools b/extension-ci-tools index 51219556..46a8dd68 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit 5121955637acac20ba5ef7abf0b8957b0f0c849b +Subproject commit 46a8dd6850b218b2c1a0ede5daf5053bdc225102 From c163016a83220d05c0df9d2ab7be18a1dd392497 Mon Sep 17 00:00:00 2001 From: dtenwolde Date: Tue, 26 Nov 2024 10:16:03 +0100 Subject: [PATCH 12/12] Bump artifects to v4 --- .github/workflows/_extension_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_extension_deploy.yml b/.github/workflows/_extension_deploy.yml index c09739e0..bdde85f4 100644 --- a/.github/workflows/_extension_deploy.yml +++ b/.github/workflows/_extension_deploy.yml @@ -92,7 +92,7 @@ jobs: cd duckdb git checkout ${{ inputs.duckdb_version }} - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: ${{ inputs.extension_name }}-${{ inputs.duckdb_version }}-extension-${{matrix.duckdb_arch}}${{inputs.artifact_postfix}}${{startsWith(matrix.duckdb, 'wasm') && '.wasm' || ''}} path: |