Skip to content

feat(completions): alter/drop/rename column statements #421

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
merged 4 commits into from
Jun 6, 2025
Merged

feat(completions): alter/drop/rename column statements #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e921aca
ok
juleswritescode Jun 5, 2025
3d5c1c6
ok
juleswritescode Jun 5, 2025
f6576c7
mentioned tables
juleswritescode Jun 5, 2025
2fee09c
lint check
juleswritescode Jun 6, 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
83 changes: 60 additions & 23 deletions crates/pgt_completions/src/context/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ pub enum WrappingClause<'a> {
Insert,
AlterTable,
DropTable,
DropColumn,
AlterColumn,
RenameColumn,
PolicyName,
ToRoleAssignment,
}
Expand Down Expand Up @@ -424,7 +427,7 @@ impl<'a> CompletionContext<'a> {
}

"where" | "update" | "select" | "delete" | "from" | "join" | "column_definitions"
| "drop_table" | "alter_table" => {
| "drop_table" | "alter_table" | "drop_column" | "alter_column" | "rename_column" => {
self.wrapping_clause_type =
self.get_wrapping_clause_from_current_node(current_node, &mut cursor);
}
Expand Down Expand Up @@ -515,6 +518,8 @@ impl<'a> CompletionContext<'a> {
(WrappingClause::From, &["from"]),
(WrappingClause::Join { on_node: None }, &["join"]),
(WrappingClause::AlterTable, &["alter", "table"]),
(WrappingClause::AlterColumn, &["alter", "table", "alter"]),
(WrappingClause::RenameColumn, &["alter", "table", "rename"]),
(
WrappingClause::AlterTable,
&["alter", "table", "if", "exists"],
Expand Down Expand Up @@ -575,10 +580,54 @@ impl<'a> CompletionContext<'a> {
let mut first_sibling = self.get_first_sibling(node);

if let Some(clause) = self.wrapping_clause_type.as_ref() {
if clause == &WrappingClause::Insert {
while let Some(sib) = first_sibling.next_sibling() {
match sib.kind() {
"object_reference" => {
match *clause {
WrappingClause::Insert => {
while let Some(sib) = first_sibling.next_sibling() {
match sib.kind() {
"object_reference" => {
if let Some(NodeText::Original(txt)) =
self.get_ts_node_content(&sib)
{
let mut iter = txt.split('.').rev();
let table = iter.next().unwrap().to_string();
let schema = iter.next().map(|s| s.to_string());
self.mentioned_relations
.entry(schema)
.and_modify(|s| {
s.insert(table.clone());
})
.or_insert(HashSet::from([table]));
}
}

"column" => {
if let Some(NodeText::Original(txt)) =
self.get_ts_node_content(&sib)
{
let entry = MentionedColumn {
column: txt,
alias: None,
};

self.mentioned_columns
.entry(Some(WrappingClause::Insert))
.and_modify(|s| {
s.insert(entry.clone());
})
.or_insert(HashSet::from([entry]));
}
}

_ => {}
}

first_sibling = sib;
}
}

WrappingClause::AlterColumn => {
while let Some(sib) = first_sibling.next_sibling() {
if sib.kind() == "object_reference" {
if let Some(NodeText::Original(txt)) = self.get_ts_node_content(&sib) {
let mut iter = txt.split('.').rev();
let table = iter.next().unwrap().to_string();
Expand All @@ -591,27 +640,12 @@ impl<'a> CompletionContext<'a> {
.or_insert(HashSet::from([table]));
}
}
"column" => {
if let Some(NodeText::Original(txt)) = self.get_ts_node_content(&sib) {
let entry = MentionedColumn {
column: txt,
alias: None,
};

self.mentioned_columns
.entry(Some(WrappingClause::Insert))
.and_modify(|s| {
s.insert(entry.clone());
})
.or_insert(HashSet::from([entry]));
}
}

_ => {}
first_sibling = sib;
}

first_sibling = sib;
}

_ => {}
}
}
}
Expand All @@ -628,6 +662,9 @@ impl<'a> CompletionContext<'a> {
"delete" => Some(WrappingClause::Delete),
"from" => Some(WrappingClause::From),
"drop_table" => Some(WrappingClause::DropTable),
"drop_column" => Some(WrappingClause::DropColumn),
"alter_column" => Some(WrappingClause::AlterColumn),
"rename_column" => Some(WrappingClause::RenameColumn),
"alter_table" => Some(WrappingClause::AlterTable),
"column_definitions" => Some(WrappingClause::ColumnDefinitions),
"insert" => Some(WrappingClause::Insert),
Expand Down
55 changes: 55 additions & 0 deletions crates/pgt_completions/src/providers/columns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,4 +762,59 @@ mod tests {
)
.await;
}

#[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
async fn suggests_columns_in_alter_table_and_drop_table(pool: PgPool) {
let setup = r#"
create table instruments (
id bigint primary key generated always as identity,
name text not null,
z text,
created_at timestamp with time zone default now()
);

create table others (
a text,
b text,
c text
);
"#;

pool.execute(setup).await.unwrap();

let queries = vec![
format!("alter table instruments drop column {}", CURSOR_POS),
format!(
"alter table instruments drop column if exists {}",
CURSOR_POS
),
format!(
"alter table instruments alter column {} set default",
CURSOR_POS
),
format!("alter table instruments alter {} set default", CURSOR_POS),
format!("alter table public.instruments alter column {}", CURSOR_POS),
format!("alter table instruments alter {}", CURSOR_POS),
format!("alter table instruments rename {} to new_col", CURSOR_POS),
format!(
"alter table public.instruments rename column {} to new_col",
CURSOR_POS
),
];

for query in queries {
assert_complete_results(
query.as_str(),
vec![
CompletionAssertion::Label("created_at".into()),
CompletionAssertion::Label("id".into()),
CompletionAssertion::Label("name".into()),
CompletionAssertion::Label("z".into()),
],
None,
&pool,
)
.await;
}
}
}
29 changes: 20 additions & 9 deletions crates/pgt_completions/src/relevance/filtering.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,13 @@ impl CompletionFilter<'_> {
.map(|clause| {
match self.data {
CompletionRelevanceData::Table(_) => match clause {
WrappingClause::Select
| WrappingClause::Where
| WrappingClause::ColumnDefinitions => false,
WrappingClause::From | WrappingClause::Update => true,

WrappingClause::Join { on_node: None } => true,
WrappingClause::Join { on_node: Some(on) } => ctx
.node_under_cursor
.as_ref()
.is_some_and(|cn| cn.start_byte() < on.end_byte()),

WrappingClause::Insert => {
ctx.wrapping_node_kind
Expand All @@ -94,15 +98,22 @@ impl CompletionFilter<'_> {
"keyword_table",
]),

_ => true,
_ => false,
},

CompletionRelevanceData::Column(_) => {
match clause {
WrappingClause::From
| WrappingClause::ColumnDefinitions
| WrappingClause::AlterTable
| WrappingClause::DropTable => false,
WrappingClause::Select
| WrappingClause::Update
| WrappingClause::Delete
| WrappingClause::DropColumn => true,

WrappingClause::RenameColumn => ctx
.before_cursor_matches_kind(&["keyword_rename", "keyword_column"]),

WrappingClause::AlterColumn => {
ctx.before_cursor_matches_kind(&["keyword_alter", "keyword_column"])
}

// We can complete columns in JOIN cluases, but only if we are after the
// ON node in the "ON u.id = posts.user_id" part.
Expand All @@ -126,7 +137,7 @@ impl CompletionFilter<'_> {
&& ctx.parent_matches_one_of_kind(&["field"]))
}

_ => true,
_ => false,
}
}

Expand Down
56 changes: 56 additions & 0 deletions crates/pgt_treesitter_queries/src/queries/relations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
(identifier)? @table
)+
)
(alter_table
(keyword_alter)
(keyword_table)
(object_reference
.
(identifier) @schema_or_table
"."?
(identifier)? @table
)+
)
"#;
tree_sitter::Query::new(tree_sitter_sql::language(), QUERY_STR).expect("Invalid TS Query")
});
Expand Down Expand Up @@ -196,4 +206,50 @@ mod tests {
assert_eq!(results[0].get_schema(sql), None);
assert_eq!(results[0].get_table(sql), "users");
}

#[test]
fn finds_alter_table_with_schema() {
let sql = r#"alter table public.users alter some_col set default 15;"#;

let mut parser = tree_sitter::Parser::new();
parser.set_language(tree_sitter_sql::language()).unwrap();

let tree = parser.parse(sql, None).unwrap();

let mut executor = TreeSitterQueriesExecutor::new(tree.root_node(), sql);

executor.add_query_results::<RelationMatch>();

let results: Vec<&RelationMatch> = executor
.get_iter(None)
.filter_map(|q| q.try_into().ok())
.collect();

assert_eq!(results.len(), 1);
assert_eq!(results[0].get_schema(sql), Some("public".into()));
assert_eq!(results[0].get_table(sql), "users");
}

#[test]
fn finds_alter_table_without_schema() {
let sql = r#"alter table users alter some_col set default 15;"#;

let mut parser = tree_sitter::Parser::new();
parser.set_language(tree_sitter_sql::language()).unwrap();

let tree = parser.parse(sql, None).unwrap();

let mut executor = TreeSitterQueriesExecutor::new(tree.root_node(), sql);

executor.add_query_results::<RelationMatch>();

let results: Vec<&RelationMatch> = executor
.get_iter(None)
.filter_map(|q| q.try_into().ok())
.collect();

assert_eq!(results.len(), 1);
assert_eq!(results[0].get_schema(sql), None);
assert_eq!(results[0].get_table(sql), "users");
}
}