Skip to content

Replace any with unknown #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Leo5878 wants to merge 2 commits into
base: main
Choose a base branch
from
+26 −24
Open

Replace any with unknown #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a4305e
Replace any with unknown
Nov 30, 2025
b8b0420
Remove unnecessary
Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/ts_generator/sql_parser/expressions/translate_data_type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ pub fn translate_data_type(data_type: &DataType) -> TsFieldType {
DataType::Datetime64(_, _) => TsFieldType::Date,
DataType::Timestamp(_, _) => TsFieldType::String,
DataType::TimestampNtz => TsFieldType::String,
DataType::Interval { .. } => TsFieldType::Any,
DataType::Interval { .. } => TsFieldType::Unknown,

// JSON types
DataType::JSON => TsFieldType::Object,
Expand All @@ -151,9 +151,9 @@ pub fn translate_data_type(data_type: &DataType) -> TsFieldType {
DataType::TsQuery => TsFieldType::String,

// Complex types
DataType::Custom(_, _) => TsFieldType::Any,
DataType::Custom(_, _) => TsFieldType::Unknown,
DataType::Array(array_element_type_def) => match array_element_type_def {
sqlparser::ast::ArrayElemTypeDef::None => TsFieldType::Array(Box::new(TsFieldType::Any)),
sqlparser::ast::ArrayElemTypeDef::None => TsFieldType::Array(Box::new(TsFieldType::Unknown)),
sqlparser::ast::ArrayElemTypeDef::AngleBracket(data_type) => {
TsFieldType::Array(Box::new(translate_data_type(data_type)))
}
Expand All @@ -177,8 +177,8 @@ pub fn translate_data_type(data_type: &DataType) -> TsFieldType {
DataType::LowCardinality(inner_type) => translate_data_type(inner_type),

// Special types
DataType::Unspecified => TsFieldType::Any,
DataType::Trigger => TsFieldType::Any,
DataType::Unspecified => TsFieldType::Unknown,
DataType::Trigger => TsFieldType::Unknown,
DataType::AnyType => TsFieldType::Any,
}
}
26 changes: 13 additions & 13 deletions src/ts_generator/sql_parser/expressions/translate_expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,13 +431,13 @@ pub async fn translate_expr(
ts_query.insert_param(&inferred_type, &false, &Some(placeholder.to_string()))
}
Expr::JsonAccess { value: _, path: _ } => {
ts_query.insert_result(alias, &[TsFieldType::Any], is_selection, false, expr_for_logging)?;
ts_query.insert_param(&TsFieldType::Any, &false, &None)
ts_query.insert_result(alias, &[TsFieldType::Unknown], is_selection, false, expr_for_logging)?;
ts_query.insert_param(&TsFieldType::Unknown, &false, &None)
}
Expr::IsNotDistinctFrom(_, placeholder) | Expr::IsDistinctFrom(_, placeholder) => {
// IsDistinctFrom and IsNotDistinctFrom are the same and can have a placeholder
ts_query.insert_param(&TsFieldType::String, &false, &Some(placeholder.to_string()))?;
ts_query.insert_result(alias, &[TsFieldType::Any], is_selection, false, expr_for_logging)
ts_query.insert_result(alias, &[TsFieldType::Unknown], is_selection, false, expr_for_logging)
}
Expr::SimilarTo {
negated: _,
Expand Down Expand Up @@ -523,10 +523,10 @@ pub async fn translate_expr(
ts_query.insert_result(alias, &[TsFieldType::String], is_selection, false, expr_for_logging)
}
Expr::Collate { expr: _, collation: _ } => {
ts_query.insert_result(alias, &[TsFieldType::Any], is_selection, false, expr_for_logging)
ts_query.insert_result(alias, &[TsFieldType::Unknown], is_selection, false, expr_for_logging)
}
Expr::TypedString(_) => ts_query.insert_result(alias, &[TsFieldType::Any], is_selection, false, expr_for_logging),
Expr::Map(_) => ts_query.insert_result(alias, &[TsFieldType::Any], is_selection, false, expr_for_logging),
Expr::TypedString(_) => ts_query.insert_result(alias, &[TsFieldType::Unknown], is_selection, false, expr_for_logging),
Expr::Map(_) => ts_query.insert_result(alias, &[TsFieldType::Unknown], is_selection, false, expr_for_logging),
// Note: AggregateExpressionWithFilter was removed in sqlparser 0.59.0
// Aggregate functions with filters are now part of the Function variant
Expr::Case {
Expand All @@ -535,22 +535,22 @@ pub async fn translate_expr(
else_result: _,
case_token: _,
end_token: _,
} => ts_query.insert_result(alias, &[TsFieldType::Any], is_selection, false, expr_for_logging),
} => ts_query.insert_result(alias, &[TsFieldType::Unknown], is_selection, false, expr_for_logging),
Expr::Exists { subquery, negated: _ } => {
ts_query.insert_result(alias, &[TsFieldType::Boolean], is_selection, false, expr_for_logging)?;
translate_query(ts_query, &None, subquery, db_conn, alias, false).await
}
// Note: ListAgg and ArrayAgg were removed in sqlparser 0.59.0
// They are now represented as Function variants
Expr::GroupingSets(_) | Expr::Cube(_) | Expr::Rollup(_) | Expr::Tuple(_) | Expr::Array(_) => {
ts_query.insert_result(alias, &[TsFieldType::Any], is_selection, false, expr_for_logging)
ts_query.insert_result(alias, &[TsFieldType::Unknown], is_selection, false, expr_for_logging)
}
// Note: ArrayIndex was replaced with CompoundFieldAccess in sqlparser 0.59.0
// CompoundFieldAccess handles array indexing, map access, and composite field access
Expr::CompoundFieldAccess {
root: _,
access_chain: _,
} => ts_query.insert_result(alias, &[TsFieldType::Any], is_selection, false, expr_for_logging),
} => ts_query.insert_result(alias, &[TsFieldType::Unknown], is_selection, false, expr_for_logging),
Expr::Interval(_) => ts_query.insert_result(alias, &[TsFieldType::Number], is_selection, false, expr_for_logging),
Expr::MatchAgainst {
columns: _,
Expand Down Expand Up @@ -655,7 +655,7 @@ pub async fn translate_expr(
}

// Fallback to Any if we couldn't infer the type
return ts_query.insert_result(Some(alias), &[TsFieldType::Any], is_selection, false, expr_for_logging);
return ts_query.insert_result(Some(alias), &[TsFieldType::Unknown], is_selection, false, expr_for_logging);
}

// Handle other function types
Expand Down Expand Up @@ -684,7 +684,7 @@ pub async fn translate_expr(
expr_for_logging,
)?;
} else {
ts_query.insert_result(Some(alias), &[TsFieldType::Any], is_selection, false, expr_for_logging)?;
ts_query.insert_result(Some(alias), &[TsFieldType::Unknown], is_selection, false, expr_for_logging)?;
}

Ok(())
Expand Down Expand Up @@ -717,8 +717,8 @@ pub async fn translate_expr(
expr: _,
array_expr: _,
negated: _,
} => ts_query.insert_result(alias, &[TsFieldType::Any], is_selection, false, expr_for_logging),
_ => ts_query.insert_result(alias, &[TsFieldType::Any], is_selection, false, expr_for_logging),
} => ts_query.insert_result(alias, &[TsFieldType::Unknown], is_selection, false, expr_for_logging),
_ => ts_query.insert_result(alias, &[TsFieldType::Unknown], is_selection, false, expr_for_logging),
}
}

