chore: fixes for cubesql

cube-js · Oct 18, 2024 · 379c9b1 · 379c9b1
1 parent 3c40516
commit 379c9b1
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 57 deletions.
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/members.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/members.rs
@@ -1688,7 +1688,7 @@ impl MemberRules {
                         .find_cube_with_name(time_dimension_name.split(".").next().unwrap())
                     {
                         if let Some(time_dimension) = cube.dimensions.iter().find(|d| {
-                            d._type == "time" && d.name.eq_ignore_ascii_case(&time_dimension_name)
+                            d.r#type == "time" && d.name.eq_ignore_ascii_case(&time_dimension_name)
                         }) {
                             for granularity in
                                 var_iter!(egraph[subst[granularity_var]], LiteralExprValue)

diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/old_split.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/old_split.rs
@@ -5065,8 +5065,8 @@ impl OldSplitRules {
                                 meta.find_cube_by_column(&alias_to_cube, &column)
                             {
                                 if let Some(dimension) = cube.lookup_dimension(&column.name) {
-                                    if is_time_dimension && dimension._type == "time"
-                                        || !is_time_dimension && dimension._type != "time"
+                                    if is_time_dimension && dimension.r#type == "time"
+                                        || !is_time_dimension && dimension.r#type != "time"
                                     {
                                         if let Some(expr_name) =
                                             original_expr_name(egraph, subst[arg_expr_var])