gqlite 1.2.2 → 1.3.0

data/ext/{gqliterb/vendor/gqlitedb → gqlitedb}/src/interpreter/instructions.rs

@@ -1,6 +1,7 @@
 use crate::{prelude::*, value_table::ColId};
 
 #[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
 pub(crate) enum Instruction
 {
   CreateNodeLiteral
@@ -58,7 +59,6 @@ pub(crate) enum Instruction
   Rot3,        // If a is the top of the stack, then a b c -> b c a
   InverseRot3, // If a is the top of the stack, then a b c -> c a b
   Swap,
-  Drop,
   AndBinaryOperator,
   OrBinaryOperator,
   XorBinaryOperator,
@@ -78,6 +78,7 @@ pub(crate) enum Instruction
   MultiplicationBinaryOperator,
   DivisionBinaryOperator,
   ModuloBinaryOperator,
+  ExponentBinaryOperator,
 }
 
 pub(crate) type Instructions = Vec<Instruction>;
@@ -208,6 +209,10 @@ pub(crate) enum Block
   {
     name: String
   },
+  DropGraph
+  {
+    name: String, if_exists: bool
+  },
   UseGraph
   {
     name: String
@@ -217,7 +222,7 @@ pub(crate) enum Block
     actions: Vec<CreateAction>,
     variables_size: VariablesSizes,
   },
-  BlockMatch
+  Match
   {
     blocks: Vec<BlockMatch>,
     filter: Instructions,
@@ -233,6 +238,7 @@ pub(crate) enum Block
   },
   Call
   {
+    #[allow(dead_code)]
     arguments: Instructions,
     name: String,
   },

data/ext/{gqliterb/vendor/gqlitedb → gqlitedb}/src/lib.rs

@@ -7,8 +7,9 @@
 //! for an example of use.
 
 #![warn(missing_docs)]
-#![allow(dead_code)]
 #![deny(warnings)]
+#![allow(clippy::result_large_err)]
+#![allow(clippy::unnecessary_lazy_evaluations)]
 
 mod aggregators;
 #[cfg(feature = "capi")]
@@ -22,7 +23,7 @@ mod graph;
 mod interpreter;
 mod parser;
 mod prelude;
-mod serialize_with;
+mod query_result;
 mod store;
 mod utils;
 mod value;
@@ -32,11 +33,14 @@ mod value_table;
 pub(crate) mod tests;
 
 pub use {
-  connection::Connection,
+  connection::{Backend, Connection},
   error::{CompileTimeError, Error, RunTimeError, StoreError},
-  graph::{Edge, Node, Path},
-  value::{Value, ValueMap},
+  graph::{labels, Edge, Node, Path},
+  query_result::QueryResult,
+  value::{array, value_map, Value, ValueMap, ValueTryIntoRef},
 };
 
+pub use graphcore::{table, Table};
+
 /// GQLite Result alias. Usable as a standard `Result<T, E>` or default to gqlite::Error with `Result<T>`
 pub type Result<T, E = error::export::Error> = std::result::Result<T, E>;

data/ext/{gqliterb/vendor/gqlitedb → gqlitedb}/src/parser/ast.rs

@@ -60,7 +60,7 @@ impl VariableIdentifiers
       .next_id
       .fetch_add(1, std::sync::atomic::Ordering::Relaxed)
   }
-  pub(crate) fn from_name(&self, name: impl Into<String>) -> VariableIdentifier
+  pub(crate) fn create_variable_from_name(&self, name: impl Into<String>) -> VariableIdentifier
   {
     let name = name.into();
     match self.identifiers.borrow_mut().entry(name)
@@ -77,11 +77,14 @@ impl VariableIdentifiers
       }
     }
   }
-  pub(crate) fn from_name_optional(&self, name: Option<String>) -> Option<VariableIdentifier>
+  pub(crate) fn create_variable_from_name_optional(
+    &self,
+    name: Option<String>,
+  ) -> Option<VariableIdentifier>
   {
-    name.map(|name| self.from_name(name))
+    name.map(|name| self.create_variable_from_name(name))
   }
