in work

Author: waralexrom

packages/cubejs-schema-compiler/src/compiler/CubeValidator.ts

@@ -657,30 +657,51 @@ const SwitchDimension = Joi.object({
   values: Joi.array().items(Joi.string()).min(1).required()
 });
 
+const CaseSchema = Joi.object().keys({
+  when: Joi.array().items(Joi.object().keys({
+    sql: Joi.func().required(),
+    label: Joi.alternatives([
+      Joi.string(),
+      Joi.object().keys({
+        sql: Joi.func().required()
+      })
+    ])
+  })),
+  else: Joi.object().keys({
+    label: Joi.alternatives([
+      Joi.string(),
+      Joi.object().keys({
+        sql: Joi.func().required()
+      })
+    ])
+  })
+}).required();
+
+const SwitchCaseSchema = Joi.object().keys({
+  switch: Joi.alternatives([
+    Joi.string(),
+    Joi.func()
+  ]).required(),
+  when: Joi.array().items(Joi.object().keys({
+    value: Joi.string().required(),
+    sql: Joi.func().required()
+  })),
+  else: Joi.object().keys({
+    sql: Joi.func().required()
+  })
+}).required();
+
+const CaseVariants = Joi.alternatives().try(
+  CaseSchema,
+  SwitchCaseSchema
+);
+
 const DimensionsSchema = Joi.object().pattern(identifierRegex, Joi.alternatives().conditional(Joi.ref('.type'), {
   is: 'switch',
   then: SwitchDimension,
   otherwise: Joi.alternatives().try(
     inherit(BaseDimensionWithoutSubQuery, {
-      case: Joi.object().keys({
-        when: Joi.array().items(Joi.object().keys({
-          sql: Joi.func().required(),
-          label: Joi.alternatives([
-            Joi.string(),
-            Joi.object().keys({
-              sql: Joi.func().required()
-            })
-          ])
-        })),
-        else: Joi.object().keys({
-          label: Joi.alternatives([
-            Joi.string(),
-            Joi.object().keys({
-              sql: Joi.func().required()
-            })
-          ])
-        })
-      }).required()
+      case: CaseVariants
     }),
     inherit(BaseDimensionWithoutSubQuery, {
       latitude: Joi.object().keys({

packages/cubejs-schema-compiler/src/compiler/transpilers/CubePropContextTranspiler.ts

@@ -20,6 +20,7 @@ export const transpiledFieldsPatterns: Array<RegExp> = [
   /^measures\.[_a-zA-Z][_a-zA-Z0-9]*\.(timeShift|time_shift)\.[0-9]+\.(timeDimension|time_dimension)$/,
   /^measures\.[_a-zA-Z][_a-zA-Z0-9]*\.(reduceBy|reduce_by|groupBy|group_by|addGroupBy|add_group_by)$/,
   /^dimensions\.[_a-zA-Z][_a-zA-Z0-9]*\.(reduceBy|reduce_by|groupBy|group_by|addGroupBy|add_group_by)$/,
+  /^dimensions\.[_a-zA-Z][_a-zA-Z0-9]*\.case\.switch$/,
   /^(preAggregations|pre_aggregations)\.[_a-zA-Z][_a-zA-Z0-9]*\.indexes\.[_a-zA-Z][_a-zA-Z0-9]*\.columns$/,
   /^(preAggregations|pre_aggregations)\.[_a-zA-Z][_a-zA-Z0-9]*\.(timeDimensionReference|timeDimension|time_dimension|segments|dimensions|measures|rollups|segmentReferences|dimensionReferences|measureReferences|rollupReferences)$/,
   /^(preAggregations|pre_aggregations)\.[_a-zA-Z][_a-zA-Z0-9]*\.(timeDimensions|time_dimensions)\.\d+\.dimension$/,

packages/cubejs-schema-compiler/test/integration/postgres/calc-groups.test.ts

@@ -54,13 +54,14 @@ cubes:
       - name: test
         type: string
         case:
+          switch: "{CUBE}.currency"
           when:
-            - sql: "{CUBE.currency} = 'USD'"
-              label: '111'
-            - sql: "{CUBE.currency} = 'EUR'"
-              label: '333'
+            - value: USD
+              sql: "'111'"
+            - value: EUR
+              sql: "'333'"
           else:
-            label: 'def'
+            sql: "'def'"
 
       - name: strategy
         type: switch

rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/case_switch_else_item.rs

@@ -0,0 +1,17 @@
+use crate::cube_bridge::member_sql::{MemberSql, NativeMemberSql};
+
+use super::case_label::CaseLabel;
+use cubenativeutils::wrappers::serializer::{
+    NativeDeserialize, NativeDeserializer, NativeSerialize,
+};
+use cubenativeutils::wrappers::NativeContextHolder;
+use cubenativeutils::wrappers::NativeObjectHandle;
+use cubenativeutils::CubeError;
+use std::any::Any;
+use std::rc::Rc;
+
+#[nativebridge::native_bridge]
+pub trait CaseSwitchElseItem {
+    #[nbridge(field)]
+    fn sql(&self) -> Result<Rc<dyn MemberSql>, CubeError>;
+}

rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/case_switch_item.rs

@@ -0,0 +1,18 @@
+use super::case_label::CaseLabel;
+use super::member_sql::{MemberSql, NativeMemberSql};
+use cubenativeutils::wrappers::serializer::{
+    NativeDeserialize, NativeDeserializer, NativeSerialize,
+};
+use cubenativeutils::wrappers::NativeContextHolder;
+use cubenativeutils::wrappers::NativeObjectHandle;
+use cubenativeutils::CubeError;
+use std::any::Any;
+use std::rc::Rc;
+
+#[nativebridge::native_bridge]
+pub trait CaseSwitchItem {
+    #[nbridge(field)]
+    fn value(&self) -> Result<String, CubeError>;
+    #[nbridge(field)]
+    fn sql(&self) -> Result<Rc<dyn MemberSql>, CubeError>;
+}

rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/mod.rs

@@ -4,6 +4,8 @@ pub mod case_definition;
 pub mod case_else_item;
 pub mod case_item;
 pub mod case_label;
+pub mod case_switch_else_item;
+pub mod case_switch_item;
 pub mod cube_definition;
 pub mod dimension_definition;
 pub mod driver_tools;