fix: Merge measure/dimension's spec for formats (#10007)

Let's merge these types for now, because Cube still allows us to define all formats for all kinds of attributes.

Author: ovr

packages/cubejs-api-gateway/openspec.yml

@@ -144,7 +144,7 @@ components:
         meta:
           type: "object"
         format:
-          $ref: "#/components/schemas/V1CubeMetaDimensionFormat"
+          $ref: "#/components/schemas/V1CubeMetaFormat"
     V1CubeMetaMeasure:
       type: "object"
       required:
@@ -166,7 +166,7 @@ components:
         meta:
           type: "object"
         format:
-          $ref: "#/components/schemas/V1CubeMetaMeasureFormat"
+          $ref: "#/components/schemas/V1CubeMetaFormat"
         aliasMember:
           description: "When measure is defined in View, it keeps the original path: Cube.measure"
           type: "string"
@@ -267,24 +267,19 @@ components:
       enum:
         - "cube"
         - "view"
-    V1CubeMetaMeasureFormat:
+    V1CubeMetaSimpleFormat:
       type: "string"
-      description: Format of measure
+      description: Simple format
       enum:
         - "percent"
         - "currency"
-    V1CubeMetaDimensionSimpleFormat:
-      type: "string"
-      description: Simple format of dimension
-      enum:
+        - "number"
         - "imageUrl"
         - "id"
         - "link"
-        - "percent"
-        - "currency"
-    V1CubeMetaDimensionLinkFormat:
+    V1CubeMetaLinkFormat:
       type: "object"
-      description: Link format for dimension with label and type
+      description: Link format with label and type
       properties:
         label:
           type: "string"
@@ -296,10 +291,10 @@ components:
       required:
         - label
         - type
-    V1CubeMetaDimensionFormat:
+    V1CubeMetaFormat:
       oneOf:
-        - $ref: "#/components/schemas/V1CubeMetaDimensionSimpleFormat"
-        - $ref: "#/components/schemas/V1CubeMetaDimensionLinkFormat"
+        - $ref: "#/components/schemas/V1CubeMetaSimpleFormat"
+        - $ref: "#/components/schemas/V1CubeMetaLinkFormat"
       description: Format of dimension - can be either a simple string format or an object with link configuration
     V1MetaResponse:
       type: "object"

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

@@ -3,17 +3,16 @@ src/lib.rs
 src/models/mod.rs
 src/models/v1_cube_meta.rs
 src/models/v1_cube_meta_dimension.rs
-src/models/v1_cube_meta_dimension_format.rs
 src/models/v1_cube_meta_dimension_granularity.rs
-src/models/v1_cube_meta_dimension_link_format.rs
-src/models/v1_cube_meta_dimension_simple_format.rs
 src/models/v1_cube_meta_folder.rs
+src/models/v1_cube_meta_format.rs
 src/models/v1_cube_meta_hierarchy.rs
 src/models/v1_cube_meta_join.rs
+src/models/v1_cube_meta_link_format.rs
 src/models/v1_cube_meta_measure.rs
-src/models/v1_cube_meta_measure_format.rs
 src/models/v1_cube_meta_nested_folder.rs
 src/models/v1_cube_meta_segment.rs
+src/models/v1_cube_meta_simple_format.rs
 src/models/v1_cube_meta_type.rs
 src/models/v1_error.rs
 src/models/v1_load_request.rs

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

@@ -2,36 +2,32 @@ pub mod v1_cube_meta;
 pub use self::v1_cube_meta::V1CubeMeta;
 pub mod v1_cube_meta_dimension;
 pub use self::v1_cube_meta_dimension::V1CubeMetaDimension;
-pub mod v1_cube_meta_dimension_format;
-pub use self::v1_cube_meta_dimension_format::V1CubeMetaDimensionFormat;
 pub mod v1_cube_meta_dimension_granularity;
 pub use self::v1_cube_meta_dimension_granularity::V1CubeMetaDimensionGranularity;
-pub mod v1_cube_meta_dimension_link_format;
-pub use self::v1_cube_meta_dimension_link_format::V1CubeMetaDimensionLinkFormat;
-// problem with code-gen, let's rename it as re-export
-pub use self::v1_cube_meta_dimension_link_format::Type as V1CubeMetaDimensionLinkFormatType;
-pub mod v1_cube_meta_dimension_simple_format;
-pub use self::v1_cube_meta_dimension_simple_format::V1CubeMetaDimensionSimpleFormat;
 pub mod v1_cube_meta_folder;
 pub use self::v1_cube_meta_folder::V1CubeMetaFolder;
