Merge branch 'main' into feat-type-metas

partiql-common/Cargo.toml

@@ -25,7 +25,7 @@ pretty = "0.12"
 serde = { version = "1.*", features = ["derive"], optional = true }
 smallvec = { version = "1.*" }
 thiserror = "1.0"
-dashmap = "6.0.1"
+dashmap = "6.0"
 
 [features]
 default = []

partiql-common/src/lib.rs

@@ -1,4 +1,3 @@
-#![feature(mapped_lock_guards)]
 #![deny(rust_2018_idioms)]
 #![deny(clippy::all)]
 pub mod node;

partiql-parser/src/parse/partiql.lalrpop

@@ -288,9 +288,7 @@ FromClause: ast::AstNode<ast::FromClause> = {
                 };
 
                 let start = state.locations.get(&start_id).map_or(total.start.0.clone(), |v| v.start.0.clone());
-	            // let start = state.locations.get_or(&start_id, &total).start.0.clone();
                 let end = state.locations.get(&end_id).map_or(total.end.0.clone(), |v| v.end.0.clone());
-                // let end = state.locations.get_or(&end_id, &total).end.0.clone();
                 let range = start..end;
                 let join = state.node(ast::Join {
                     kind: ast::JoinKind::Cross,

partiql-types/Cargo.toml

@@ -32,7 +32,6 @@ thiserror = "1.*"
 indexmap = "2.2"
 
 derivative = "2.2"
-lazy_static = "1.5.0"
 
 [dev-dependencies]
 criterion = "0.4"

partiql-types/src/lib.rs

@@ -511,6 +511,13 @@ impl PartiqlShapeBuilder {
         self.new_static(Static::Array(a))
     }
 
+    // The AnyOf::from_iter(types) uses an IndexSet internally to
+    // deduplicate types, thus the match on any_of.types.len() could
+    // "flatten" AnyOfs that had duplicates.
+    // With the addition of IDs, this deduplication no longer happens.
+    // TODO revisit the current implementaion and consider an implementation
+    // that allows merging of the `metas` for the same type, e.g., with a
+    // user-defined control.
     pub fn any_of<I>(&self, types: I) -> PartiqlShape
     where
         I: IntoIterator<Item = PartiqlShape>,