gqlite 1.2.3 → 1.3.1

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

@@ -32,6 +32,29 @@ impl super::FunctionTrait for Coalesce
 
 super::declare_function!(coalesce, Coalesce, custom_trait);
 
+#[derive(Debug, Default)]
+pub(super) struct Id {}
+
+impl Id
+{
+  fn call_impl(value: &value::Value) -> FResult<graph::Key>
+  {
+    match value
+    {
+      value::Value::Node(n) => Ok(n.key()),
+      value::Value::Edge(e) => Ok(e.key()),
+      _ => Err(RunTimeError::InvalidArgument {
+        function_name: "id",
+        index: 0,
+        expected_type: "node or edge",
+        value: format!("{:?}", value),
+      }),
+    }
+  }
+}
+
+super::declare_function!(id, Id, call_impl(crate::value::Value) -> graph::Key);
+
 #[derive(Debug, Default)]
 pub(super) struct ToInteger {}
 
@@ -70,8 +93,8 @@ impl Properties
   {
     match value
     {
-      value::Value::Node(n) => Ok(n.properties.to_owned()),
-      value::Value::Edge(e) => Ok(e.properties.to_owned()),
+      value::Value::Node(n) => Ok(n.properties().to_owned()),
+      value::Value::Edge(e) => Ok(e.properties().to_owned()),
       value::Value::Map(m) => Ok(m.to_owned()),
       _ => Err(RunTimeError::InvalidArgument {
         function_name: "properties",

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

@@ -11,8 +11,8 @@ impl HasLabel
   {
     match value
     {
-      value::Value::Edge(e) => Ok(e.labels.contains(label)),
-      value::Value::Node(n) => Ok(n.labels.contains(label)),
+      value::Value::Edge(e) => Ok(e.labels().contains(label)),
+      value::Value::Node(n) => Ok(n.labels().contains(label)),
       _ => Err(RunTimeError::InvalidArgument {
         function_name: "has_label",
         index: 0,
@@ -45,11 +45,11 @@ impl super::FunctionTrait for HasLabels
     }
     else
     {
-      let mut it = arguments.into_iter();
+      let mut it = arguments.iter();
       let labels = match it.next().unwrap()
       {
-        value::Value::Edge(e) => e.labels,
-        value::Value::Node(n) => n.labels,
+        value::Value::Edge(e) => e.labels(),
+        value::Value::Node(n) => n.labels(),
         value::Value::Null => return Ok(value::Value::Null),
         _ => Err(RunTimeError::InvalidArgument {
           function_name: "has_labels",
@@ -64,7 +64,7 @@ impl super::FunctionTrait for HasLabels
         {
           value::Value::String(l) =>
           {
-            if !labels.contains(&l)
+            if !labels.contains(l)
             {
               return Ok(false.into());
             }

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

@@ -59,6 +59,13 @@ impl FunctionTypeTrait for f64
   }
 }
 
+impl FunctionTypeTrait for graph::Key
+{
+  fn result_type() -> ExpressionType
+  {
+    ExpressionType::Key
+  }
+}
 impl<T> FunctionTypeTrait for Vec<T>
 {
   fn result_type() -> ExpressionType
@@ -133,24 +140,25 @@ impl Manager
     Self {
       inner: ManagerInner {
         functions: HashMap::from([
-          containers::Head::new(),
-          containers::Keys::new(),
-          containers::Range::new(),
-          containers::Size::new(),
-          edge::Type::new(),
-          math::Ceil::new(),
-          math::Floor::new(),
-          math::Rand::new(),
-          node::Labels::new(),
-          path::Length::new(),
-          path::Nodes::new(),
-          path::Edges::new(),
-          scalar::Coalesce::new(),
-          scalar::Properties::new(),
-          scalar::ToInteger::new(),
-          string::ToString::new(),
-          value::HasLabel::new(),
-          value::HasLabels::new(),
+          containers::Head::create(),
+          containers::Keys::create(),
+          containers::Range::create(),
+          containers::Size::create(),
+          edge::Type::create(),
+          math::Ceil::create(),
+          math::Floor::create(),
+          math::Rand::create(),
+          node::Labels::create(),
+          path::Length::create(),
+          path::Nodes::create(),
+          path::Edges::create(),
+          scalar::Coalesce::create(),
+          scalar::Id::create(),
+          scalar::Properties::create(),
+          scalar::ToInteger::create(),
+          string::ToString::create(),
+          value::HasLabel::create(),
+          value::HasLabels::create(),
         ]),
         aggregators: aggregators::init_aggregators(),
       }
@@ -323,7 +331,7 @@ macro_rules! declare_function_ {
   ($function_name: ident, $type_name: ty, $f_name: ident (  $( $arg_type: ty $(,)? )* ) -> $ret_type: ty, $allow_null: expr, $validator: block ) => {
     impl $type_name
     {
-      pub(super) fn new() -> (String, crate::functions::Function)
+      pub(super) fn create() -> (String, crate::functions::Function)
       {
         (
           stringify!($function_name).to_string(),
@@ -389,7 +397,7 @@ macro_rules! declare_function {
   ($function_name: ident, $type_name: ty, custom_trait ) => {
     impl $type_name
     {
-      pub(super) fn new() -> (String, crate::functions::Function)
+      pub(super) fn create() -> (String, crate::functions::Function)
       {
         (
           stringify!($function_name).to_string(),

data/ext/gqlitedb/src/graph.rs

@@ -0,0 +1,11 @@
+pub(crate) use graphcore::SinglePath;
+pub use graphcore::{Edge, Key, Node, SinglePath as Path};
+
+pub use graphcore::labels;
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) enum EdgeDirectivity
+{
+  Undirected,
+  Directed,
+}