fix(kingbase): honor MySQL-compatible identifier quoting
This commit is contained in:
1 parent
6f4f6f373e
commit
7eac5dd610
9 files changed
+150
-46
No files matched your search
@@ -216,6 +216,15 @@ describe("buildSelectAllSql", () => {
|
||||
it("qualifies a StarRocks external-catalog table with catalog and database", () => {
|
||||
expect(buildSelectAllSql("starrocks", { catalog: "paimon_catalog", database: "bi", tableName: "events" })).toBe("SELECT * FROM `paimon_catalog`.`bi`.`events`");
|
||||
});
|
||||
it("uses the driver-reported identifier quote for Kingbase MySQL compat mode", () => {
|
||||
expect(buildSelectAllSql("kingbase", { schema: "audit_schema", tableName: "events" }, "`")).toBe("SELECT * FROM `audit_schema`.`events`");
|
||||
});
|
||||
it("uses the driver-reported identifier quote for Kingbase PostgreSQL mode", () => {
|
||||
expect(buildSelectAllSql("kingbase", { schema: "audit_schema", tableName: "events" }, '"')).toBe('SELECT * FROM "audit_schema"."events"');
|
||||
});
|
||||
it("falls back to double quotes for Kingbase when no identifier quote is reported", () => {
|
||||
expect(buildSelectAllSql("kingbase", { schema: "audit_schema", tableName: "events" })).toBe('SELECT * FROM "audit_schema"."events"');
|
||||
});
|
||||
});
|
||||
|
||||
describe("isNewQueryPrefillSupported", () => {
|
||||
|
||||
@@ -90,6 +90,7 @@ export interface ResolveNewQueryInitialSqlInput extends ResolveNewQueryTableInpu
|
||||
targetConnectionId: string;
|
||||
targetDatabase: string;
|
||||
databaseType?: DatabaseType;
|
||||
identifierQuote?: string;
|
||||
}
|
||||
|
||||
// Database types whose "table" view does not use standard SQL `SELECT * FROM <table>`
|
||||
@@ -145,9 +146,9 @@ export function resolveNewQueryTable(input: ResolveNewQueryTableInput): NewQuery
|
||||
* the same per-dialect identifier quoting and schema/catalog qualification used
|
||||
* by the table-data view.
|
||||
*/
|
||||
export function buildSelectAllSql(databaseType: DatabaseType | undefined, table: Pick<NewQueryTable, "schema" | "catalog" | "tableName"> & Partial<Pick<NewQueryTable, "database">>): string {
|
||||
export function buildSelectAllSql(databaseType: DatabaseType | undefined, table: Pick<NewQueryTable, "schema" | "catalog" | "tableName"> & Partial<Pick<NewQueryTable, "database">>, identifierQuote?: string): string {
|
||||
if (databaseType === "victoriametrics") return metricRangeQuery(table.tableName);
|
||||
const ref = qualifiedTableName({ databaseType, database: table.database, schema: table.schema, catalog: table.catalog, tableName: table.tableName });
|
||||
const ref = qualifiedTableName({ databaseType, identifierQuote, database: table.database, schema: table.schema, catalog: table.catalog, tableName: table.tableName });
|
||||
return `SELECT * FROM ${ref}`;
|
||||
}
|
||||
|
||||
@@ -162,5 +163,5 @@ export function resolveNewQueryInitialSql(input: ResolveNewQueryInitialSqlInput)
|
||||
const table = resolveNewQueryTable(input);
|
||||
if (!table || table.connectionId !== input.targetConnectionId || table.database !== input.targetDatabase) return undefined;
|
||||
|
||||
return buildSelectAllSql(input.databaseType, table);
|
||||
return buildSelectAllSql(input.databaseType, table, input.identifierQuote);
|
||||
}
|
||||
@@ -6,6 +6,8 @@ export type BuildViewDdlInput = {
|
||||
schema?: string | null;
|
||||
name: string;
|
||||
source: string;
|
||||
/** Driver-reported identifier quote (e.g. `` ` `` for Kingbase MySQL compat). */
|
||||
identifierQuote?: string;
|
||||
};
|
||||
|
||||
export function buildViewDdl(input: BuildViewDdlInput): Promise<string> {
|
||||
|
||||
Reference in new issue
Block a user