Skip to content

Commit fae7a6f

Browse files
codedmartcodedmart
committed
Format
1 parent b6c1efa commit fae7a6f

File tree

6 files changed

+74
-45
lines changed

6 files changed

+74
-45
lines changed

‎crates/configuration/src/to_runtime_configuration.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,9 @@ fn convert_type(r#type: metadata::Type) -> query_engine_metadata::metadata::Type
156156
match r#type {
157157
metadata::Type::ArrayType(t) => {
158158
query_engine_metadata::metadata::Type::ArrayType(Box::new(convert_type(*t)))
159-
},
160-
metadata::Type::RangeType(t) => {
161-
query_engine_metadata::metadata::Type::RangeType(t)
162-
},
163-
metadata::Type::StructType(t) => {
164-
query_engine_metadata::metadata::Type::StructType(t)
165-
},
159+
}
160+
metadata::Type::RangeType(t) => query_engine_metadata::metadata::Type::RangeType(t),
161+
metadata::Type::StructType(t) => query_engine_metadata::metadata::Type::StructType(t),
166162
metadata::Type::ScalarType(t) => query_engine_metadata::metadata::Type::ScalarType(t),
167163
}
168164
}

‎crates/connectors/ndc-bigquery/src/capabilities.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub fn get_capabilities() -> models::Capabilities {
2323
},
2424
mutation: models::MutationCapabilities {
2525
transactional: None,
26-
explain: None
26+
explain: None,
2727
},
2828
relationships: None,
2929
}

‎crates/connectors/ndc-bigquery/src/schema.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -234,16 +234,16 @@ pub fn readonly_column_to_type(column: &metadata::ReadOnlyColumnInfo) -> models:
234234
pub fn type_to_type(typ: &metadata::Type) -> models::Type {
235235
match typ {
236236
metadata::Type::ArrayType(typ) => models::Type::Array {
237-
element_type: Box::new(type_to_type(typ)),
237+
element_type: Box::new(type_to_type(typ)),
238238
},
239239
metadata::Type::RangeType(_) => models::Type::Named {
240-
name: "range".into(),
240+
name: "range".into(),
241241
},
242242
metadata::Type::ScalarType(scalar_type) => models::Type::Named {
243-
name: scalar_type.as_str().into(),
243+
name: scalar_type.as_str().into(),
244244
},
245245
metadata::Type::StructType(_) => models::Type::Named {
246-
name: "struct".into(),
246+
name: "struct".into(),
247247
},
248248
}
249249
}

‎crates/query-engine/translation/src/translation/query/fields.rs

+52-28
Original file line numberDiff line numberDiff line change
@@ -139,36 +139,44 @@ fn unpack_and_wrap_fields(
139139
let field_expr = sql::ast::Expression::ColumnReference(
140140
sql::ast::ColumnReference::TableColumn {
141141
table: current_table.reference.clone(),
142-
name: sql::ast::ColumnName(format!("{}.{}", column_info.name.0.as_str(), field_name)),
143-
}
142+
name: sql::ast::ColumnName(format!(
143+
"{}.{}",
144+
column_info.name.0.as_str(),
145+
field_name
146+
)),
147+
},
144148
);
145149
let field_type_representation = match &field_type {
146-
Type::ScalarType(scalar_type) => env.lookup_type_representation(scalar_type),
150+
Type::ScalarType(scalar_type) => {
151+
env.lookup_type_representation(scalar_type)
152+
}
147153
_ => None,
148154
};
149-
let field_expr = wrap_in_type_representation(field_expr, field_type_representation);
155+
let field_expr =
156+
wrap_in_type_representation(field_expr, field_type_representation);
150157

151158
(field_name, field_expr)
152159
})
153160
.collect();
154161

