20231102-2-support kill , return , throw

README.md

@@ -246,16 +246,12 @@ full = ["row", "builder", "surreal"]
 - [x]  <strong>Surrealism.toml支持</strong> 
 - [ ]   <strong>自定义构建支持(SurrealismConfig)</strong> 
 
-
-
 ### Init 初始化服务
 
 
 - [x]  <strong>DefaultInitService 默认初始化服务的支持</strong> 
 - [ ]   <strong>自定义初始化服务的支持</strong> 
 
-
-
 ### ID 表ID
 
 - [x] <strong>SurrealID::Default的支持</strong> 
@@ -269,8 +265,6 @@ full = ["row", "builder", "surreal"]
 - [x]  <strong>SurrealID::Range的支持</strong> 
 
 
-
-
 ### Value 数据类型
 
 
@@ -292,8 +286,6 @@ full = ["row", "builder", "surreal"]
 - [x]  <strong>数学常数构建</strong> 
 - [x]  <strong>数学常数支持</strong> 
 
-
-
 ## Builder
 
 
@@ -318,19 +310,16 @@ full = ["row", "builder", "surreal"]
 - [ ] <strong>FOR STMT</strong> 
 - [ ] <strong>BREAK STMT</strong> 
 - [ ] <strong>CONTINUE STMT</strong> 
-- [ ] <strong>KILL STMT</strong> 
-- [ ] <strong>THROW STMT</strong> 
-
-
+- [x] <strong>KILL STMT</strong> 
+- [x] <strong>THROW STMT</strong> 
+- [x] <strong>RETURN STMT</strong> 
 
 ### Use
 
 
 - [x]  <strong>USE NS STMT</strong> 
 - [x]  <strong>USE DB STMT</strong> 
 
-
-
 ### Create
 
 
@@ -340,8 +329,6 @@ full = ["row", "builder", "surreal"]
 - [x]  <strong>TIMEOUT STMT</strong> 
 - [x]  <strong>PARALLEL STMT</strong> 
 
-
-
 ### Insert
 
 
@@ -386,8 +373,6 @@ full = ["row", "builder", "surreal"]
 - [x]  <strong>PARALLEL</strong> 
 - [ ] <strong>DELETE WITH RELETE</strong> 
 
-
-
 ### Remove
 
 
@@ -435,8 +420,6 @@ full = ["row", "builder", "surreal"]
 - [x]  <strong>PARAM</strong> 
 - [x] <strong>ANALYZER</strong> 
 
-
-
 ### Info
 
 
@@ -446,23 +429,17 @@ full = ["row", "builder", "surreal"]
 - [x]  <strong>SCOPE</strong> 
 - [x]  <strong>TABLE</strong> 
 
-
-
 ### Show
 
 
 - [x]  <strong>SINCE</strong> 
 - [x]  <strong>LIMIT</strong> 
 
-
-
 ### Sleep
 
 
 - [x]  <strong>Duration</strong> 
 
-
-
 ## Assert
 
 
@@ -471,8 +448,6 @@ full = ["row", "builder", "surreal"]
 - [x]  <strong>Condition</strong> 
 - [x]  <strong>Criteria</strong> 
 
-
-
 ## Functions
 
 
@@ -495,8 +470,6 @@ full = ["row", "builder", "surreal"]
 - [ ] <strong>Scripting</strong> 
 - [ ] <strong>Vector</strong> 
 
-
-
 ## Row
 
 
@@ -552,8 +525,11 @@ full = ["row", "builder", "surreal"]
 
 - 0.3.1：
   - 重构Define语句且补全DEFINE ANALYSIS
+  - 支持Return语句
+  - 支持Kill语句
+  - 支持Throw语句
   - 
-
+  
 - 0.3.0：
   - 重构init Service 和 config Service（Refactoring init service and config service）
   - 优化SurrealValue（Optimize SurrealValue）

surrealism/src/core/builder/define/analyzer.rs

@@ -8,7 +8,7 @@
 //! ```
 
 use std::fmt::{Display, Formatter};
-use crate::db::constants::{BLANK, DEFINE_ANALYZER, FILTERS, STMT_END, TOKENIZERS};
+use crate::db::constants::{DEFINE_ANALYZER, FILTERS, STMT_END, TOKENIZERS};
 
 #[derive(Debug, Clone)]
 pub struct DefineAnalyzer<'a> {
@@ -66,12 +66,12 @@ impl<'a> DefineAnalyzer<'a> {
 
 impl<'a> Display for DefineAnalyzer<'a> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f,"{} {}", DEFINE_ANALYZER, self.name);
+        write!(f, "{} {}", DEFINE_ANALYZER, self.name);
         if let Some(tokenizers) = self.tokenizers.as_ref() {
-            write!(f," {} {}", TOKENIZERS, &tokenizers.join(", "));
+            write!(f, " {} {}", TOKENIZERS, &tokenizers.join(", "));
         }