-  pub(crate) fn anonymous(&self) -> VariableIdentifier
+  pub(crate) fn create_anonymous_variable(&self) -> VariableIdentifier
   {
     let id = self.next_id();
     VariableIdentifier {
@@ -95,6 +98,7 @@ impl VariableIdentifiers
 pub(crate) enum Statement
 {
   CreateGraph(CreateGraph),
+  DropGraph(DropGraph),
   UseGraph(UseGraph),
   Create(Create),
   Match(Match),
@@ -106,13 +110,13 @@ pub(crate) enum Statement
   Update(Update),
 }
 
-macro_rules! create_into_statement {
+macro_rules! create_from_statement {
   ( $x:tt ) => {
-    impl Into<Statement> for $x
+    impl From<$x> for Statement
     {
-      fn into(self) -> Statement
+      fn from(v: $x) -> Statement
       {
-        Statement::$x(self)
+        Statement::$x(v)
       }
     }
   };
@@ -122,12 +126,16 @@ pub(crate) type Statements = Vec<Statement>;
 pub(crate) type Queries = Vec<Statements>;
 
 #[derive(Debug)]
-pub(crate) enum Node {}
+pub(crate) struct CreateGraph
+{
+  pub(crate) name: String,
+}
 
 #[derive(Debug)]
-pub(crate) struct CreateGraph
+pub(crate) struct DropGraph
 {
   pub(crate) name: String,
+  pub(crate) if_exists: bool,
 }
 
 #[derive(Debug)]
@@ -142,7 +150,7 @@ pub(crate) struct Create
   pub(crate) patterns: Vec<Pattern>,
 }
 
-create_into_statement! {Create}
+create_from_statement! {Create}
 
 #[derive(Debug)]
 pub(crate) struct Match
@@ -152,7 +160,7 @@ pub(crate) struct Match
   pub(crate) optional: bool,
 }
 
-create_into_statement! {Match}
+create_from_statement! {Match}
 
 #[derive(Debug)]
 pub(crate) struct Return
@@ -163,7 +171,7 @@ pub(crate) struct Return
   pub(crate) where_expression: Option<Expression>,
 }
 
-create_into_statement! {Return}
+create_from_statement! {Return}
 
 #[derive(Debug)]
 pub(crate) struct With
@@ -174,7 +182,7 @@ pub(crate) struct With
   pub(crate) where_expression: Option<Expression>,
 }
 
-create_into_statement! {With}
+create_from_statement! {With}
 
 #[derive(Debug)]
 pub(crate) struct Unwind
@@ -183,7 +191,7 @@ pub(crate) struct Unwind
   pub(crate) expression: Expression,
 }
 
-create_into_statement! {Unwind}
+create_from_statement! {Unwind}
 
 #[derive(Debug)]
 pub(crate) struct Delete
@@ -198,18 +206,11 @@ pub(crate) struct Update
   pub(crate) updates: Vec<OneUpdate>,
 }
 
-#[derive(Debug)]
-pub(crate) struct Remove
-{
-  pub(crate) expressions: Vec<Expression>,
-}
-
 #[derive(Debug)]
 pub(crate) struct Call
 {
   pub(crate) name: String,
   pub(crate) arguments: Vec<Expression>,
-  pub(crate) yield_: Vec<String>,
 }
 
 // Set/remove Statements
@@ -265,6 +266,7 @@ pub(crate) struct Modifiers
 // Expressions
 
 #[derive(Debug, Clone, PartialEq)]
+#[allow(clippy::large_enum_variant)]
 pub(crate) enum Expression
 {
   Array(Array),
@@ -294,6 +296,7 @@ pub(crate) enum Expression
   Multiplication(Box<Multiplication>),
   Division(Box<Division>),
   Modulo(Box<Modulo>),
+  Exponent(Box<Exponent>),
 
   Negation(Box<Negation>),
   LogicalNegation(Box<LogicalNegation>),
@@ -350,9 +353,10 @@ pub(crate) struct PathPattern
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) enum LabelExpression
 {
+  #[allow(dead_code)]
   Not(Box<LabelExpression>),
-  And(Vec<Box<LabelExpression>>),
-  Or(Vec<Box<LabelExpression>>),
+  And(Vec<LabelExpression>),
+  Or(Vec<LabelExpression>),
   String(String),
   None,
 }
@@ -374,7 +378,7 @@ impl LabelExpression
         }
         other =>
         {
-          vec.push(other.boxed());
+          vec.push(other);
           LabelExpression::And(vec)
         }
       },
@@ -383,10 +387,10 @@ impl LabelExpression
         LabelExpression::None => self,
         LabelExpression::And(mut vec) =>
         {
-          vec.push(self.boxed());
+          vec.push(self);
           LabelExpression::And(vec)
         }
