feat(completion): fix SQL alias completion, star expansion, and formatter layout
This commit is contained in:
1 parent
0402fea37b
commit
868f7961e3
30 files changed
+758
-76
No files matched your search
@@ -2063,6 +2063,8 @@ fn sqlserver_completion_assistant_sql(request: &crate::types::CompletionAssistan
|
||||
.filter(|schema| !schema.trim().is_empty())
|
||||
.map(|schema| format!(" AND s.name = '{}' ", schema.replace('\'', "''")))
|
||||
.unwrap_or_default();
|
||||
let columns_only = object_kinds.len() == 1
|
||||
&& matches!(object_kinds.first(), Some(crate::types::CompletionAssistantObjectKind::Column));
|
||||
|
||||
let mut queries = Vec::new();
|
||||
if (mask.starts_with('#') || mask.starts_with("%#"))
|
||||
@@ -2145,12 +2147,15 @@ fn sqlserver_completion_assistant_sql(request: &crate::types::CompletionAssistan
|
||||
FROM sys.columns c \
|
||||
JOIN sys.objects o ON o.object_id = c.object_id \
|
||||
JOIN sys.schemas s ON s.schema_id = o.schema_id \
|
||||
WHERE o.type IN ('U','V') AND {object_visibility} {schema_filter} {parent_table_filter} {column_like}"
|
||||
WHERE o.type IN ('U','V') AND {object_visibility} {schema_filter} {parent_table_filter} {column_like} ORDER BY c.column_id"
|
||||
));
|
||||
}
|
||||
|
||||
if queries.is_empty() {
|
||||
"SELECT TOP (0) CAST('' AS NVARCHAR(128)) AS name, CAST('' AS NVARCHAR(128)) AS schema_name, CAST('' AS NVARCHAR(60)) AS object_type, CAST(NULL AS NVARCHAR(128)) AS parent_schema, CAST(NULL AS NVARCHAR(128)) AS parent_name, CAST(NULL AS NVARCHAR(MAX)) AS object_comment, CAST(NULL AS NVARCHAR(128)) AS data_type".to_string()
|
||||
} else if columns_only && queries.len() == 1 {
|
||||
// Preserve sys.columns.column_id order for SELECT * expansion.
|
||||
queries.remove(0)
|
||||
} else if queries.len() == 1 {
|
||||
format!("SELECT * FROM ({}) AS dbx_completion ORDER BY name", queries.remove(0))
|
||||
} else {
|
||||
@@ -4148,6 +4153,8 @@ mod tests {
|
||||
assert!(sql.contains("o.name = 'Users'"));
|
||||
assert!(sql.contains("LOWER(c.name) LIKE LOWER('%id%') ESCAPE '\\'"));
|
||||
assert!(sql.contains("CAST(NULL AS NVARCHAR(MAX)) AS object_comment"));
|
||||
assert!(sql.contains("ORDER BY c.column_id"));
|
||||
assert!(!sql.contains("AS dbx_completion ORDER BY name"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
Reference in new issue
Block a user