fix(sqlserver): keep IF/ELSE control-flow batches in one range
This commit is contained in:
7 files changed
+293
-7
No files matched your search
@@ -2023,6 +2023,105 @@ WHERE t2.product_name = '12345'
|
||||
expect(rangeSqlTexts(ranges)).toEqual([sql]);
|
||||
expect(candidateSummaries(candidates)).toEqual([`all:${sql}`]);
|
||||
});
|
||||
|
||||
it("keeps a SQL Server IF/ELSE batch whole when it follows another statement", () => {
|
||||
const batch = ["IF NOT EXISTS (SELECT 1 FROM dbo.QRTZ_JOB_DETAILS WHERE job_name = N'x')", "BEGIN", " SELECT 1;", "END", "ELSE", "BEGIN", " SELECT 2;", "END"].join("\n");
|
||||
const sql = `SELECT 1;\n${batch}`;
|
||||
const ranges = executableStatementRanges(sql, "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual(["SELECT 1", batch]);
|
||||
});
|
||||
|
||||
it("keeps a SQL Server IF/ELSE batch whole when its branches hold semicolons", () => {
|
||||
const sql = ["IF NOT EXISTS (SELECT 1 FROM dbo.QRTZ_JOB_DETAILS WHERE job_name = N'x')", "BEGIN", " SELECT 1;", "END", "ELSE", "BEGIN", " SELECT 2;", "END"].join("\n");
|
||||
const ranges = executableStatementRanges(sql, "sqlserver");
|
||||
const candidates = buildExecutionCandidates(sql, indexOf(sql, "SELECT 2"), "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual([sql]);
|
||||
expect(candidateSummaries(candidates)).toEqual([`all:${sql}`]);
|
||||
});
|
||||
|
||||
it("keeps SQL Server IF branches without BEGIN/END blocks whole", () => {
|
||||
const sql = [
|
||||
"IF NOT EXISTS (SELECT 1 FROM ::fn_listextendedproperty(N'MS_Description', N'USER', N'dbo', N'TABLE', N'Categories', N'COLUMN', N'CategoryID'))",
|
||||
" EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'test'",
|
||||
"ELSE",
|
||||
" EXEC sp_updateextendedproperty @name=N'MS_Description', @value=N'test'",
|
||||
].join("\n");
|
||||
const ranges = executableStatementRanges(sql, "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual([sql]);
|
||||
});
|
||||
|
||||
it("keeps a SQL Server IF/BEGIN/END batch without ELSE whole", () => {
|
||||
const sql = ["IF @x = 1", "BEGIN", " SELECT 1;", " SELECT 2;", "END"].join("\n");
|
||||
const ranges = executableStatementRanges(sql, "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual([sql]);
|
||||
});
|
||||
|
||||
it("keeps SQL Server WHILE batches whole", () => {
|
||||
const sql = ["WHILE @i < 10", "BEGIN", " SET @i = @i + 1;", " IF @i = 5 CONTINUE;", "END"].join("\n");
|
||||
const ranges = executableStatementRanges(sql, "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual([sql]);
|
||||
});
|
||||
|
||||
it("does not merge SQL Server BEGIN TRAN statements with the following batch", () => {
|
||||
const sql = ["BEGIN TRAN;", "UPDATE dbo.T SET x = 1;", "COMMIT;"].join("\n");
|
||||
const ranges = executableStatementRanges(sql, "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual(["BEGIN TRAN", "UPDATE dbo.T SET x = 1", "COMMIT"]);
|
||||
});
|
||||
|
||||
// The depth carried across fragments decides where a batch ends: fragments
|
||||
// after the closing `END` are independent statements, so every following
|
||||
// statement keeps its own execution icon.
|
||||
it("does not swallow the statement after a SQL Server IF/ELSE batch", () => {
|
||||
const batch = ["IF NOT EXISTS (SELECT 1 FROM dbo.T WHERE n = N'x')", "BEGIN", " SELECT 1;", "END", "ELSE", "BEGIN", " SELECT 2;", "END"].join("\n");
|
||||
const ranges = executableStatementRanges(`${batch}\nSELECT 999;`, "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual([batch, "SELECT 999"]);
|
||||
});
|
||||
|
||||
it("keeps two consecutive SQL Server IF/ELSE batches as two ranges", () => {
|
||||
const first = ["IF NOT EXISTS (SELECT 1 FROM dbo.T WHERE n = N'x')", "BEGIN", " SELECT 1;", "END", "ELSE", "BEGIN", " SELECT 2;", "END"].join("\n");
|
||||
const second = ["IF NOT EXISTS (SELECT 1 FROM dbo.T WHERE n = N'y')", "BEGIN", " SELECT 1;", "END", "ELSE", "BEGIN", " SELECT 2;", "END"].join("\n");
|
||||
const ranges = executableStatementRanges(`${first}\n${second}`, "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual([first, second]);
|
||||
});
|
||||
|
||||
it("does not merge a SQL Server batch across a GO separator", () => {
|
||||
const batch = ["IF NOT EXISTS (SELECT 1 FROM dbo.T WHERE n = N'x')", "BEGIN", " SELECT 1;", "END", "ELSE", "BEGIN", " SELECT 2;", "END"].join("\n");
|
||||
const insert = "INSERT INTO dbo.T (n) VALUES (N'z')";
|
||||
const ranges = executableStatementRanges(`${batch}\nGO\n${insert};`, "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual([batch, insert]);
|
||||
});
|
||||
|
||||
it("ends a single-line SQL Server IF/BEGIN/END batch before the next statement", () => {
|
||||
const ranges = executableStatementRanges("IF @x = 1 BEGIN SELECT 1; END\nSELECT 999;", "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual(["IF @x = 1 BEGIN SELECT 1; END", "SELECT 999"]);
|
||||
});
|
||||
|
||||
// T-SQL semicolons are optional: when the ELSE branch tail carries none, the
|
||||
// branch's own `END` and the next statement share one `;`-fragment, and the
|
||||
// second closure must replace the `ELSE`-continuing first one.
|
||||
it("ends a SQL Server IF/ELSE batch at the ELSE branch END without a semicolon", () => {
|
||||
const batch = ["IF @x = 1", "BEGIN", " SELECT 1;", "END", "ELSE", "BEGIN", " SELECT 2", "END"].join("\n");
|
||||
const ranges = executableStatementRanges(`${batch}\nSELECT 999;`, "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual([batch, "SELECT 999"]);
|
||||
});
|
||||
|
||||
it("keeps the comment after a SQL Server batch out of the next statement", () => {
|
||||
const batch = ["IF @x = 1", "BEGIN", " SELECT 1;", "END"].join("\n");
|
||||
const ranges = executableStatementRanges(`${batch}\n-- gap\nSELECT 999;`, "sqlserver");
|
||||
|
||||
expect(rangeSqlTexts(ranges)).toEqual([batch, "SELECT 999"]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("hasMultipleExecutionTargets", () => {
|
||||
|
||||
Reference in new issue
Block a user