Skip to content

ide: add btree_gin, btree_gist stubs & column name fixes #1040

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

Merged
kodiakhq merged 1 commit into from
Apr 6, 2026
Merged

ide: add btree_gin, btree_gist stubs & column name fixes #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 51 additions & 13 deletions crates/squawk_ide/src/column_name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,15 @@ fn name_from_type(ty: ast::Type, unknown_column: bool) -> Option<(ColumnName, Sy
.and_then(|x| x.segment())
.and_then(|x| x.name_ref())
{
return name_from_name_ref(name_ref, true).map(|(column, node)| {
let column = match column {
ColumnName::Column(c) => ColumnName::new(c, unknown_column),
_ => column,
};
(column, node)
});
return name_from_name_ref(name_ref, true, path_type.arg_list().as_ref()).map(
|(column, node)| {
let column = match column {
ColumnName::Column(c) => ColumnName::new(c, unknown_column),
_ => column,
};
(column, node)
},
);
}
}
ast::Type::BitType(bit_type) => {
Expand Down Expand Up @@ -158,7 +160,11 @@ fn name_from_type(ty: ast::Type, unknown_column: bool) -> Option<(ColumnName, Sy
None
}

fn name_from_name_ref(name_ref: ast::NameRef, in_type: bool) -> Option<(ColumnName, SyntaxNode)> {
fn name_from_name_ref(
name_ref: ast::NameRef,
in_type: bool,
arg_list: Option<&ast::ArgList>,
) -> Option<(ColumnName, SyntaxNode)> {
if in_type {
for node in name_ref.syntax().children_with_tokens() {
match node.kind() {
Expand All @@ -174,12 +180,32 @@ fn name_from_name_ref(name_ref: ast::NameRef, in_type: bool) -> Option<(ColumnNa
name_ref.syntax().clone(),
));
}
SyntaxKind::DECIMAL_KW => {
SyntaxKind::DEC_KW | SyntaxKind::DECIMAL_KW => {
return Some((
ColumnName::Column("numeric".to_owned()),
name_ref.syntax().clone(),
));
}
SyntaxKind::FLOAT_KW => {
let precision = arg_list.and_then(|arg| {
arg.args_().find_map(|arg| {
if let ast::Expr::Literal(lit) = arg.expr()? {
lit.syntax().text().to_string().parse::<u32>().ok()
} else {
None
}
})
});
let name = if matches!(precision, Some(p) if p <= 24) {
"float4"
} else {
"float8"
};
return Some((
ColumnName::Column(name.to_owned()),
name_ref.syntax().clone(),
));
}
SyntaxKind::INT_KW | SyntaxKind::INTEGER_KW => {
return Some((
ColumnName::Column("int4".to_owned()),
Expand Down Expand Up @@ -409,11 +435,11 @@ fn name_from_expr(expr: ast::Expr, in_type: bool) -> Option<(ColumnName, SyntaxN
| ast::Expr::SliceExpr(_) => unreachable!("not possible in the grammar"),
ast::Expr::FieldExpr(field_expr) => {
if let Some(name_ref) = field_expr.field() {
return name_from_name_ref(name_ref, in_type);
return name_from_name_ref(name_ref, in_type, None);
}
}
ast::Expr::NameRef(name_ref) => {
return name_from_name_ref(name_ref, in_type);
return name_from_name_ref(name_ref, in_type, None);
}
}
}
Expand Down Expand Up @@ -446,7 +472,7 @@ fn name_from_expr(expr: ast::Expr, in_type: bool) -> Option<(ColumnName, SyntaxN
}
ast::Expr::FieldExpr(field_expr) => {
if let Some(name_ref) = field_expr.field() {
return name_from_name_ref(name_ref, in_type);
return name_from_name_ref(name_ref, in_type, None);
}
}
ast::Expr::IndexExpr(index_expr) => {
Expand All @@ -472,7 +498,7 @@ fn name_from_expr(expr: ast::Expr, in_type: bool) -> Option<(ColumnName, SyntaxN
_ => return Some((ColumnName::UnknownColumn(None), node)),
},
ast::Expr::NameRef(name_ref) => {
return name_from_name_ref(name_ref, in_type);
return name_from_name_ref(name_ref, in_type, None);
}
ast::Expr::ParenExpr(paren_expr) => {
if let Some(expr) = paren_expr.expr() {
Expand Down Expand Up @@ -614,20 +640,32 @@ fn examples() {

// bit types
assert_snapshot!(name("cast('1010' as bit varying(10))"), @"varbit");
assert_snapshot!(name("cast('1010' as bit varying)"), @"varbit");
assert_snapshot!(name("cast('1010' as bit)"), @"bit");

// decimal
assert_snapshot!(name("cast('1010' as dec)"), @"numeric");
assert_snapshot!(name("cast('1010' as dec(10))"), @"numeric");
assert_snapshot!(name("cast('1010' as decimal)"), @"numeric");
assert_snapshot!(name("cast('1010' as decimal(10))"), @"numeric");

// char types
assert_snapshot!(name("cast('hello' as character varying(10))"), @"varchar");
assert_snapshot!(name("cast('hello' as char varying(5))"), @"varchar");
assert_snapshot!(name("cast('hello' as nchar varying(10))"), @"varchar");
assert_snapshot!(name("cast('hello' as char(5))"), @"bpchar");
assert_snapshot!(name("cast('hello' as character)"), @"bpchar");
assert_snapshot!(name("cast('hello' as bpchar)"), @"bpchar");
assert_snapshot!(name("cast('hello' as nchar(10))"), @"bpchar");

assert_snapshot!(name(r#"cast('hello' as "char")"#), @"char");

// double types
assert_snapshot!(name("cast(1.5 as double precision)"), @"float8");
// real
assert_snapshot!(name("cast(1.5 as real)"), @"float4");
assert_snapshot!(name("cast(1.5 as float(8))"), @"float4");
assert_snapshot!(name("cast(2.5 as float(25))"), @"float8");

// interval types
assert_snapshot!(name("cast('1 hour' as interval hour to minute)"), @"interval");
Expand Down
Loading
Loading