Skip to content

Commit d78cd6b

Browse files
authored
fix(cubesql): Add missing pub CubeMetaNestedFolder in cube client (cube-js#9790)
* fix(cubesql): Add missing pub CubeMetaNestedFolder in cube client * add support for nested folders * Correct exports
1 parent f1dff82 commit d78cd6b

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pub mod v1_cube_meta_measure;
1414
pub use self::v1_cube_meta_measure::V1CubeMetaMeasure;
1515
pub mod v1_cube_meta_nested_folder;
1616
pub use self::v1_cube_meta_nested_folder::V1CubeMetaNestedFolder;
17+
pub use self::v1_cube_meta_nested_folder::V1CubeMetaNestedFolderMember;
1718
pub mod v1_cube_meta_segment;
1819
pub use self::v1_cube_meta_segment::V1CubeMetaSegment;
1920
pub mod v1_cube_meta_type;

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,23 @@
1111
use crate::models;
1212
use serde::{Deserialize, Serialize};
1313

14+
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
15+
#[serde(untagged)]
16+
pub enum V1CubeMetaNestedFolderMember {
17+
Simple(String),
18+
Folder(V1CubeMetaNestedFolder),
19+
}
20+
1421
#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
1522
pub struct V1CubeMetaNestedFolder {
1623
#[serde(rename = "name")]
1724
pub name: String,
1825
#[serde(rename = "members")]
19-
pub members: Vec<String>,
26+
pub members: Vec<V1CubeMetaNestedFolderMember>,
2027
}
2128

2229
impl V1CubeMetaNestedFolder {
23-
pub fn new(name: String, members: Vec<String>) -> V1CubeMetaNestedFolder {
30+
pub fn new(name: String, members: Vec<V1CubeMetaNestedFolderMember>) -> V1CubeMetaNestedFolder {
2431
V1CubeMetaNestedFolder { name, members }
2532
}
2633
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ pub type CubeMetaMeasure = cubeclient::models::V1CubeMetaMeasure;
1010
pub type CubeMetaSegment = cubeclient::models::V1CubeMetaSegment;
1111
pub type CubeMetaJoin = cubeclient::models::V1CubeMetaJoin;
1212
pub type CubeMetaFolder = cubeclient::models::V1CubeMetaFolder;
13+
pub type CubeMetaNestedFolder = cubeclient::models::V1CubeMetaNestedFolder;
14+
pub type CubeMetaNestedFolderMember = cubeclient::models::V1CubeMetaNestedFolderMember;
1315
pub type CubeMetaHierarchy = cubeclient::models::V1CubeMetaHierarchy;
1416
// Request/Response
1517
pub type TransportLoadResponse = cubeclient::models::V1LoadResponse;

0 commit comments

Comments
 (0)