-        _ => LabelExpression::And(vec![self.boxed(), rhs.boxed()]),
+        _ => LabelExpression::And(vec![self, rhs]),
       },
     }
   }
@@ -405,7 +409,7 @@ impl LabelExpression
         }
         other =>
         {
-          vec.push(other.boxed());
+          vec.push(other);
           LabelExpression::Or(vec)
         }
       },
@@ -414,21 +418,13 @@ impl LabelExpression
         LabelExpression::None => self,
         LabelExpression::Or(mut vec) =>
         {
-          vec.push(self.boxed());
+          vec.push(self);
           LabelExpression::Or(vec)
         }
-        _ => LabelExpression::Or(vec![self.boxed(), rhs.boxed()]),
+        _ => LabelExpression::Or(vec![self, rhs]),
       },
     }
   }
-  fn clone_boxed(&self) -> Box<LabelExpression>
-  {
-    self.clone().boxed()
-  }
-  pub(crate) fn boxed(self) -> Box<LabelExpression>
-  {
-    Box::new(self)
-  }
   pub(crate) fn is_all_inclusive(&self) -> bool
   {
     match self
@@ -442,43 +438,35 @@ impl LabelExpression
   }
   pub(crate) fn is_none(&self) -> bool
   {
-    match self
-    {
-      LabelExpression::None => true,
-      _ => false,
-    }
+    matches!(self, LabelExpression::None)
   }
   pub(crate) fn is_string(&self) -> bool
   {
-    match self
-    {
-      LabelExpression::String(_) => true,
-      _ => false,
-    }
+    matches!(self, LabelExpression::String(_))
   }
 }
 
 // Expressions
 
-macro_rules! create_into_expr {
+macro_rules! create_from_expr {
   ( $x:tt ) => {
-    impl Into<Expression> for $x
+    impl From<$x> for Expression
     {
-      fn into(self) -> Expression
+      fn from(v: $x) -> Expression
       {
-        Expression::$x(self)
+        Expression::$x(v)
       }
     }
   };
 }
 
-macro_rules! create_into_boxed_expr {
+macro_rules! create_from_boxed_expr {
   ( $x:tt ) => {
-    impl Into<Expression> for $x
+    impl From<$x> for Expression
     {
-      fn into(self) -> Expression
+      fn from(v: $x) -> Expression
       {
-        Expression::$x(Box::new(self))
+        Expression::$x(Box::new(v))
       }
     }
   };
@@ -503,7 +491,7 @@ pub(crate) struct Variable
   pub(crate) identifier: VariableIdentifier,
 }
 
-create_into_expr! {Variable}
+create_from_expr! {Variable}
 
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) struct MemberAccess
@@ -512,7 +500,7 @@ pub(crate) struct MemberAccess
   pub(crate) path: Vec<String>,
 }
 
-create_into_boxed_expr! {MemberAccess}
+create_from_boxed_expr! {MemberAccess}
 
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) struct IndexAccess
@@ -521,7 +509,7 @@ pub(crate) struct IndexAccess
   pub(crate) index: Expression,
 }
 
-create_into_boxed_expr! {IndexAccess}
+create_from_boxed_expr! {IndexAccess}
 
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) struct RangeAccess
@@ -530,12 +518,6 @@ pub(crate) struct RangeAccess
   pub(crate) start: Option<Expression>,
   pub(crate) end: Option<Expression>,
 }
-#[derive(Debug)]
-pub(crate) struct HasLabels
-{
-  pub(crate) left: String,
-  pub(crate) labels: Vec<String>,
-}
 
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) struct FunctionCall
@@ -544,7 +526,7 @@ pub(crate) struct FunctionCall
   pub(crate) arguments: Vec<Expression>,
 }
 
-create_into_expr! {FunctionCall}
+create_from_expr! {FunctionCall}
 
 macro_rules! create_binary_op {
   ( $x:tt ) => {
@@ -555,7 +537,7 @@ macro_rules! create_binary_op {
       pub(crate) right: Expression,
     }
 
-    create_into_boxed_expr! { $x }
+    create_from_boxed_expr! { $x }
   };
 }
 
@@ -576,6 +558,7 @@ create_binary_op! {Subtraction}
 create_binary_op! {Multiplication}
 create_binary_op! {Division}
 create_binary_op! {Modulo}