Expand Down
14 changes: 8 additions & 6 deletions src/ts_generator/types/ts_query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub enum TsFieldType {
Null,
Enum(Vec<String>),
Any,
Unknown,
#[allow(dead_code)]
Array2D(Array2DContent),
Array(Box<TsFieldType>),
Expand All @@ -38,6 +39,7 @@ impl fmt::Display for TsFieldType {
TsFieldType::Any => write!(f, "any"),
TsFieldType::Null => write!(f, "null"),
TsFieldType::Never => write!(f, "never"),
TsFieldType::Unknown => write!(f, "unknown"),
TsFieldType::Array(ts_field_type) => {
let ts_field_type = ts_field_type.clone();
let ts_field_type = *ts_field_type;
Expand Down Expand Up @@ -90,17 +92,17 @@ impl TsFieldType {
"character" | "character varying" | "bytea" | "uuid" | "text" => Self::String,
"boolean" => Self::Boolean,
"json" | "jsonb" => Self::Object,
"ARRAY" | "array" => Self::Any,
"ARRAY" | "array" => Self::Unknown,
"date" => Self::Date,
"USER-DEFINED" => {
if let Some(enum_values) = enum_values {
return Self::Enum(enum_values);
}
let warning_message = format!("Failed to find enum values for field {field_name} of table {table_name}");
warning!(warning_message);
Self::Any
Self::Unknown
}
_ => Self::Any,
_ => Self::Unknown,
}
}

Expand All @@ -122,9 +124,9 @@ impl TsFieldType {

let warning_message = format!("Failed to find enum values for field {field_name} of table {table_name}");
warning!(warning_message);
Self::Any
Self::Unknown
}
_ => Self::Any,
_ => Self::Unknown,
}
}

Expand All @@ -140,7 +142,7 @@ impl TsFieldType {
} else if annotated_type == "null" {
return Self::Null;
}
Self::Any
Self::Unknown
}

/// Converts a sqlparser DataType from table alias column definitions to TsFieldType
Expand Down
Loading