Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make COLUMNS optional #101

Merged
merged 16 commits into from
Mar 4, 2024
Merged

Make COLUMNS optional #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
916138e
Add ColumnsOptional
Dtenwolde Mar 2, 2024
78528df
Add type of ColumnsOptional
Dtenwolde Mar 2, 2024
6229c94
Enable unrelated test
Dtenwolde Mar 2, 2024
fe30955
Add test cases
Dtenwolde Mar 2, 2024
67a1278
Add transformer logic
Dtenwolde Mar 2, 2024
7691b67
Add outer select test case
Dtenwolde Mar 2, 2024
57f8470
Add alias test case
Dtenwolde Mar 2, 2024
859c4f5
Fix bug with multiple columns
Dtenwolde Mar 2, 2024
53b873f
Fix bug with multiple columns
Dtenwolde Mar 2, 2024
f4006c0
Comment out unused rules
Dtenwolde Mar 2, 2024
a1b5df3
Remove commented code
Dtenwolde Mar 2, 2024
fce3814
Revert old ColumnSpec and ColumnList, but leave commented
Dtenwolde Mar 4, 2024
468f0c3
Format fix and generate new parser
Dtenwolde Mar 4, 2024
fd7ddfe
Format fix
Dtenwolde Mar 4, 2024
6755a5e
Make format parser consistent
Dtenwolde Mar 4, 2024
7aac01b
Adding a test with group by
Dtenwolde Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion duckdb-pgq
Open in desktop
Submodule duckdb-pgq updated 12 files
+9 −1 scripts/generate_grammar.py
+0 −1 src/include/duckdb/parser/property_graph_table.hpp
+3 −2 src/include/duckdb/parser/transformer.hpp
+4 −4 src/optimizer/optimizer.cpp
+5 −8 src/parser/parsed_data/create_property_graph_info.cpp
+2 −5 src/parser/property_graph_table.cpp
+0 −1 src/parser/subpath_element.cpp
+2 −3 src/parser/transform/statement/transform_create_property_graph.cpp
+6 −10 src/parser/transform/tableref/transform_match.cpp
+16 −4 third_party/libpg_query/grammar/statements/pgq.y
+1 −0 third_party/libpg_query/grammar/types/pgq.yh
+16,119 −16,095 third_party/libpg_query/src_backend_parser_gram.cpp
88 changes: 88 additions & 0 deletions test/sql/optional_columns.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# name: test/sql/sqlpgq/snb.test
# group: [duckpgq]

require duckpgq

statement ok
import database 'duckdb-pgq/data/SNB0.003'

statement ok
-CREATE PROPERTY GRAPH snb
VERTEX TABLES (
Person LABEL Person,
Organisation LABEL Organisation IN typemask(company, university)
)
EDGE TABLES (
Person_knows_person SOURCE KEY (Person1Id) REFERENCES Person (id)
DESTINATION KEY (Person2Id) REFERENCES Person (id)
LABEL Knows,
person_workAt_Organisation SOURCE KEY (PersonId) REFERENCES Person (id)
DESTINATION KEY (OrganisationId) REFERENCES Organisation (id)
LABEL workAt_Organisation
);

query IIIIIIIIIII
-FROM GRAPH_TABLE (snb MATCH (p:Person)) limit 1;
----
2010-01-03 23:10:31.499+00 14 Hossein Forouhar male 1984-03-11 77.245.239.11 Firefox 1166 fa;ku;en [email protected]

query I
-FROM GRAPH_TABLE (snb MATCH (p:Person) COLUMNS (p.id)) limit 10;
----
14
16
32
2199023255557
2199023255573
2199023255594
4398046511139
6597069766702
8796093022234
8796093022237

query I
-SELECT p_id FROM GRAPH_TABLE (snb MATCH (p:Person) COLUMNS (p.id as p_id,)) limit 10;
----
14
16
32
2199023255557
2199023255573
2199023255594
4398046511139
6597069766702
8796093022234
8796093022237

query I
-FROM GRAPH_TABLE (snb MATCH (p:Person) COLUMNS (p.id as p_id)) limit 10;
----
14
16
32
2199023255557
2199023255573
2199023255594
4398046511139
6597069766702
8796093022234
8796093022237

query II
-FROM GRAPH_TABLE (snb MATCH (p:Person) COLUMNS (p.id, p.firstname as first_name)) limit 10;
----
14 Hossein
16 Jan
32 Miguel
2199023255557 Eric
2199023255573 Arbaaz
2199023255594 Ali
4398046511139 Ayesha
6597069766702 Alejandro
8796093022234 Rahul
8796093022237 Lei

query I
-SELECT count(*) FROM GRAPH_TABLE (snb MATCH (p:Person)) GROUP BY ALL limit 10;
----
50
20 changes: 10 additions & 10 deletions test/sql/path-finding/subpath_match.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ EDGE TABLES (
PROPERTIES ( id ) LABEL Knows
);

#query II
#-SELECT study.a_id, study.name
#FROM GRAPH_TABLE (pg
# MATCH
# (a:Person WHERE a.id = 0)
# COLUMNS (a.id as a_id, a.name)
# ) study
#----
#0 Daniel
#
query II
-SELECT study.a_id, study.name
FROM GRAPH_TABLE (pg
MATCH
(a:Person WHERE a.id = 0)
COLUMNS (a.id as a_id, a.name)
) study
----
0 Daniel

#query II
#-SELECT study.a_id, study.b_id
#FROM GRAPH_TABLE (pg
Expand Down
Loading