fix(sqlserver): jtds prelogin fallback and legacy 2000 support

Closes #9333
This commit is contained in:
zipg authored and GitHub committed 2026-09-17 00:18:07 +08:00
1 parent d35d578b03
commit 1a7b44f8fc
12 files changed
+380 -64

No files matched your search

@@ -1848,6 +1848,24 @@ WHERE t2.product_name = '12345'
expect(candidateSummaries(candidates)).toEqual(["cursor:KILL 580", `all:${sql}`]);
});
it("keeps SQL Server IF/ELSE control-flow batches as one execution range", () => {
const sql = [
"IF EXISTS (SELECT 1 FROM ::fn_listextendedproperty('MS_Description','USER','dbo','TABLE','Categories','COLUMN','CategoryID'))",
"BEGIN",
" EXEC sp_updateextendedproperty @name=N'MS_Description', @value=N'test', @level0type=N'USER', @level0name=N'dbo', @level1type=N'TABLE', @level1name=N'Categories', @level2type=N'COLUMN', @level2name=N'CategoryID'",
"END",
"ELSE",
"BEGIN",
" EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'test', @level0type=N'USER', @level0name=N'dbo', @level1type=N'TABLE', @level1name=N'Categories', @level2type=N'COLUMN', @level2name=N'CategoryID'",
"END",
].join("\n");
const ranges = executableStatementRanges(sql, "sqlserver");
const candidates = buildExecutionCandidates(sql, indexOf(sql, "sp_addextendedproperty"), "sqlserver");
expect(rangeSqlTexts(ranges)).toEqual([sql]);
expect(candidateSummaries(candidates)).toEqual([`all:${sql}`]);
});
});
describe("hasMultipleExecutionTargets", () => {
@@ -744,6 +744,8 @@ function splitStatementRangeAtSoftStarts(sql: string, statement: RawStatement, d
if (isSapHanaScriptBlockStatement(statement.sql, databaseType)) return [statement];
// Routine bodies contain top-level-looking SET/INSERT/SELECT lines that are not independent statements.
if (isMysqlRoutineBlockDatabase(databaseType) && startsWithMysqlRoutineBlock(statement.sql, parameterOptions)) return [statement];
// SQL Server control-flow batches use line-oriented BEGIN/EXEC tokens inside one IF/ELSE statement.
if (isSqlServerIfElseControlFlowBatch(sql, statement, databaseType, parameterOptions)) return [statement];
const lineStarts = topLevelSoftStatementLineStarts(sql, statement, databaseType, parameterOptions);
if (lineStarts.length <= 1) return [statement];
@@ -849,6 +851,13 @@ function splitStatementRangeAtSoftStarts(sql: string, statement: RawStatement, d
return ranges.length > 0 ? ranges : [statement];
}
function isSqlServerIfElseControlFlowBatch(sql: string, statement: RawStatement, databaseType?: DatabaseType, parameterOptions?: SqlParameterOptions): boolean {
if (databaseType !== "sqlserver" || !startsWithSqlWords(sql, statement.from, ["IF"], databaseType, parameterOptions)) return false;
const words = topLevelWordsBefore(sql, statement.from, statement.to, 64, databaseType, parameterOptions);
return words.includes("ELSE") && words.includes("BEGIN") && words.includes("END");
}
function topLevelSoftStatementLineStarts(sql: string, statement: RawStatement, databaseType?: DatabaseType, parameterOptions?: SqlParameterOptions): Array<{ hitFrom: number; from: number; keyword: string }> {
const starts: Array<{ hitFrom: number; from: number; keyword: string }> = [];
const len = statement.to;