Specific asset tables

backend/Cargo.toml

@@ -158,7 +158,6 @@ kube.workspace = true
 k8s-openapi.workspace = true
 libloading.workspace = true
 bitflags.workspace = true
-nom.workspace = true
 globset.workspace = true
 
 
@@ -378,7 +377,6 @@ pg_escape = "0.1.1"
 async-nats = "0.38.0"
 nkeys = "0.4.4"
 nu-parser = { version = "0.101.0", default-features = false }
-nom = "8.0.0"
 globset = "0.4.16"
 
 process-wrap = { version = "8.2.1", features = ["tokio1"] }

backend/parsers/windmill-parser-py/src/asset_parser.rs

@@ -23,9 +23,12 @@ pub fn parse_assets(input: &str) -> anyhow::Result<Vec<ParseAssetsResult<String>
             .iter()
             .all(|a| !(a.kind == kind && a.path == name))
         {
-            assets_finder
-                .assets
-                .push(ParseAssetsResult { kind, access_type: None, path: name });
+            assets_finder.assets.push(ParseAssetsResult {
+                kind,
+                access_type: None,
+                path: name,
+                specific_table: None,
+            });
         }
     }
 
@@ -70,6 +73,7 @@ impl Visitor for AssetsFinder {
                                     kind,
                                     access_type: None,
                                     path: name,
+                                    specific_table: None,
                                 });
                             }
                         }
@@ -87,11 +91,12 @@ impl Visitor for AssetsFinder {
     fn visit_expr_constant(&mut self, node: ExprConstant) {
         match node.value {
             Constant::Str(s) => {
-                if let Some((kind, path)) = parse_asset_syntax(&s) {
+                if let Some((kind, path)) = parse_asset_syntax(&s, false) {
                     self.assets.push(ParseAssetsResult {
                         kind,
                         path: path.to_string(),
                         access_type: None,
+                        specific_table: None,
                     });
                 }
             }
@@ -108,11 +113,12 @@ impl Visitor for AssetsFinder {
                     if let Expr::Constant(ExprConstant { value: Constant::Str(s), .. }) =
                         &keyword.value
                     {
-                        if let Some((kind, path)) = parse_asset_syntax(s) {
+                        if let Some((kind, path)) = parse_asset_syntax(s, false) {
                             self.assets.push(ParseAssetsResult {
                                 kind,
                                 path: path.to_string(),
                                 access_type: None,
+                                specific_table: None,
                             });
                         }
                     }
@@ -212,6 +218,7 @@ impl AssetsFinder {
                             kind: *kind,
                             path: path.to_string(),
                             access_type,
+                            specific_table: None,
                         });
                         return Ok(());
                     }
@@ -249,9 +256,15 @@ impl AssetsFinder {
 
         match arg_val {
             Some(Expr::Constant(ExprConstant { value: Constant::Str(value), .. })) => {
-                let path = parse_asset_syntax(&value).map(|(_, p)| p).unwrap_or(&value);
-                self.assets
-                    .push(ParseAssetsResult { kind, path: path.to_string(), access_type });
+                let path = parse_asset_syntax(&value, false)
+                    .map(|(_, p)| p)
+                    .unwrap_or(&value);
+                self.assets.push(ParseAssetsResult {
+                    kind,
+                    path: path.to_string(),
+                    access_type,
+                    specific_table: None,
+                });
             }
             _ => return Err(()),
         };

backend/parsers/windmill-parser-sql/Cargo.toml

@@ -20,4 +20,4 @@ anyhow.workspace = true
 lazy_static.workspace = true
 serde_json.workspace = true
 serde.workspace = true
-nom.workspace = true
+sqlparser = { version = "0.59.0", features = ["visitor"] }