fix(sql): preserve Oracle database link references
This commit is contained in:
3 files changed
+40
-1
No files matched your search
@@ -53,6 +53,14 @@ describe("extractSqlParameters", () => {
|
||||
expect(extractSqlParameters("select @amount/2, @total / 4")).toEqual(["amount", "total"]);
|
||||
});
|
||||
|
||||
it("ignores Oracle database links while preserving standalone at-sign placeholders", () => {
|
||||
const sql = 'SELECT * FROM HR.EMPLOYEES@REMOTE_DB, "AUDIT_LOG"@ARCHIVE_DB WHERE tenant_id = @tenant_id';
|
||||
expect(extractSqlParameters("SELECT 1 FROM DUAL@WDHIS160;", { databaseType: "oracle" })).toEqual([]);
|
||||
expect(extractSqlParameters(sql, { databaseType: "oracle" })).toEqual(["tenant_id"]);
|
||||
expect(substituteSqlParameters(sql, { tenant_id: { kind: "number", value: "7" } }, { databaseType: "oracle" })).toBe('SELECT * FROM HR.EMPLOYEES@REMOTE_DB, "AUDIT_LOG"@ARCHIVE_DB WHERE tenant_id = 7');
|
||||
expect(extractSqlParameters("SELECT * FROM EMPLOYEES@REMOTE_DB", { databaseType: "postgres" })).toEqual(["REMOTE_DB"]);
|
||||
});
|
||||
|
||||
it("describes each placeholder syntax for the parameter dialog", () => {
|
||||
const sql = "select ? as a, :named as b, ${shell_name} as c, #{mybatis_name} as d, @sql_server_name as e";
|
||||
expect(extractSqlParameterDescriptors(sql)).toEqual([
|
||||
|
||||
@@ -203,7 +203,7 @@ function findSqlParameterOccurrences(sql: string, options?: SqlParameterOptions)
|
||||
}
|
||||
if (ch === "@" && isSyntaxEnabled("sqlserver")) {
|
||||
const name = readParameterName(sql, i + 1);
|
||||
if (name && next !== "@" && sql[i - 1] !== "@" && !isJdbcxMcpScopedPackage(sql, i, i + 1 + name.length) && !nativeSqlServerParameters.declared.has(name.toLowerCase()) && !nativeSqlServerParameters.ignoredStarts.has(i)) {
|
||||
if (name && next !== "@" && sql[i - 1] !== "@" && !isOracleDatabaseLinkMarker(sql, i, options?.databaseType) && !isJdbcxMcpScopedPackage(sql, i, i + 1 + name.length) && !nativeSqlServerParameters.declared.has(name.toLowerCase()) && !nativeSqlServerParameters.ignoredStarts.has(i)) {
|
||||
occurrences.push({
|
||||
key: name,
|
||||
name,
|
||||
@@ -230,6 +230,12 @@ function findSqlParameterOccurrences(sql: string, options?: SqlParameterOptions)
|
||||
return occurrences;
|
||||
}
|
||||
|
||||
function isOracleDatabaseLinkMarker(sql: string, index: number, databaseType: DatabaseType | undefined): boolean {
|
||||
if (databaseType !== "oracle" || index === 0) return false;
|
||||
const previous = sql[index - 1];
|
||||
return PARAMETER_NAME_CHAR_RE.test(previous) || previous === "$" || previous === "#" || previous === '"';
|
||||
}
|
||||
|
||||
function collectDuckDbStructFieldSeparators(sql: string): Set<number> {
|
||||
const separators = new Set<number>();
|
||||
const contexts: DuckDbStructLiteralContext[] = [];
|
||||
|
||||
Reference in new issue
Block a user