From bc79fa4683c2810a62f1141280a29890a451437b Mon Sep 17 00:00:00 2001 From: Guoyu Su Date: Sat, 30 May 2026 19:04:40 +0800 Subject: [PATCH] fix(packages): route gaussdb and opengauss through direct query (#547) --- packages/node-core/src/database.ts | 21 ++++--------------- packages/node-core/src/diagnostics.ts | 8 +++++++ .../node-core/tests/driver-manifest.test.ts | 12 ++++++++++- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/packages/node-core/src/database.ts b/packages/node-core/src/database.ts index 0ab418c5e2..f360e355d3 100644 --- a/packages/node-core/src/database.ts +++ b/packages/node-core/src/database.ts @@ -5,6 +5,7 @@ import { join } from "node:path"; import { homedir, platform } from "node:os"; import Database from "better-sqlite3"; import { sqlSafetyFromEnv } from "./sql-safety.js"; +import { isDirectQueryType } from "./diagnostics.js"; export interface TableInfo { name: string; @@ -235,20 +236,6 @@ function isMysqlType(dbType: string): boolean { return dbType === "mysql" || dbType === "doris" || dbType === "starrocks"; } -function isDirectType(dbType: string): boolean { - switch (dbType) { - case "postgres": - case "redshift": - case "mysql": - case "doris": - case "starrocks": - case "sqlite": - return true; - default: - return false; - } -} - interface BridgeQueryResult { columns: string[]; rows: unknown[][]; @@ -444,7 +431,7 @@ export async function executeQuery(config: ConnectionConfig, sql: string, option "Use MongoDB shell-style commands, for example: db.projects.find({}).limit(100), db.projects.countDocuments({}), db.projects.insertOne({...}), db.projects.updateOne({...}, {$set: {...}}), or db.projects.deleteOne({...})", ); } - if (isDirectType(config.db_type)) { + if (isDirectQueryType(config.db_type)) { return query(config, sql, undefined, options); } const result = await withTimeout(bridgeDataRequest("/data/execute-query", { @@ -471,7 +458,7 @@ export async function listTables(config: ConnectionConfig, schema?: string): Pro ); return result.rows.map((r) => ({ name: String(r.name || ""), type: String(r.type || "table") })); } - if (!isDirectType(config.db_type)) { + if (!isDirectQueryType(config.db_type)) { const tables = await bridgeDataRequest("/data/list-tables", { connection_name: config.name, database: config.database || "", @@ -508,7 +495,7 @@ export async function describeTable(config: ConnectionConfig, table: string, sch comment: null, })); } - if (!isDirectType(config.db_type)) { + if (!isDirectQueryType(config.db_type)) { const columns = await bridgeDataRequest("/data/describe-table", { connection_name: config.name, database: config.database || "", diff --git a/packages/node-core/src/diagnostics.ts b/packages/node-core/src/diagnostics.ts index 3955cf3f3f..8e0d1eb3ae 100644 --- a/packages/node-core/src/diagnostics.ts +++ b/packages/node-core/src/diagnostics.ts @@ -4,6 +4,14 @@ import { inspectConnectionStore } from "./connections.js"; export const DIRECT_QUERY_TYPES = ["postgres", "redshift", "mysql", "doris", "starrocks", "sqlite", "gaussdb", "opengauss"] as const; +export type DirectQueryType = (typeof DIRECT_QUERY_TYPES)[number]; + +const DIRECT_QUERY_TYPE_SET = new Set(DIRECT_QUERY_TYPES); + +export function isDirectQueryType(dbType: string): dbType is DirectQueryType { + return DIRECT_QUERY_TYPE_SET.has(dbType); +} + export const BRIDGE_REQUIRED_TYPES = [ "redis", "mongodb", diff --git a/packages/node-core/tests/driver-manifest.test.ts b/packages/node-core/tests/driver-manifest.test.ts index 96fd25af5d..dd59a4f96f 100644 --- a/packages/node-core/tests/driver-manifest.test.ts +++ b/packages/node-core/tests/driver-manifest.test.ts @@ -2,7 +2,7 @@ import assert from "node:assert/strict"; import { readFileSync } from "node:fs"; import { fileURLToPath } from "node:url"; import test from "node:test"; -import { BRIDGE_REQUIRED_TYPES, DIRECT_QUERY_TYPES } from "../src/diagnostics.js"; +import { BRIDGE_REQUIRED_TYPES, DIRECT_QUERY_TYPES, isDirectQueryType } from "../src/diagnostics.js"; interface DriverManifest { drivers: Array<{ @@ -24,3 +24,13 @@ test("diagnostic query mode lists match the driver manifest", () => { assert.deepEqual([...DIRECT_QUERY_TYPES].sort(), directTypes.sort()); assert.deepEqual([...BRIDGE_REQUIRED_TYPES].sort(), bridgeTypes.sort()); }); + +test("runtime direct query routing matches diagnostic direct query types", () => { + for (const dbType of DIRECT_QUERY_TYPES) { + assert.equal(isDirectQueryType(dbType), true, `${dbType} should use direct query routing`); + } + + for (const dbType of BRIDGE_REQUIRED_TYPES) { + assert.equal(isDirectQueryType(dbType), false, `${dbType} should not use direct query routing`); + } +});