- releasing version 0.2.6

- change new db, drop db, permit query
mjm918 · Jun 11, 2023 · 2dd1dfb · 2dd1dfb
1 parent b76d768
commit 2dd1dfb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flql"
-version = "0.2.5"
+version = "0.2.6"
 edition = "2021"
 authors = ["Mohammad Julfikar <julfikar@eztech.com.my>", "Mohammad Julfikar <md.julfikar.mahmud@gmail.com>"]
 categories = ["parser-implementations"]

diff --git a/flql.pest b/flql.pest
@@ -28,9 +28,9 @@ expr = {
     delete_clip
 }
 
-new_db = { "db"~"."~"new"~"("~db~")"~"."~"permit"~"("~object~")" }
-perm_db = { "db"~"("~db~")"~"."~"permit"~"("~object~")" }
-drop_db = { "db"~"("~db~")"~"."~"drop"~"("~")" }
+new_db = { "db"~"."~"new"~"("~object~")" }
+perm_db = { "db"~"."~"permit"~"("~object~")" }
+drop_db = { "db"~"."~"drop"~"("~db~")" }
 drop_user = { "db"~"("~db~")"~"."~"user"~"("~quots~")"~"."~"drop"~"("~")" }
 
 new = { "new" ~ "(" ~ object ~ ")" }

diff --git a/src/lib.rs b/src/lib.rs
@@ -90,8 +90,8 @@ use crate::exp_parser::BoxedExpression;
 ///             if chk.is_ok() {
 ///                 let parsed = chk.unwrap();
 ///                 match parsed {
-///                     Flql::DbNew(_,_) => {}
-///                     Flql::DbPerm(_,_) => {}
+///                     Flql::DbNew(_) => {}
+///                     Flql::DbPerm(_) => {}
 ///                     Flql::DbDrop(_) => {}
 ///                     Flql::New(_) => {}
 ///                     Flql::Drop(_) => {}
@@ -451,8 +451,8 @@ struct FlqlParser;
 
 #[derive(PartialEq, Debug, Clone)]
 pub enum Flql {
-    DbNew(String,String),
-    DbPerm(String,String),
+    DbNew(String),
+    DbPerm(String),
     DbDrop(String),
     New(String),
     Drop(String),
@@ -483,18 +483,10 @@ fn pair_parser(pair: Pair<Rule>) -> Flql {
     match pair.as_rule() {
         Rule::expr => pair_parser(pair.into_inner().next().unwrap()),
         Rule::new_db => {
-            let two = two(pair);
-            Flql::DbNew(
-                two[0].to_string(),
-                two[1].to_string()
-            )
+            Flql::DbNew(one(pair).to_string())
         },
         Rule::perm_db => {
-            let two = two(pair);
-            Flql::DbPerm(
-                two[0].to_string(),
-                two[1].to_string()
-            )
+            Flql::DbPerm(one(pair).to_string())
         }
         Rule::drop_db => {
             Flql::DbDrop(one(pair).to_string())
@@ -766,8 +758,8 @@ mod tests {
             if chk.is_ok() {
                 let parsed = chk.unwrap();
                 match parsed {
-                    Flql::DbNew(_,_) => {}
-                    Flql::DbPerm(_,_) => {}
+                    Flql::DbNew(_) => {}
+                    Flql::DbPerm(_) => {}
                     Flql::DbDrop(_) => {}
                     Flql::New(_) => {}
                     Flql::Drop(_) => {}