diff --git a/apps/desktop/src/lib/sqlCompletion.ts b/apps/desktop/src/lib/sqlCompletion.ts index ae5e30b94b..02fb644327 100644 --- a/apps/desktop/src/lib/sqlCompletion.ts +++ b/apps/desktop/src/lib/sqlCompletion.ts @@ -421,7 +421,47 @@ const MANTICORESEARCH_SQL_KEYWORDS = ["FACET", "MATCH", "SHOW", "SHOW META", "SH const SQLITE_SQL_KEYWORDS = ["AUTOINCREMENT", "INTEGER", "BLOB", "BOOLEAN", "WITHOUT ROWID", "VACUUM", "PRAGMA", "JSON_EXTRACT", "JSON_SET", "STRFTIME"]; -const SQLSERVER_SQL_KEYWORDS = ["TOP", "IDENTITY", "UNIQUEIDENTIFIER", "NVARCHAR", "DATETIME2", "DATETIMEOFFSET", "BIT", "GO", "MERGE", "OUTPUT", "TRY_CAST", "TRY_CONVERT", "OPENJSON", "JSON_VALUE", "JSON_QUERY"]; +const SQLSERVER_SQL_KEYWORDS = [ + "TOP", + "IDENTITY", + "IDENTITY_INSERT", + "UNIQUEIDENTIFIER", + "NVARCHAR", + "DATETIME2", + "DATETIMEOFFSET", + "BIT", + "GO", + "MERGE", + "OUTPUT", + "TRY_CAST", + "TRY_CONVERT", + "OPENJSON", + "JSON_VALUE", + "JSON_QUERY", + "NOCOUNT", + "XACT_ABORT", + "ANSI_NULLS", + "ANSI_PADDING", + "ANSI_WARNINGS", + "ANSI_DEFAULTS", + "ARITHABORT", + "ARITHIGNORE", + "QUOTED_IDENTIFIER", + "IMPLICIT_TRANSACTIONS", + "TRANSACTION ISOLATION LEVEL", + "DATEFIRST", + "DATEFORMAT", + "DEADLOCK_PRIORITY", + "LOCK_TIMEOUT", + "ROWCOUNT", + "TEXTSIZE", + "STATISTICS IO", + "STATISTICS TIME", + "STATISTICS XML", + "SHOWPLAN_ALL", + "SHOWPLAN_TEXT", + "SHOWPLAN_XML", +]; const DATABASE_SQL_KEYWORDS: Partial> = { mysql: MYSQL_SQL_KEYWORDS, diff --git a/packages/app-tests/sqlCompletion.test.ts b/packages/app-tests/sqlCompletion.test.ts index de7dddc9cc..db6ba2fc9f 100644 --- a/packages/app-tests/sqlCompletion.test.ts +++ b/packages/app-tests/sqlCompletion.test.ts @@ -732,6 +732,35 @@ test("suggests SQL Server IIF and CHOOSE scalar functions", () => { ); }); +test("suggests SQL Server IDENTITY_INSERT after SET", () => { + const sql = "set iden"; + const items = buildSqlCompletionItems(sql, sql.length, { + tables, + columnsByTable, + databaseType: "sqlserver", + }); + + assert.ok(items.some((item) => item.type === "keyword" && item.label === "IDENTITY_INSERT")); +}); + +test("suggests common SQL Server SET options", () => { + for (const [sql, expected] of [ + ["set noc", "NOCOUNT"], + ["set xact", "XACT_ABORT"], + ["set ansi", "ANSI_NULLS"], + ["set stat", "STATISTICS IO"], + ["set transaction iso", "TRANSACTION ISOLATION LEVEL"], + ] as const) { + const items = buildSqlCompletionItems(sql, sql.length, { + tables, + columnsByTable, + databaseType: "sqlserver", + }); + + assert.ok(items.some((item) => item.type === "keyword" && item.label === expected), `${expected} should appear for ${sql}`); + } +}); + test("suggests SQL Server data types in CREATE TABLE column definitions", () => { const sql = "CREATE TABLE dbo.jobs (id "; const items = buildSqlCompletionItems(sql, sql.length, {