fix(cubesql): Add folders to Cube Metadata

Author: max-kammerer

packages/cubejs-api-gateway/openspec.yml

@@ -158,6 +158,18 @@ components:
           type: "string"
         meta:
           type: "object"
+    V1CubeMetaFolder:
+      type: "object"
+      required:
+        - name
+        - members
+      properties:
+        name:
+          type: "string"
+        members:
+          type: array
+          items:
+            type: "string"
     V1CubeMeta:
       type: "object"
       required:
@@ -193,6 +205,10 @@ components:
           type: "array"
           items:
             $ref: "#/components/schemas/V1CubeMetaJoin"
+        folders:
+          type: "array"
+          items:
+            $ref: "#/components/schemas/V1CubeMetaFolder"
     V1CubeMetaType:
       type: "string"
       description: Type of cube

rust/cubesql/cubeclient/.openapi-generator/FILES

@@ -4,6 +4,7 @@ src/models/mod.rs
 src/models/v1_cube_meta.rs
 src/models/v1_cube_meta_dimension.rs
 src/models/v1_cube_meta_dimension_granularity.rs
+src/models/v1_cube_meta_folder.rs
 src/models/v1_cube_meta_join.rs
 src/models/v1_cube_meta_measure.rs
 src/models/v1_cube_meta_segment.rs

rust/cubesql/cubeclient/src/models/mod.rs

@@ -4,6 +4,8 @@ pub mod v1_cube_meta_dimension;
 pub use self::v1_cube_meta_dimension::V1CubeMetaDimension;
 pub mod v1_cube_meta_dimension_granularity;
 pub use self::v1_cube_meta_dimension_granularity::V1CubeMetaDimensionGranularity;
+pub mod v1_cube_meta_folder;
+pub use self::v1_cube_meta_folder::V1CubeMetaFolder;
 pub mod v1_cube_meta_join;
 pub use self::v1_cube_meta_join::V1CubeMetaJoin;
 pub mod v1_cube_meta_measure;

rust/cubesql/cubeclient/src/models/v1_cube_meta.rs

@@ -28,6 +28,8 @@ pub struct V1CubeMeta {
     pub segments: Vec<crate::models::V1CubeMetaSegment>,
     #[serde(rename = "joins", skip_serializing_if = "Option::is_none")]
     pub joins: Option<Vec<crate::models::V1CubeMetaJoin>>,
+    #[serde(rename = "folders", skip_serializing_if = "Option::is_none")]
+    pub folders: Option<Vec<crate::models::V1CubeMetaFolder>>,
 }
 
 impl V1CubeMeta {
@@ -48,6 +50,7 @@ impl V1CubeMeta {
             dimensions,
             segments,
             joins: None,
+            folders: None,
         }
     }
 }

rust/cubesql/cubeclient/src/models/v1_cube_meta_folder.rs

@@ -0,0 +1,23 @@
+/*
+ * Cube.js
+ *
+ * Cube.js Swagger Schema
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ * Generated by: https://openapi-generator.tech
+ */
+
+#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+pub struct V1CubeMetaFolder {
+    #[serde(rename = "name")]
+    pub name: String,
+    #[serde(rename = "members")]
+    pub members: Vec<String>,
+}
+
+impl V1CubeMetaFolder {
+    pub fn new(name: String, members: Vec<String>) -> V1CubeMetaFolder {
+        V1CubeMetaFolder { name, members }
+    }
+}

rust/cubesql/cubesql/benches/large_model.rs

@@ -100,6 +100,7 @@ pub fn get_large_model_test_meta(dims: usize) -> Vec<V1CubeMeta> {
             .collect(),
         segments: vec![],
         joins: None,
+        folders: None,
         meta: None,
     }]
 }

rust/cubesql/cubesql/src/compile/test/mod.rs

@@ -152,6 +152,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 name: "Logs".to_string(),
                 relationship: "belongsTo".to_string(),
             }]),
+            folders: None,
             meta: None,
         },
         CubeMeta {
@@ -199,6 +200,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 name: "NumberCube".to_string(),
                 relationship: "belongsTo".to_string(),
             }]),
+            folders: None,
             meta: None,
         },
         CubeMeta {
@@ -217,6 +219,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
             }],
             segments: vec![],
             joins: None,
+            folders: None,
             meta: None,
         },
         CubeMeta {
@@ -288,6 +291,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 .collect(),
             segments: Vec::new(),
             joins: Some(Vec::new()),
+            folders: None,
             meta: None,
         },
         CubeMeta {
@@ -396,6 +400,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 .collect(),
             segments: Vec::new(),
             joins: Some(Vec::new()),
+            folders: None,
             meta: None,
         },
     ]
@@ -418,6 +423,7 @@ pub fn get_string_cube_meta() -> Vec<CubeMeta> {
         }],
         segments: vec![],
         joins: None,
+        folders: None,
         meta: None,
     }]
 }
@@ -457,6 +463,7 @@ pub fn get_sixteen_char_member_cube() -> Vec<CubeMeta> {
         ],
         segments: vec![],
         joins: None,
+        folders: None,
         meta: None,
     }]
 }

rust/cubesql/cubesql/src/transport/ctx.rs

@@ -234,6 +234,7 @@ mod tests {
                 measures: vec![],
                 segments: vec![],
                 joins: None,
+                folders: None,
                 meta: None,
             },
             CubeMeta {
@@ -245,6 +246,7 @@ mod tests {
                 measures: vec![],
                 segments: vec![],
                 joins: None,
+                folders: None,
                 meta: None,
             },
         ];

rust/cubesql/cubesql/src/transport/mod.rs

@@ -9,6 +9,7 @@ pub type CubeMetaDimension = cubeclient::models::V1CubeMetaDimension;
 pub type CubeMetaMeasure = cubeclient::models::V1CubeMetaMeasure;
 pub type CubeMetaSegment = cubeclient::models::V1CubeMetaSegment;
 pub type CubeMetaJoin = cubeclient::models::V1CubeMetaJoin;
+pub type CubeMetaFolder = cubeclient::models::V1CubeMetaFolder;
 // Request/Response
 pub type TransportLoadResponse = cubeclient::models::V1LoadResponse;
 pub type TransportLoadRequestQuery = cubeclient::models::V1LoadRequestQuery;