-        if let Some(filters) =  self.filters.as_ref() {
-            write!(f," {} {}", FILTERS, filters.join(", "));
+        if let Some(filters) = self.filters.as_ref() {
+            write!(f, " {} {}", FILTERS, filters.join(", "));
         }
         write!(f, "{}", STMT_END)
     }

surrealism/src/core/builder/define/event.rs

@@ -7,7 +7,7 @@
 //! ```
 use std::fmt::{Display, Formatter};
 use super::{OnType};
-use crate::db::{Condition, ValueConstructor};
+use crate::db::{Condition};
 use crate::db::constants::{DEFINE_EVENT, ON_TABLE, STMT_END, THEN, WHEN};
 
 #[derive(Debug, Clone)]

surrealism/src/core/builder/define/function.rs

@@ -17,7 +17,7 @@
 
 
 use std::fmt::{Display, Formatter};
-use crate::db::constants::{DEFINE_FUNCTION, LEFT_BRACE, RETURN, RIGHT_BRACE, STMT_END};
+use crate::db::constants::{DEFINE_FUNCTION, LEFT_BRACE, RIGHT_BRACE, STMT_END};
 
 #[derive(Debug, Clone)]
 pub struct DefineFunction<'a> {

surrealism/src/core/builder/define/mod.rs

@@ -174,7 +174,7 @@ pub use index::{DefineIndex,UniqueSearch};
 
 use std::fmt::{Display, Formatter};
 use crate::db::{Condition, ParamCombine};
-use crate::db::constants::{ROLES, DEFINE_USER, NAMESPACE, DATABASE, PASSHASH, PASSWORD, ROOT, TABLE, DEFINE_DB, DEFINE_NS, DEFINE_LOGIN, DEFINE_SCOPE, STMT_END, ON, TYPE, SCOPE, PS256, PS384, PS512, EDDSA, ES256, ES384, ES512, HS256, HS384, HS512, RS256, RS384, RS512, VALUE, DEFINE_TOKEN, SCHEMA_FULL, SCHEMA_LESS, SIGN_IN, SIGN_UP, DROP, DEFINE_TABLE, BLANK, NONE, FULL, FOR, DEFINE_EVENT, ON_TABLE, WHEN, THEN, DEFINE_FUNCTION, RETURN, DEFINE_FIELD, FIELDS, COLUMNS, DEFINE_INDEX, UNIQUE, DEFINE_PARAM};
+use crate::db::constants::{ROLES, DEFINE_USER, NAMESPACE, DATABASE, PASSHASH, PASSWORD, ROOT, TABLE, DEFINE_DB, DEFINE_NS, DEFINE_LOGIN, DEFINE_SCOPE, STMT_END, ON, TYPE, SCOPE, PS256, PS384, PS512, EDDSA, ES256, ES384, ES512, HS256, HS384, HS512, RS256, RS384, RS512, VALUE, DEFINE_TOKEN, SCHEMA_FULL, SCHEMA_LESS, UNIQUE, DEFINE_PARAM, NONE, FULL, FOR, FIELDS, COLUMNS};
 
 
 

surrealism/src/core/builder/define/table.rs

@@ -8,7 +8,7 @@
 
 use super::{Permissions, Schema};
 use std::fmt::{Display, Formatter};
-use crate::db::constants::{BLANK, DEFINE_TABLE, DROP, STMT_END};
+use crate::db::constants::{DEFINE_TABLE, DROP, STMT_END};
 use crate::db::TimeUnit;
 
 #[derive(Debug, Clone)]

surrealism/src/core/builder/insert.rs

@@ -16,7 +16,7 @@
 
 use std::collections::{BTreeMap};
 use serde::Serialize;
-use crate::db::{Table, Criteria, SurrealValue, Object, SurrealID, ParamCombine, Set, Operator, InsertStrategy};
+use crate::db::{Table, SurrealValue, Object, SurrealID, ParamCombine, Set, Operator, InsertStrategy};
 use super::{BaseWrapperImpl, TableImpl};
 use crate::db::constants::{STMT_END, INSERT_UPDATE, INSERT, BLANK, VALUES, INTO};
 use crate::table_impl;

surrealism/src/core/builder/mod.rs

