@@ -25,15 +25,15 @@ pub enum DBResponseValue {
2525 Object { value : DBResponsePrimitive } ,
2626}
2727
28- #[ derive( Debug , Serialize , Deserialize ) ]
28+ #[ derive( Debug , Clone , Serialize , Deserialize ) ]
2929pub enum ResultType {
3030 #[ serde( rename = "default" ) ]
3131 Default ,
3232 #[ serde( rename = "compact" ) ]
3333 Compact ,
3434}
3535
36- #[ derive( Debug , Serialize , Deserialize ) ]
36+ #[ derive( Debug , Clone , Serialize , Deserialize ) ]
3737pub enum QueryType {
3838 #[ serde( rename = "regularQuery" ) ]
3939 RegularQuery ,
@@ -64,7 +64,7 @@ pub enum MemberType {
6464 Segments ,
6565}
6666
67- #[ derive( Debug , Serialize , Deserialize ) ]
67+ #[ derive( Debug , Clone , Serialize , Deserialize ) ]
6868pub enum FilterOperator {
6969 #[ serde( rename = "equals" ) ]
7070 Equals ,
@@ -115,14 +115,14 @@ pub struct QueryFilter {
115115 pub values : Option < Vec < String > > ,
116116}
117117
118- #[ derive( Debug , Serialize , Deserialize , PartialEq ) ]
118+ #[ derive( Debug , Clone , Serialize , Deserialize , Hash , Eq , PartialEq ) ]
119119pub struct GroupingSet {
120120 pub group_type : String ,
121121 pub id : u32 ,
122122 pub sub_id : Option < u32 > ,
123123}
124124
125- #[ derive( Debug , Serialize , Deserialize , PartialEq ) ]
125+ #[ derive( Debug , Clone , Serialize , Deserialize , Hash , Eq , PartialEq ) ]
126126pub struct ParsedMemberExpression {
127127 pub expression : Vec < String > ,
128128 #[ serde( rename = "cubeName" ) ]
@@ -176,13 +176,13 @@ pub struct ConfigItem {
176176 pub granularities : Option < Vec < GranularityMeta > > ,
177177}
178178
179- #[ derive( Debug , Serialize , Deserialize ) ]
179+ #[ derive( Debug , Clone , Serialize , Deserialize ) ]
180180pub struct Order {
181181 pub id : String ,
182182 pub desc : bool ,
183183}
184184
185- #[ derive( Debug , Serialize , Deserialize ) ]
185+ #[ derive( Debug , Clone , Serialize , Deserialize ) ]
186186pub struct NormalizedQueryFilter {
187187 pub member : String ,
188188 pub operator : FilterOperator ,
@@ -191,7 +191,7 @@ pub struct NormalizedQueryFilter {
191191}
192192
193193// XXX: Omitted function variant
194- #[ derive( Debug , Serialize , Deserialize , PartialEq ) ]
194+ #[ derive( Debug , Clone , Serialize , Deserialize , Hash , Eq , PartialEq ) ]
195195pub enum MemberOrMemberExpression {
196196 Member ( String ) ,
197197 MemberExpression ( ParsedMemberExpression ) ,
@@ -244,7 +244,7 @@ pub struct Query {
244244 pub response_format : Option < ResultType > ,
245245}
246246
247- #[ derive( Debug , Serialize , Deserialize ) ]
247+ #[ derive( Debug , Clone , Serialize , Deserialize ) ]
248248pub struct NormalizedQuery {
249249 pub measures : Vec < MemberOrMemberExpression > ,
250250 pub dimensions : Option < Vec < MemberOrMemberExpression > > ,
@@ -266,6 +266,8 @@ pub struct NormalizedQuery {
266266 #[ serde( rename = "rowLimit" ) ]
267267 pub row_limit : Option < u32 > ,
268268 pub order : Option < Vec < Order > > ,
269+ #[ serde( rename = "queryType" ) ]
270+ pub query_type : QueryType ,
269271}
270272
271273#[ derive( Debug , Serialize , Deserialize ) ]
0 commit comments