Skip to content

feat(pgq): add SQL/PGQ keywords #2394

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

Open
zhjwpku wants to merge 1 commit into
base: main
Choose a base branch
from
+88 −0
Open

feat(pgq): add SQL/PGQ keywords #2394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 36 additions & 0 deletions src/keywords.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ define_keywords!(
ACCESS,
ACCOUNT,
ACTION,
ACYCLIC,
ADD,
ADDQUOTES,
ADMIN,
Expand All @@ -112,6 +113,7 @@ define_keywords!(
ALL,
ALLOCATE,
ALLOWOVERWRITE,
ALL_DIFFERENT,
ALTER,
ALWAYS,
ANALYZE,
Expand Down Expand Up @@ -162,6 +164,8 @@ define_keywords!(
BINARY,
BIND,
BINDING,
BINDINGS,
BINDING_COUNT,
BIT,
BLANKSASNULL,
BLOB,
Expand All @@ -172,6 +176,7 @@ define_keywords!(
BOOLEAN,
BOOST,
BOTH,
BOUND,
BOX,
BRIN,
BROWSE,
Expand Down Expand Up @@ -332,11 +337,14 @@ define_keywords!(
DEREF,
DESC,
DESCRIBE,
DESTINATION,
DETACH,
DETAIL,
DETERMINISTIC,
DICTIONARY,
DIFFERENT,
DIMENSIONS,
DIRECTED,
DIRECTORY,
DISABLE,
DISCARD,
Expand All @@ -359,8 +367,12 @@ define_keywords!(
DUPLICATE,
DYNAMIC,
EACH,
EDGE,
EDGES,
ELEMENT,
ELEMENTS,
ELEMENT_ID,
ELEMENT_NUMBER,
ELSE,
ELSEIF,
EMPTY,
Expand Down Expand Up @@ -476,7 +488,9 @@ define_keywords!(
GRANT,
GRANTED,
GRANTS,
GRAPH,
GRAPHVIZ,
GRAPH_TABLE,
GROUP,
GROUPING,
GROUPS,
Expand Down Expand Up @@ -565,10 +579,13 @@ define_keywords!(
JSONFILE,
JSON_TABLE,
JULIAN,
KEEP,
KEY,
KEYS,
KEY_BLOCK_SIZE,
KILL,
LABEL,
LABELED,
LAG,
LAMBDA,
LANGUAGE,
Expand Down Expand Up @@ -623,6 +640,7 @@ define_keywords!(
MATCH,
MATCHED,
MATCHES,
MATCHNUM,
MATCH_CONDITION,
MATCH_RECOGNIZE,
MATERIALIZE,
Expand Down Expand Up @@ -695,6 +713,7 @@ define_keywords!(
NOCREATEDB,
NOCREATEROLE,
NOCYCLE,
NODE,
NOINHERIT,
NOLOGIN,
NONE,
Expand Down Expand Up @@ -783,6 +802,9 @@ define_keywords!(
PASSWORD,
PAST,
PATH,
PATHS,
PATH_LENGTH,
PATH_NAME,
PATTERN,
PCTFREE,
PER,
Expand Down Expand Up @@ -824,6 +846,12 @@ define_keywords!(
PROFILE,
PROGRAM,
PROJECTION,
PROPERTIES,
PROPERTY,
PROPERTY_EXISTS,
PROPERTY_GRAPH_CATALOG,
PROPERTY_GRAPH_NAME,
PROPERTY_GRAPH_SCHEMA,
PUBLIC,
PURCHASE,
PURGE,
Expand Down Expand Up @@ -864,6 +892,8 @@ define_keywords!(
REGR_SXY,
REGR_SYY,
REINDEX,
RELATIONSHIP,
RELATIONSHIPS,
RELATIVE,
RELAY,
RELEASE,
Expand Down Expand Up @@ -918,6 +948,7 @@ define_keywords!(
RUN,
SAFE,
SAFE_CAST,
SAME,
SAMPLE,
SAVEPOINT,
SCHEMA,
Expand Down Expand Up @@ -957,10 +988,12 @@ define_keywords!(
SHARE,
SHARED,
SHARING,
SHORTEST,
SHOW,
SIGNED,
SIMILAR,
SIMPLE,
SINGLETONS,
SIZE,
SKIP,
SLOW,
Expand Down Expand Up @@ -1072,6 +1105,7 @@ define_keywords!(
TOTALS,
TOTP,
TRACE,
TRAIL,
TRAILING,
TRAN,
TRANSACTION,
Expand Down Expand Up @@ -1156,12 +1190,14 @@ define_keywords!(
VERSION,
VERSIONING,
VERSIONS,
VERTEX,
VIEW,
VIEWS,
VIRTUAL,
VOLATILE,
VOLUME,
WAITFOR,
WALK,
WAREHOUSE,
WAREHOUSES,
WEEK,
Expand Down
52 changes: 52 additions & 0 deletions src/tokenizer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2673,6 +2673,58 @@ mod tests {
compare(expected, tokens);
}

#[test]

@LucaCappelletti94 LucaCappelletti94 Aug 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is tautological, there is no reason to add such a thing.

fn tokenize_sql_pgq_keywords() {
for (word, keyword) in [
("ACYCLIC", Keyword::ACYCLIC),
("ALL_DIFFERENT", Keyword::ALL_DIFFERENT),
("BINDINGS", Keyword::BINDINGS),
("BINDING_COUNT", Keyword::BINDING_COUNT),
("BOUND", Keyword::BOUND),
("DESTINATION", Keyword::DESTINATION),
("DIFFERENT", Keyword::DIFFERENT),
("DIRECTED", Keyword::DIRECTED),
("EDGE", Keyword::EDGE),
("EDGES", Keyword::EDGES),
("ELEMENT_ID", Keyword::ELEMENT_ID),
("ELEMENT_NUMBER", Keyword::ELEMENT_NUMBER),
("GRAPH", Keyword::GRAPH),
("GRAPH_TABLE", Keyword::GRAPH_TABLE),
("KEEP", Keyword::KEEP),
("LABEL", Keyword::LABEL),
("LABELED", Keyword::LABELED),
("MATCHNUM", Keyword::MATCHNUM),
("NODE", Keyword::NODE),
("PATHS", Keyword::PATHS),
("PATH_LENGTH", Keyword::PATH_LENGTH),
("PATH_NAME", Keyword::PATH_NAME),
("PROPERTIES", Keyword::PROPERTIES),
("PROPERTY", Keyword::PROPERTY),
("PROPERTY_EXISTS", Keyword::PROPERTY_EXISTS),
("PROPERTY_GRAPH_CATALOG", Keyword::PROPERTY_GRAPH_CATALOG),
("PROPERTY_GRAPH_NAME", Keyword::PROPERTY_GRAPH_NAME),
("PROPERTY_GRAPH_SCHEMA", Keyword::PROPERTY_GRAPH_SCHEMA),
("RELATIONSHIP", Keyword::RELATIONSHIP),
("RELATIONSHIPS", Keyword::RELATIONSHIPS),
("SAME", Keyword::SAME),
("SHORTEST", Keyword::SHORTEST),
("SINGLETONS", Keyword::SINGLETONS),
("TRAIL", Keyword::TRAIL),
("VERTEX", Keyword::VERTEX),
("WALK", Keyword::WALK),
] {
assert_eq!(Token::make_keyword(word), Token::make_word(word, None));
assert_eq!(
Token::make_keyword(word.to_lowercase().as_str()),
Token::Word(Word {
value: word.to_lowercase(),
quote_style: None,
keyword,
})
);
}
}

#[test]
fn tokenize_select_float() {
let sql = String::from("SELECT .1");
Expand Down