fix(editor): avoid run gutter for MySQL REPLACE function
This commit is contained in:
1 parent
9676ed764e
commit
cb42a4184a
2 files changed
+28
No files matched your search
@@ -273,6 +273,22 @@ describe("statementRangeAtCursor", () => {
|
|||||||
expect(rangeSqlTexts(executableStatementRanges(sql, "mysql"))).toEqual([sql.slice(0, -1)]);
|
expect(rangeSqlTexts(executableStatementRanges(sql, "mysql"))).toEqual([sql.slice(0, -1)]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("keeps MySQL REPLACE function calls inside UPDATE assignments", () => {
|
||||||
|
const sql = `UPDATE ecm_archive_prepare_pool
|
||||||
|
SET
|
||||||
|
request_json =
|
||||||
|
REPLACE(
|
||||||
|
request_json,
|
||||||
|
'"paperFlag":null',
|
||||||
|
'"paperFlag":false'
|
||||||
|
),
|
||||||
|
process_flag = 0
|
||||||
|
WHERE request_json LIKE '%"paperFlag":null%';`;
|
||||||
|
|
||||||
|
expect(statementRangeAtCursor(sql, indexOf(sql, "REPLACE"), "mysql")?.sql.trim()).toBe(sql.slice(0, -1));
|
||||||
|
expect(rangeSqlTexts(executableStatementRanges(sql, "mysql"))).toEqual([sql.slice(0, -1)]);
|
||||||
|
});
|
||||||
|
|
||||||
it("does not merge a plain MySQL DESC table statement with the next query", () => {
|
it("does not merge a plain MySQL DESC table statement with the next query", () => {
|
||||||
const sql = "DESC users\nSELECT * FROM users;";
|
const sql = "DESC users\nSELECT * FROM users;";
|
||||||
expect(statementRangeAtCursor(sql, indexOf(sql, "DESC"), "mysql")?.sql.trim()).toBe("DESC users");
|
expect(statementRangeAtCursor(sql, indexOf(sql, "DESC"), "mysql")?.sql.trim()).toBe("DESC users");
|
||||||
@@ -349,6 +365,11 @@ describe("executableStatementRanges", () => {
|
|||||||
expect(ranges.map((range) => range.from)).toEqual([0, sql.indexOf("DEL")]);
|
expect(ranges.map((range) => range.from)).toEqual([0, sql.indexOf("DEL")]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("keeps MySQL REPLACE INTO as an executable statement start", () => {
|
||||||
|
const sql = "SELECT 1\nREPLACE INTO users (id, name) VALUES (1, 'a');";
|
||||||
|
expect(rangeSqlTexts(executableStatementRanges(sql, "mysql"))).toEqual(["SELECT 1", "REPLACE INTO users (id, name) VALUES (1, 'a')"]);
|
||||||
|
});
|
||||||
|
|
||||||
it("returns MongoDB command ranges for newline-separated shell commands", () => {
|
it("returns MongoDB command ranges for newline-separated shell commands", () => {
|
||||||
const sql = 'use archive\ndb.users.find({ status: "open" })\n .limit(5)';
|
const sql = 'use archive\ndb.users.find({ status: "open" })\n .limit(5)';
|
||||||
const ranges = executableStatementRanges(sql, "mongodb");
|
const ranges = executableStatementRanges(sql, "mongodb");
|
||||||
|
|||||||
@@ -651,6 +651,7 @@ function softStatementKeywordAt(sql: string, pos: number, databaseType?: Databas
|
|||||||
const match = /^[A-Za-z_][\w$]*/.exec(sql.slice(pos));
|
const match = /^[A-Za-z_][\w$]*/.exec(sql.slice(pos));
|
||||||
if (!match) return null;
|
if (!match) return null;
|
||||||
const keyword = match[0].toUpperCase();
|
const keyword = match[0].toUpperCase();
|
||||||
|
if (keyword === "REPLACE" && nextNonWhitespaceChar(sql, pos + match[0].length) === "(") return null;
|
||||||
return softStatementStartKeywords(databaseType).has(keyword) ? keyword : null;
|
return softStatementStartKeywords(databaseType).has(keyword) ? keyword : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -658,6 +659,12 @@ function softStatementStartKeywords(databaseType?: DatabaseType): Set<string> {
|
|||||||
return new Set([...COMMON_SOFT_STATEMENT_START_KEYWORDS, ...(databaseType ? (DATABASE_SOFT_STATEMENT_KEYWORDS[databaseType] ?? []) : [])]);
|
return new Set([...COMMON_SOFT_STATEMENT_START_KEYWORDS, ...(databaseType ? (DATABASE_SOFT_STATEMENT_KEYWORDS[databaseType] ?? []) : [])]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function nextNonWhitespaceChar(sql: string, pos: number): string | null {
|
||||||
|
let i = pos;
|
||||||
|
while (i < sql.length && isSqlWhitespace(sql[i])) i += 1;
|
||||||
|
return i < sql.length ? sql[i] : null;
|
||||||
|
}
|
||||||
|
|
||||||
function isExplainLikeKeyword(keyword: string | null): boolean {
|
function isExplainLikeKeyword(keyword: string | null): boolean {
|
||||||
return keyword === "EXPLAIN" || keyword === "DESCRIBE" || keyword === "DESC";
|
return keyword === "EXPLAIN" || keyword === "DESCRIBE" || keyword === "DESC";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user