@@ -72,7 +72,7 @@ impl SQLBuilderFactory {
     pub fn remove<'w>() -> RemoveWrapper<'w> {
         RemoveWrapper::new()
     }
-    pub fn show()->ShowWrapper{ShowWrapper::new()}
+    pub fn show() -> ShowWrapper { ShowWrapper::new() }
     /// # make sleep statement
     /// ## example
     /// ```rust
@@ -89,12 +89,24 @@ impl SQLBuilderFactory {
     ///     Ok(())
     /// }
     /// ```
-    pub fn sleep(duration:SurrealValue)->String{
-        return if duration.is_duration(){
-           format!("SLEEP {}",duration.to_string())
-        }else{
+    pub fn sleep(duration: SurrealValue) -> String {
+        return if duration.is_duration() {
+            format!("SLEEP {}", duration.to_string())
+        } else {
             panic!("SLEEP should use Duration")
-        }
+        };
+    }
+    /// THROW语句可用于在发生意外情况的地方抛出错误。查询的执行将中止，错误将返回给客户端。
+    pub fn throw(error_msg: &str) -> String {
+        format!("THROW {}", &SurrealValue::string(error_msg).to_string())
+    }
+    pub fn returned(value: SurrealValue) -> String {
+        format!("RETURN {}", value.to_string())
+    }
+    /// KILL 语句用于终止正在运行的实时查询
+    /// KILL 语句不接受值类型，则此值必须解析为UUID。 因此，它将接受UUID或参数的字符串文字。
+    pub fn kill(value: &str) -> String {
+        format!("KILL '{}'", value)
     }
 }
 
@@ -109,7 +121,7 @@ pub trait BaseWrapperImpl {
     ///
     /// wrapper will build to String(Complete Statement)
     fn build(&mut self) -> String;
-    fn build_as_child(&mut self)->String;
+    fn build_as_child(&mut self) -> String;
 }
 
 /// wrapper param need table:Table

surrealism/src/core/builder/select.rs

@@ -33,7 +33,7 @@ use std::fmt::{Display, Formatter};
 use crate::{timeout_lifetime_impl, parallel_lifetime_impl, table_lifetime_impl};
 use crate::core::db::{Condition, Table, TimeOut, Order, Field, SurrealID, TimeUnit, ParamCombine};
 use super::{TimeoutImpl, ParallelImpl, TableImpl, ConditionImpl, BaseWrapperImpl};
-use crate::core::db::constants::{EXPLAIN, FULL, SELECT, STMT_END, BLANK, PARALLEL, ALL, GROUP_BY, ORDER_BY, SPLIT, START, LIMIT, FETCH, FROM, DIFF, LIVE_SELECT};
+use crate::core::db::constants::{EXPLAIN, FULL, SELECT, STMT_END, BLANK, PARALLEL, GROUP_BY, ORDER_BY, SPLIT, START, LIMIT, FETCH, FROM, LIVE_SELECT};
 use crate::db::With;
 
 pub trait SelectWrapperImpl<'w>: TableImpl + ParallelImpl + ConditionImpl + TimeoutImpl + BaseWrapperImpl {
@@ -187,7 +187,7 @@ impl<'w> BaseWrapperImpl for SelectWrapper<'w> {
 
 impl<'w> Display for SelectWrapper<'w> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let mut res = format!("{} {} {} {}", SELECT, &self.field.iter().map(|x|x.to_string()).collect::<Vec<String>>().join(", "), FROM, &self.table.combine());
+        let mut res = format!("{} {} {} {}", SELECT, &self.field.iter().map(|x| x.to_string()).collect::<Vec<String>>().join(", "), FROM, &self.table.combine());
         if self.omit.is_some() {
             res.push_str(BLANK);
 
@@ -418,7 +418,7 @@ impl<'w> BaseWrapperImpl for LiveSelectWrapper<'w> {
     }
 
     fn build_as_child(&mut self) -> String {
-        let mut res = format!("{} {} {} {}", LIVE_SELECT, &self.field.iter().map(|x|x.to_string()).collect::<Vec<String>>().join(", "), FROM, &self.table.combine());
+        let mut res = format!("{} {} {} {}", LIVE_SELECT, &self.field.iter().map(|x| x.to_string()).collect::<Vec<String>>().join(", "), FROM, &self.table.combine());
         if self.condition.is_some() {
             res.push_str(BLANK);
             res.push_str(&self.condition.as_ref().unwrap().combine())

surrealism/src/core/db/field.rs

@@ -8,7 +8,6 @@
 //! ```
 
 use std::fmt::{Display, Formatter};
-use crate::db::constants::BLANK;
 use crate::db::ParamCombine;
 use super::constants::{ALL, DIFF};
 

surrealism/src/core/db/value.rs

@@ -40,9 +40,7 @@
 //!
 use std::collections::{BTreeMap, HashMap};
 use std::fmt::{Display, Formatter};
-use std::ops::Deref;
 use num_traits::cast::FromPrimitive;
-use std::str::FromStr;
 use serde::{Serialize, Deserialize};
 use serde_json::Value;
 use surrealdb::sql::{Duration, Datetime};

surrealism/src/core/db/with.rs

@@ -1,6 +1,6 @@
 use std::fmt::{Display, Formatter};
 use crate::db::constants::{BLANK, WITH_INDEX};
-use super::constants::{WITH, WITH_NOINDEX};
+use super::constants::{WITH_NOINDEX};
 
 /// # With INDEX | NOINDEX
 /// 查询规划器可以根据查询的结构和需求，用一个或多个索引迭代器替换标准的表迭代器。
@@ -61,8 +61,8 @@ impl<'w> Display for With<'w> {
         match self {
             With::NOINDEX => f.write_str(WITH_NOINDEX),
             With::INDEX(index) => {
-                f.write_str(WITH_INDEX);
-                f.write_str(BLANK);
+                let _ = f.write_str(WITH_INDEX);
+                let _ = f.write_str(BLANK);
                 f.write_str(&index.join(", "))
             }
         }