gqlite 1.8.0 → 1.8.2

data/ext/gqlparser/src/oc/lexer.rs

@@ -13,6 +13,8 @@ pub(crate) enum Token
   And,
   #[token("all", ignore(case))]
   All,
+  #[token("any", ignore(case))]
+  Any,
   #[token("as", ignore(case))]
   As,
   #[token("asc", ignore(case))]
@@ -22,17 +24,23 @@ pub(crate) enum Token
   By,
   #[token("call", ignore(case))]
   Call,
+  #[token("contains", ignore(case))]
+  Contains,
+  #[token("create", ignore(case))]
+  Create,
   #[token("desc", ignore(case))]
   #[token("descending", ignore(case))]
   Desc,
-  #[token("create", ignore(case))]
-  Create,
   #[token("delete", ignore(case))]
   Delete,
   #[token("detach", ignore(case))]
   Detach,
+  #[token("distinct", ignore(case))]
+  Distinct,
   #[token("drop", ignore(case))]
   Drop,
+  #[token("ends", ignore(case))]
+  Ends,
   #[token("exists", ignore(case))]
   Exists,
   #[token("for", ignore(case))]
@@ -41,6 +49,10 @@ pub(crate) enum Token
   False,
   #[token("graph", ignore(case))]
   Graph,
+  #[token("group", ignore(case))]
+  Group,
+  #[token("groups", ignore(case))]
+  Groups,
   #[token("if", ignore(case))]
   If,
   #[token("index", ignore(case))]
@@ -65,6 +77,10 @@ pub(crate) enum Token
   Search,
   #[token("set", ignore(case))]
   Set,
+  #[token("shortest", ignore(case))]
+  Shortest,
+  #[token("starts", ignore(case))]
+  Starts,
   #[token("not", ignore(case))]
   Not,
   #[token("null", ignore(case))]
@@ -183,11 +199,13 @@ impl Token
     matches!(
       self,
       Token::And
+        | Token::Any
         | Token::As
         | Token::Asc
         | Token::By
         | Token::Call
         | Token::Desc
+        | Token::Distinct
         | Token::Create
         | Token::Delete
         | Token::Detach
@@ -196,6 +214,8 @@ impl Token
         | Token::For
         | Token::False
         | Token::Graph
+        | Token::Group
+        | Token::Groups
         | Token::If
         | Token::Index
         | Token::In
@@ -214,6 +234,7 @@ impl Token
         | Token::Score
         | Token::Search
         | Token::Set
+        | Token::Shortest
         | Token::Skip
         | Token::True
         | Token::Union
@@ -426,4 +447,138 @@ mod tests
       ]
     );
   }
+
+  #[test]
+  fn test_oc_lexer_new_keywords()
+  {
+    // Test 'any' keyword in different cases
+    assert_eq!(
+      tokenize("any").unwrap(),
+      vec![Spanned {
+        value: Token::Any,
+        span: 0..3
+      }]
+    );
+    assert_eq!(
+      tokenize("ANY").unwrap(),
+      vec![Spanned {
+        value: Token::Any,
+        span: 0..3
+      }]
+    );
+    assert_eq!(
+      tokenize("Any").unwrap(),
+      vec![Spanned {
+        value: Token::Any,
+        span: 0..3
+      }]
+    );
+
+    // Test 'group' keyword in different cases
+    assert_eq!(
+      tokenize("group").unwrap(),
+      vec![Spanned {
+        value: Token::Group,
+        span: 0..5
+      }]
+    );
+    assert_eq!(
+      tokenize("GROUP").unwrap(),
+      vec![Spanned {
+        value: Token::Group,
+        span: 0..5
+      }]
+    );
+    assert_eq!(
+      tokenize("Group").unwrap(),
+      vec![Spanned {
+        value: Token::Group,
+        span: 0..5
+      }]
+    );
+
+    // Test 'groups' keyword in different cases
+    assert_eq!(
+      tokenize("groups").unwrap(),
+      vec![Spanned {
+        value: Token::Groups,
+        span: 0..6
+      }]
+    );
+    assert_eq!(
+      tokenize("GROUPS").unwrap(),
+      vec![Spanned {
+        value: Token::Groups,
+        span: 0..6
+      }]
+    );
+    assert_eq!(
+      tokenize("Groups").unwrap(),
+      vec![Spanned {
+        value: Token::Groups,
+        span: 0..6
+      }]
+    );
+
+    // Test 'shortest' keyword in different cases
+    assert_eq!(
+      tokenize("shortest").unwrap(),
+      vec![Spanned {
+        value: Token::Shortest,
+        span: 0..8
+      }]
+    );
+    assert_eq!(
+      tokenize("SHORTEST").unwrap(),
+      vec![Spanned {
+        value: Token::Shortest,
+        span: 0..8
+      }]
+    );
+    assert_eq!(
+      tokenize("Shortest").unwrap(),
+      vec![Spanned {
+        value: Token::Shortest,
+        span: 0..8
+      }]
+    );
+  }
+
+  #[test]
+  fn test_oc_lexer_reserved_keywords_compatibility()
+  {
+    // These keywords are now reserved and cannot be used as identifiers.
+    // This test demonstrates the compatibility cost: queries that previously
+    // worked with these as variable names will now fail.
+
+    // Before fix: 'any' would be tokenized as Identifier
+    // After fix: 'any' is tokenized as Token::Any (keyword)
+    let tokens = tokenize("any").unwrap();
+    assert_eq!(
+      tokens[0].value,
+      Token::Any,
+      "Expected 'any' to be reserved keyword, not identifier"
+    );
+
+    let tokens = tokenize("group").unwrap();
+    assert_eq!(
+      tokens[0].value,
+      Token::Group,
+      "Expected 'group' to be reserved keyword, not identifier"
+    );
+
+    let tokens = tokenize("groups").unwrap();
+    assert_eq!(
+      tokens[0].value,
+      Token::Groups,
+      "Expected 'groups' to be reserved keyword, not identifier"
+    );
+
+    let tokens = tokenize("shortest").unwrap();
+    assert_eq!(
+      tokens[0].value,
+      Token::Shortest,
+      "Expected 'shortest' to be reserved keyword, not identifier"
+    );
+  }
 }