fix(editor): keep comment columns in query ranges
This commit is contained in:
1 parent
e2f53a786f
commit
dabbb58b0e
2 files changed
+16
No files matched your search
@@ -372,6 +372,13 @@ COMMENT = '测试';`;
|
|||||||
expect(rangeSqlTexts(executableStatementRanges(sql))).toEqual(["CREATE TABLE users (id int)", "COMMENT ON TABLE users IS 'Users'"]);
|
expect(rangeSqlTexts(executableStatementRanges(sql))).toEqual(["CREATE TABLE users (id int)", "COMMENT ON TABLE users IS 'Users'"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("keeps a line-start comment column inside a select projection", () => {
|
||||||
|
const sql = "SELECT\n id,\n comment,\n created_at\nFROM project_info\nWHERE deleted = 0;";
|
||||||
|
|
||||||
|
expect(statementRangeAtCursor(sql, indexOf(sql, "comment"))?.sql.trim()).toBe(sql.slice(0, -1));
|
||||||
|
expect(rangeSqlTexts(executableStatementRanges(sql))).toEqual([sql.slice(0, -1)]);
|
||||||
|
});
|
||||||
|
|
||||||
it("keeps MySQL ALTER TABLE drop column clauses with the statement", () => {
|
it("keeps MySQL ALTER TABLE drop column clauses with the statement", () => {
|
||||||
const sql = "ALTER TABLE t\n DROP COLUMN a,\n DROP COLUMN b;";
|
const sql = "ALTER TABLE t\n DROP COLUMN a,\n DROP COLUMN b;";
|
||||||
|
|
||||||
|
|||||||
@@ -718,6 +718,9 @@ function softStatementKeywordAt(sql: string, pos: number, databaseType?: Databas
|
|||||||
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;
|
if (keyword === "REPLACE" && nextNonWhitespaceChar(sql, pos + match[0].length) === "(") return null;
|
||||||
|
// COMMENT is also a common column name. Only COMMENT ON starts a standalone
|
||||||
|
// SQL command; otherwise a line-start projection column must stay in SELECT.
|
||||||
|
if (keyword === "COMMENT" && nextSqlWord(sql, pos + match[0].length) !== "ON") return null;
|
||||||
return softStatementStartKeywords(databaseType).has(keyword) ? keyword : null;
|
return softStatementStartKeywords(databaseType).has(keyword) ? keyword : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -913,6 +916,12 @@ function nextNonWhitespaceChar(sql: string, pos: number): string | null {
|
|||||||
return i < sql.length ? sql[i] : null;
|
return i < sql.length ? sql[i] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function nextSqlWord(sql: string, pos: number): string | null {
|
||||||
|
let i = pos;
|
||||||
|
while (i < sql.length && isSqlWhitespace(sql[i])) i += 1;
|
||||||
|
return /^[A-Za-z_][\w$]*/.exec(sql.slice(i))?.[0]?.toUpperCase() ?? 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