update

Author: waralexrom

packages/cubejs-backend-native/Cargo.lock

@@ -413,23 +413,12 @@ view(\`OrdersView3\`, {
     expect(cube.config.measures.filter((({ isVisible }) => isVisible)).length).toBe(0);
   });
 
-  if (getEnv('nativeSqlPlanner')) {
-    it('split views', async () => runQueryTest({
-      measures: ['OrdersView3.count'],
-      dimensions: ['OrdersView3_ProductCategories.name'],
-      order: [{ id: 'OrdersView3_ProductCategories.name' }],
-    }, [{
-      orders_view3__count: '2',
-      orders_view3_product_categories__name: 'Groceries',
-    }]));
-  } else {
-    it('split views', async () => runQueryTest({
-      measures: ['OrdersView3.count'],
-      dimensions: ['OrdersView3_ProductCategories.name'],
-      order: [{ id: 'OrdersView3_ProductCategories.name' }],
-    }, [{
-      orders_view3__count: '2',
-      orders_view3__product_categories__name: 'Groceries',
-    }]));
-  }
+  it('split views', async () => runQueryTest({
+    measures: ['OrdersView3.count'],
+    dimensions: ['OrdersView3_ProductCategories.name'],
+    order: [{ id: 'OrdersView3_ProductCategories.name' }],
+  }, [{
+    orders_view3__count: '2',
+    orders_view3__product_categories__name: 'Groceries',
+  }]));
 });

packages/cubejs-schema-compiler/test/integration/postgres/cube-views.test.ts

@@ -207,31 +207,16 @@ view(\`Product_Stock\`, {
     );
   }
 
-  if (getEnv('nativeSqlPlanner')) {
-    it('join order', async () => runQueryTest({
-      measures: ['Product_Stock.quantity'],
-      dimensions: [
-        'Product_Stock.sub_category',
-        'Product_Stock.brand'
-      ],
-      order: [{ id: 'Product_Stock.quantity' }]
-    }, [{
-      product_stock__sub_category: 'Sub Category',
-      product_stock__brand: 'Brand',
-      product_stock__quantity: '10',
-    }]));
-  } else {
-    it('join order', async () => runQueryTest({
-      measures: ['Product_Stock.quantity'],
-      dimensions: [
-        'Product_Stock.sub_category',
-        'Product_Stock.brand'
-      ],
-      order: [{ id: 'Product_Stock.quantity' }]
-    }, [{
-      product__stock__sub_category: 'Sub Category',
-      product__stock__brand: 'Brand',
-      product__stock__quantity: '10',
-    }]));
-  }
+  it('join order', async () => runQueryTest({
+    measures: ['Product_Stock.quantity'],
+    dimensions: [
+      'Product_Stock.sub_category',
+      'Product_Stock.brand'
+    ],
+    order: [{ id: 'Product_Stock.quantity' }]
+  }, [{
+    product__stock__sub_category: 'Sub Category',
+    product__stock__brand: 'Brand',
+    product__stock__quantity: '10',
+  }]));
 });

packages/cubejs-schema-compiler/test/integration/postgres/views-join-order.test.ts

@@ -11,7 +11,6 @@ use crate::plan::FilterItem;
 use crate::planner::sql_evaluator::collectors::collect_join_hints;
 use crate::planner::sql_templates::PlanSqlTemplates;
 use chrono_tz::Tz;
-use convert_case::{Boundary, Case, Casing};
 use cubenativeutils::CubeError;
 use itertools::Itertools;
 use lazy_static::lazy_static;
@@ -187,9 +186,7 @@ impl QueryTools {
     }
 
     pub fn alias_name(&self, name: &str) -> String {
-        name.without_boundaries(&[Boundary::LOWER_DIGIT, Boundary::UPPER_DIGIT])
-            .to_case(Case::Snake)
-            .replace(".", "__")
+        PlanSqlTemplates::alias_name(name)
     }
 
     pub fn escaped_alias_name(&self, name: &str) -> String {

rust/cubesqlplanner/Cargo.lock

@@ -10,6 +10,18 @@ use std::rc::Rc;
 pub struct PlanSqlTemplates {
     render: Rc<dyn SqlTemplatesRender>,
 }
+pub const UNDERSCORE_UPPER_BOUND: Boundary = Boundary {
+    name: "LowerUpper",
+    condition: |s, _| {
+        s.get(0) == Some(&"_")
+            && s.get(1)
+                .map(|c| c.to_uppercase() != c.to_lowercase() && *c == c.to_uppercase())
+                == Some(true)
+    },
+    arg: None,
+    start: 0,
+    len: 0,
+};
 
 impl PlanSqlTemplates {
     pub fn new(render: Rc<dyn SqlTemplatesRender>) -> Self {
@@ -18,8 +30,12 @@ impl PlanSqlTemplates {
 
     pub fn alias_name(name: &str) -> String {
         let res = name
-            .from_case(Case::Camel)
-            .without_boundaries(&[Boundary::LOWER_DIGIT, Boundary::UPPER_DIGIT])
+            .with_boundaries(&[
+                UNDERSCORE_UPPER_BOUND,
+                Boundary::LOWER_UPPER,
+                Boundary::DIGIT_LOWER,
+                Boundary::ACRONYM,
+            ])
             .to_case(Case::Snake)
             .replace(".", "__");
         res