155162
let json_object = sql::ast::Expression::FunctionCall {
156163
function: sql::ast::Function::Unknown("JSON_OBJECT".to_string()),
157-
args: object_fields.into_iter().flat_map(|(k, v)| vec![
158-
sql::ast::Expression::Value(sql::ast::Value::String(k)),
159-
v
160-
]).collect(),
164+
args: object_fields
165+
.into_iter()
166+
.flat_map(|(k, v)| {
167+
vec![sql::ast::Expression::Value(sql::ast::Value::String(k)), v]
168+
})
169+
.collect(),
161170
};
162171

163172
Ok((alias, json_object))
164173
}
165174
Type::RangeType(range_type) => {
166-
let column_ref = sql::ast::Expression::ColumnReference(
167-
sql::ast::ColumnReference::TableColumn {
175+
let column_ref =
176+
sql::ast::Expression::ColumnReference(sql::ast::ColumnReference::TableColumn {
168177
table: current_table.reference.clone(),
169178
name: column_info.name.clone(),
170-
}
171-
);
179+
});
172180

173181
let start_expr = sql::ast::Expression::FunctionCall {
174182
function: sql::ast::Function::Unknown("RANGE_START".to_string()),
@@ -192,12 +200,16 @@ fn unpack_and_wrap_fields(
192200
sql::ast::Expression::Value(sql::ast::Value::String("start".to_string())),
193201
sql::ast::Expression::Cast {
194202
expression: Box::new(start_expr),
195-
r#type: sql::ast::ScalarType::BaseType(sql::ast::ScalarTypeName::Unqualified(type_name.to_string())),
203+
r#type: sql::ast::ScalarType::BaseType(
204+
sql::ast::ScalarTypeName::Unqualified(type_name.to_string()),
205+
),
196206
},
197207
sql::ast::Expression::Value(sql::ast::Value::String("end".to_string())),
198208
sql::ast::Expression::Cast {
199209
expression: Box::new(end_expr),
200-
r#type: sql::ast::ScalarType::BaseType(sql::ast::ScalarTypeName::Unqualified(type_name.to_string())),
210+
r#type: sql::ast::ScalarType::BaseType(
211+
sql::ast::ScalarTypeName::Unqualified(type_name.to_string()),
212+
),
201213
},
202214
],
203215
};
@@ -215,36 +227,44 @@ fn unpack_and_wrap_fields(
215227
let field_expr = sql::ast::Expression::ColumnReference(
216228
sql::ast::ColumnReference::TableColumn {
217229
table: current_table.reference.clone(),
218-
name: sql::ast::ColumnName(format!("{}.{}", column_info.name.0.as_str(), field_name)),
219-
}
230+
name: sql::ast::ColumnName(format!(
231+
"{}.{}",
232+
column_info.name.0.as_str(),
233+
field_name
234+
)),
235+
},
220236
);
221237
let field_type_representation = match &field_type {
222-
Type::ScalarType(scalar_type) => env.lookup_type_representation(scalar_type),
238+
Type::ScalarType(scalar_type) => {
239+
env.lookup_type_representation(scalar_type)
240+
}
223241
_ => None,
224242
};
225-
let field_expr = wrap_in_type_representation(field_expr, field_type_representation);
243+
let field_expr =
244+
wrap_in_type_representation(field_expr, field_type_representation);
226245

227246
(field_name.clone(), field_expr)
228247
})
229248
.collect();
230249

231250
let json_object = sql::ast::Expression::FunctionCall {
232251
function: sql::ast::Function::Unknown("JSON_OBJECT".to_string()),
233-
args: object_fields.into_iter().flat_map(|(k, v)| vec![
234-
sql::ast::Expression::Value(sql::ast::Value::String(k)),
235-
v
236-
]).collect(),
252+
args: object_fields
253+
.into_iter()
254+
.flat_map(|(k, v)| {
255+
vec![sql::ast::Expression::Value(sql::ast::Value::String(k)), v]
256+
})
257+
.collect(),
237258
};
238259

