Skip to content

Commit 9a67dba

Browse files
committed
fmt
1 parent 5d36a9a commit 9a67dba

4 files changed

Lines changed: 17 additions & 9 deletions

File tree

src/ts_generator/sql_parser/expressions/function_handlers/json_functions.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::common::lazy::DB_SCHEMA;
22
use crate::core::connection::DBConn;
33
use crate::ts_generator::errors::TsGeneratorError;
4+
use crate::ts_generator::sql_parser::expressions::function_handlers::FunctionHandlersContext;
45
use crate::ts_generator::sql_parser::expressions::translate_data_type::translate_value;
56
use crate::ts_generator::sql_parser::expressions::translate_table_with_joins::translate_table_from_expr;
67
use crate::ts_generator::sql_parser::quoted_strings::DisplayIndent;
7-
use crate::ts_generator::types::ts_query::{TsFieldType};
8-
use crate::ts_generator::sql_parser::expressions::function_handlers::FunctionHandlersContext;
8+
use crate::ts_generator::types::ts_query::TsFieldType;
99
use sqlparser::ast::{Expr, FunctionArg, FunctionArgExpr, TableWithJoins, Value};
1010

1111
/// Extract key name from a function argument (should be a string literal)

src/ts_generator/sql_parser/expressions/function_handlers/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use sqlparser::ast::TableWithJoins;
21
use crate::core::connection::DBConn;
32
use crate::ts_generator::types::ts_query::TsQuery;
3+
use sqlparser::ast::TableWithJoins;
44

55
pub mod json_functions;
66
pub mod polymorphic_functions;
@@ -14,4 +14,4 @@ pub struct FunctionHandlersContext<'a> {
1414
pub alias: &'a str,
1515
pub is_selection: bool,
1616
pub expr_for_logging: Option<&'a str>,
17-
}
17+
}

src/ts_generator/sql_parser/expressions/function_handlers/polymorphic_functions.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use crate::common::lazy::DB_SCHEMA;
22
use crate::ts_generator::errors::TsGeneratorError;
3+
use crate::ts_generator::sql_parser::expressions::function_handlers::FunctionHandlersContext;
34
use crate::ts_generator::sql_parser::expressions::translate_data_type::translate_value;
45
use crate::ts_generator::sql_parser::expressions::translate_table_with_joins::translate_table_from_expr;
56
use crate::ts_generator::sql_parser::quoted_strings::DisplayIndent;
67
use crate::ts_generator::types::ts_query::TsFieldType;
7-
use crate::ts_generator::sql_parser::expressions::function_handlers::FunctionHandlersContext;
88
use sqlparser::ast::{Expr, Function, FunctionArg, FunctionArgExpr, FunctionArguments};
99

1010
pub async fn handle_polymorphic_functions(
@@ -36,7 +36,11 @@ pub async fn handle_polymorphic_functions(
3636
Expr::Identifier(ident) => {
3737
let column_name = DisplayIndent(ident).to_string();
3838
if let Some(table_name) = ctx.single_table_name {
39-
let table_details = &DB_SCHEMA.lock().await.fetch_table(&vec![table_name], ctx.db_conn).await;
39+
let table_details = &DB_SCHEMA
40+
.lock()
41+
.await
42+
.fetch_table(&vec![table_name], ctx.db_conn)
43+
.await;
4044

4145
if let Some(table_details) = table_details {
4246
if let Some(field) = table_details.get(&column_name) {
@@ -76,7 +80,9 @@ pub async fn handle_polymorphic_functions(
7680
Expr::Value(val) => {
7781
// If first arg is a literal value, infer from that
7882
if let Some(ts_field_type) = translate_value(&val.value) {
79-
return ctx.ts_query.insert_result(Some(ctx.alias), &[ts_field_type], ctx.is_selection, false, expr_log);
83+
return ctx
84+
.ts_query
85+
.insert_result(Some(ctx.alias), &[ts_field_type], ctx.is_selection, false, expr_log);
8086
}
8187
}
8288
_ => {}
@@ -85,5 +91,7 @@ pub async fn handle_polymorphic_functions(
8591
}
8692

8793
// Fallback to Any if we couldn't infer the type
88-
ctx.ts_query.insert_result(Some(ctx.alias), &[TsFieldType::Any], ctx.is_selection, false, expr_log)
94+
ctx
95+
.ts_query
96+
.insert_result(Some(ctx.alias), &[TsFieldType::Any], ctx.is_selection, false, expr_log)
8997
}

src/ts_generator/sql_parser/expressions/translate_expr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ use crate::common::lazy::DB_SCHEMA;
77
use crate::common::logger::{error, warning};
88
use crate::core::connection::DBConn;
99
use crate::ts_generator::errors::TsGeneratorError;
10+
use crate::ts_generator::sql_parser::expressions::function_handlers::FunctionHandlersContext;
1011
use crate::ts_generator::sql_parser::expressions::translate_data_type::translate_value;
1112
use crate::ts_generator::sql_parser::expressions::translate_table_with_joins::translate_table_from_expr;
1213
use crate::ts_generator::sql_parser::expressions::{
1314
functions::is_string_function, translate_data_type::translate_data_type,
1415
};
1516
use crate::ts_generator::sql_parser::quoted_strings::DisplayIndent;
1617
use crate::ts_generator::sql_parser::translate_query::translate_query;
17-
use crate::ts_generator::sql_parser::expressions::function_handlers::FunctionHandlersContext;
1818
use crate::ts_generator::types::ts_query::{TsFieldType, TsQuery};
1919
use async_recursion::async_recursion;
2020
use color_eyre::Result;

0 commit comments

Comments
 (0)