+pub mod v1_cube_meta_format;
+pub use self::v1_cube_meta_format::V1CubeMetaFormat;
 pub mod v1_cube_meta_hierarchy;
 pub use self::v1_cube_meta_hierarchy::V1CubeMetaHierarchy;
 pub mod v1_cube_meta_join;
 pub use self::v1_cube_meta_join::V1CubeMetaJoin;
+pub mod v1_cube_meta_link_format;
+pub use self::v1_cube_meta_link_format::V1CubeMetaLinkFormat;
+// problem with code-gen, let's rename it as re-export
+pub use self::v1_cube_meta_link_format::Type as V1CubeMetaLinkFormatType;
 pub mod v1_cube_meta_measure;
 pub use self::v1_cube_meta_measure::V1CubeMetaMeasure;
-pub mod v1_cube_meta_measure_format;
-pub use self::v1_cube_meta_measure_format::V1CubeMetaMeasureFormat;
 pub mod v1_cube_meta_nested_folder;
 pub use self::v1_cube_meta_nested_folder::{V1CubeMetaNestedFolder, V1CubeMetaNestedFolderMember};
 pub mod v1_cube_meta_segment;
 pub use self::v1_cube_meta_segment::V1CubeMetaSegment;
+pub mod v1_cube_meta_simple_format;
+pub use self::v1_cube_meta_simple_format::V1CubeMetaSimpleFormat;
 pub mod v1_cube_meta_type;
 pub use self::v1_cube_meta_type::V1CubeMetaType;
 pub mod v1_error;
 pub use self::v1_error::V1Error;
-pub mod v1_load_continue_wait;
-pub use self::v1_load_continue_wait::V1LoadContinueWait;
 pub mod v1_load_request;
 pub use self::v1_load_request::V1LoadRequest;
 pub mod v1_load_request_query;
@@ -50,6 +46,8 @@ pub mod v1_load_request_query_time_dimension;
 pub use self::v1_load_request_query_time_dimension::V1LoadRequestQueryTimeDimension;
 pub mod v1_load_request_query_time_dimension_date_range_filter;
 pub use self::v1_load_request_query_time_dimension_date_range_filter::V1LoadRequestQueryTimeDimensionDateRangeFilter;
+pub mod v1_load_continue_wait;
+pub use self::v1_load_continue_wait::V1LoadContinueWait;
 pub mod v1_load_response;
 pub use self::v1_load_response::V1LoadResponse;
 pub mod v1_load_result;

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