239260
Ok((alias, json_object))
240261
}
241262
Type::RangeType(range_type) => {
242-
let column_ref = sql::ast::Expression::ColumnReference(
243-
sql::ast::ColumnReference::TableColumn {
263+
let column_ref =
264+
sql::ast::Expression::ColumnReference(sql::ast::ColumnReference::TableColumn {
244265
table: current_table.reference.clone(),
245266
name: column_info.name.clone(),
246-
}
247-
);
267+
});
248268

249269
let start_expr = sql::ast::Expression::FunctionCall {
250270
function: sql::ast::Function::Unknown("RANGE_START".to_string()),
@@ -268,12 +288,16 @@ fn unpack_and_wrap_fields(
268288
sql::ast::Expression::Value(sql::ast::Value::String("start".to_string())),
269289
sql::ast::Expression::Cast {
270290
expression: Box::new(start_expr),
271-
r#type: sql::ast::ScalarType::BaseType(sql::ast::ScalarTypeName::Unqualified(type_name.to_string())),
291+
r#type: sql::ast::ScalarType::BaseType(
292+
sql::ast::ScalarTypeName::Unqualified(type_name.to_string()),
293+
),
272294
},
273295
sql::ast::Expression::Value(sql::ast::Value::String("end".to_string())),
274296
sql::ast::Expression::Cast {
275297
expression: Box::new(end_expr),
276-
r#type: sql::ast::ScalarType::BaseType(sql::ast::ScalarTypeName::Unqualified(type_name.to_string())),
298+
r#type: sql::ast::ScalarType::BaseType(
299+
sql::ast::ScalarTypeName::Unqualified(type_name.to_string()),
300+
),
277301
},
278302
],
279303
};

‎crates/query-engine/translation/src/translation/query/filtering.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ fn get_column_scalar_type_name(
710710
)),
711711
},
712712
database::Type::StructType(_) => Err(Error::NonScalarTypeUsedInOperator {
713-
r#type: typ.clone()
713+
r#type: typ.clone(),
714714
}),
715715
database::Type::RangeType(_) => Err(Error::NonScalarTypeUsedInOperator {
716716
r#type: typ.clone(),

‎crates/query-engine/translation/src/translation/query/values.rs

+13-4
Original file line numberDiff line numberDiff line change
@@ -207,18 +207,24 @@ pub fn translate_projected_variable(
207207

208208
let start_cast = sql::ast::Expression::Cast {
209209
expression: Box::new(start_expr),
210-
r#type: sql::ast::ScalarType::BaseType(sql::ast::ScalarTypeName::Unqualified(start_type.to_string())),
210+
r#type: sql::ast::ScalarType::BaseType(sql::ast::ScalarTypeName::Unqualified(
211+
start_type.to_string(),
212+
)),
211213
};
212214
let end_cast = sql::ast::Expression::Cast {
213215
expression: Box::new(end_expr),
214-
r#type: sql::ast::ScalarType::BaseType(sql::ast::ScalarTypeName::Unqualified(end_type.to_string())),
216+
r#type: sql::ast::ScalarType::BaseType(sql::ast::ScalarTypeName::Unqualified(
217+
end_type.to_string(),
218+
)),
215219
};
216220

217221
sql::ast::Expression::JsonBuildObject(
218222
vec![
219223
("start".to_string(), start_cast),
220224
("end".to_string(), end_cast),
221-
].into_iter().collect()
225+
]
226+
.into_iter()
227+
.collect(),
222228
)
223229
}
224230
database::Type::StructType(struct_fields) => {
@@ -229,7 +235,10 @@ pub fn translate_projected_variable(
229235
function: sql::ast::Function::Unknown("JSON_EXTRACT_SCALAR".to_string()),
230236
args: vec![
231237
exp.clone(),
232-
sql::ast::Expression::Value(sql::ast::Value::String(format!("$.{}", field_name))),
238+
sql::ast::Expression::Value(sql::ast::Value::String(format!(
239+
"$.{}",
240+
field_name
241+
))),
233242
],
234243
};
235244
let cast_expr = sql::ast::Expression::Cast {

0 commit comments

Comments
 (0)