+create_binary_op! {Exponent}
 
 macro_rules! create_unary_op {
   ( $x:tt ) => {
@@ -584,7 +567,7 @@ macro_rules! create_unary_op {
     {
       pub(crate) value: Expression,
     }
-    create_into_boxed_expr! { $x }
+    create_from_boxed_expr! { $x }
   };
 }
 
@@ -595,18 +578,13 @@ create_unary_op! {IsNotNull}
 
 // Values
 
-#[derive(Debug)]
-pub(crate) struct All {}
-#[derive(Debug)]
-pub(crate) struct EndOfList {}
-
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) struct Value
 {
   pub(crate) value: crate::value::Value,
 }
 
-create_into_expr! {Value}
+create_from_expr! {Value}
 
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) struct Map
@@ -614,7 +592,7 @@ pub(crate) struct Map
   pub(crate) map: Vec<(String, Expression)>,
 }
 
-create_into_expr! {Map}
+create_from_expr! {Map}
 
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) struct Array
@@ -622,4 +600,4 @@ pub(crate) struct Array
   pub(crate) array: Vec<Expression>,
 }
 
-create_into_expr! {Array}
+create_from_expr! {Array}

data/ext/{gqliterb/vendor/gqlitedb → gqlitedb}/src/parser/gql.pest

@@ -29,7 +29,7 @@ nothing = { nothing_ident? }
 // fragments
 
 labels       = { ":" ~ label_expression }
-pattern      = { ident? ~ labels? ~ map? }
+pattern      = { ident? ~ labels? ~ (map | parameter)? }
 node_pattern = { "(" ~ pattern ~ ")" }
 
 directed_edge_pattern   = { (")-[" ~ pattern ~ "]->(") | (nothing ~ ")-->(") }
@@ -64,6 +64,8 @@ where_modifier = { "WHERE" ~ expression }
 // Statements
 statement = {
     create_graph_statement
+  | drop_graph_if_exists_statement
+  | drop_graph_statement
   | use_graph_statement
   | create_statement
   | optional_match_statement
@@ -81,6 +83,8 @@ statement = {
 star = { "*" }
 
 create_graph_statement   = { "CREATE" ~ "GRAPH" ~ ident }
+drop_graph_statement     = { "DROP" ~ "GRAPH" ~ ident }
+drop_graph_if_exists_statement     = { "DROP" ~ "GRAPH" ~ "IF" ~ "EXISTS" ~ ident }
 use_graph_statement      = { "USE" ~ ident }
 
 create_statement         = { "CREATE" ~ node_or_edge_pattern ~ ("," ~ node_or_edge_pattern)* }
@@ -121,7 +125,7 @@ remove_member_access =  { (("(" ~ ident ~ ")") | ident) ~ ("." ~ ident)+ }
 
 expression = { prefix* ~ expression_term ~ postfix* ~ (infix ~ prefix? ~ expression_term ~ postfix*)* }
 
-infix   = _{ addition | subtraction | multiplication | division | modulo | or | and | xor | equal | different | in_ | not_in | superior_equal | inferior_equal | superior | inferior }
+infix   = _{ addition | subtraction | multiplication | division | modulo | exponent | or | and | xor | equal | different | in_ | not_in | superior_equal | inferior_equal | superior | inferior }
 postfix = _{ is_null | is_not_null | member_access | range_access | range_access_to | index_access }
 prefix  = _{ negation | not }
 
@@ -130,6 +134,7 @@ subtraction    = { "-" }
 multiplication = { "*" }
 division       = { "/" }
 modulo         = { "%" }
+exponent       = { "^" }
 
 xor_kw         = @{ "XOR" ~ !ASCII_ALPHA }
 xor            =  { xor_kw }
@@ -164,8 +169,8 @@ label_check_expression = { ident ~ (":" ~ ident)+ }
 parenthesised_expression = { "(" ~ expression ~ ")" }
 named_expression         = { (expression ~ "AS" ~ ident) | expression }
 function_call            = { function_name ~ "(" ~ (expression ~ ("," ~ expression)*)? ~ ")" }
-count_star               = { "count" ~ "(" ~ "*" ~ ")" }
-expression_term          = { null_lit | true_lit | false_lit | num | hexa_int | octa_int | int | string_literal | map | array | label_check_expression | parameter | parenthesised_expression | function_call | count_star | ident }
+function_star            = { function_name ~ "(" ~ "*" ~ ")" }
+expression_term          = { null_lit | true_lit | false_lit | num | hexa_int | octa_int | int | string_literal | map | array | label_check_expression | parameter | parenthesised_expression | function_call | function_star | ident }
 
 parameter = { "$" ~ parameter_name }