@@ -31,7 +31,7 @@ pub struct V1CubeMetaDimension {
     #[serde(rename = "meta", skip_serializing_if = "Option::is_none")]
     pub meta: Option<serde_json::Value>,
     #[serde(rename = "format", skip_serializing_if = "Option::is_none")]
-    pub format: Option<Box<models::V1CubeMetaDimensionFormat>>,
+    pub format: Option<Box<models::V1CubeMetaFormat>>,
 }
 
 impl V1CubeMetaDimension {

rust/cubesql/cubeclient/src/models/v1_cube_meta_dimension_format.rs renamed to rust/cubesql/cubeclient/src/models/v1_cube_meta_format.rs

@@ -11,18 +11,18 @@
 use crate::models;
 use serde::{Deserialize, Serialize};
 
-/// V1CubeMetaDimensionFormat : Format of dimension - can be either a simple string format or an object with link configuration
+/// V1CubeMetaFormat : Format of dimension - can be either a simple string format or an object with link configuration
 /// Format of dimension - can be either a simple string format or an object with link configuration
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Eq, Hash, PartialOrd, Ord)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
-pub enum V1CubeMetaDimensionFormat {
-    V1CubeMetaDimensionSimpleFormat(models::V1CubeMetaDimensionSimpleFormat),
-    V1CubeMetaDimensionLinkFormat(Box<models::V1CubeMetaDimensionLinkFormat>),
+pub enum V1CubeMetaFormat {
+    V1CubeMetaSimpleFormat(models::V1CubeMetaSimpleFormat),
+    V1CubeMetaLinkFormat(Box<models::V1CubeMetaLinkFormat>),
 }
 
-impl Default for V1CubeMetaDimensionFormat {
+impl Default for V1CubeMetaFormat {
     fn default() -> Self {
-        Self::V1CubeMetaDimensionSimpleFormat(Default::default())
+        Self::V1CubeMetaSimpleFormat(Default::default())
     }
 }
 /// Type of the format (must be 'link')

rust/cubesql/cubeclient/src/models/v1_cube_meta_dimension_link_format.rs renamed to rust/cubesql/cubeclient/src/models/v1_cube_meta_link_format.rs

@@ -11,9 +11,9 @@
 use crate::models;
 use serde::{Deserialize, Serialize};
 
-/// V1CubeMetaDimensionLinkFormat : Link format for dimension with label and type
-#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize, Eq, Hash, PartialOrd, Ord)]
-pub struct V1CubeMetaDimensionLinkFormat {
+/// V1CubeMetaLinkFormat : Link format with label and type
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct V1CubeMetaLinkFormat {
     /// Label for the link
     #[serde(rename = "label")]
     pub label: String,
@@ -22,10 +22,10 @@ pub struct V1CubeMetaDimensionLinkFormat {
     pub r#type: Type,
 }
 
-impl V1CubeMetaDimensionLinkFormat {
-    /// Link format for dimension with label and type
-    pub fn new(label: String, r#type: Type) -> V1CubeMetaDimensionLinkFormat {
-        V1CubeMetaDimensionLinkFormat { label, r#type }
+impl V1CubeMetaLinkFormat {
+    /// Link format with label and type
+    pub fn new(label: String, r#type: Type) -> V1CubeMetaLinkFormat {
+        V1CubeMetaLinkFormat { label, r#type }
     }
 }
 /// Type of the format (must be 'link')

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

@@ -28,7 +28,7 @@ pub struct V1CubeMetaMeasure {
     #[serde(rename = "meta", skip_serializing_if = "Option::is_none")]
     pub meta: Option<serde_json::Value>,
     #[serde(rename = "format", skip_serializing_if = "Option::is_none")]
-    pub format: Option<models::V1CubeMetaMeasureFormat>,
+    pub format: Option<Box<models::V1CubeMetaFormat>>,
     /// When measure is defined in View, it keeps the original path: Cube.measure
     #[serde(rename = "aliasMember", skip_serializing_if = "Option::is_none")]
     pub alias_member: Option<String>,

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

@@ -11,36 +11,39 @@
 use crate::models;
 use serde::{Deserialize, Serialize};
 
-/// V1CubeMetaDimensionSimpleFormat : Simple format of dimension
-/// Simple format of dimension
+/// V1CubeMetaSimpleFormat : Simple format
+/// Simple format
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
-pub enum V1CubeMetaDimensionSimpleFormat {
+pub enum V1CubeMetaSimpleFormat {
+    #[serde(rename = "percent")]
+    Percent,
+    #[serde(rename = "currency")]
+    Currency,
+    #[serde(rename = "number")]
+    Number,
     #[serde(rename = "imageUrl")]
     ImageUrl,
     #[serde(rename = "id")]
     Id,
     #[serde(rename = "link")]
     Link,
-    #[serde(rename = "percent")]
-    Percent,
-    #[serde(rename = "currency")]
-    Currency,
 }
 
-impl std::fmt::Display for V1CubeMetaDimensionSimpleFormat {
+impl std::fmt::Display for V1CubeMetaSimpleFormat {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
+            Self::Percent => write!(f, "percent"),
+            Self::Currency => write!(f, "currency"),
+            Self::Number => write!(f, "number"),
             Self::ImageUrl => write!(f, "imageUrl"),
             Self::Id => write!(f, "id"),
             Self::Link => write!(f, "link"),
-            Self::Percent => write!(f, "percent"),
-            Self::Currency => write!(f, "currency"),
         }
     }
 }
 
-impl Default for V1CubeMetaDimensionSimpleFormat {
-    fn default() -> V1CubeMetaDimensionSimpleFormat {
-        Self::ImageUrl
+impl Default for V1CubeMetaSimpleFormat {
+    fn default() -> V1CubeMetaSimpleFormat {
+        Self::Percent
     }
 }

rust/cubesql/cubeclient/src/models/v1_cube_meta_dimension_simple_format.rs renamed to rust/cubesql/cubeclient/src/models/v1_cube_meta_simple_format.rs

@@ -139,13 +139,11 @@ fn test_deserialize_dimension_link_format() {
 
     assert_eq!(
         dimension.format,
-        Some(Box::new(
-            V1CubeMetaDimensionFormat::V1CubeMetaDimensionLinkFormat(Box::new(
-                V1CubeMetaDimensionLinkFormat {
-                    label: "View Details".to_string(),
-                    r#type: V1CubeMetaDimensionLinkFormatType::Link,
-                }
-            ))
-        ))
+        Some(Box::new(V1CubeMetaFormat::V1CubeMetaLinkFormat(Box::new(
+            V1CubeMetaLinkFormat {
+                label: "View Details".to_string(),
+                r#type: V1CubeMetaLinkFormatType::Link,
+            }
+        ))))
     );
 }