test: cover ODBC adapter and JOIN predicates for Sonar

Author: cccadet

docs/releases/v0.2.11.md

@@ -4,9 +4,12 @@
 
 - **autocomplete:** suggest foreign key predicates at the start of a JOIN `ON` clause, using the aliases in the query.
 - **results:** navigate from foreign key values to the referenced row.
+- **editor:** open a searchable SQL command catalog with `/catalog` and insert a command template.
 
 ### Bug Fixes
 
 - **updater:** stop bundled runtimes before installing Windows updates.
+- **editor:** explain the current statement or selection and recognize pasted Unicode whitespace.
+- **sidebar:** align object rows and tighten spacing.
 
 **Full Changelog:** [`v0.2.10...v0.2.11`](https://github.com/cccadet/omni-sql/compare/v0.2.10...v0.2.11)

packages/adapters-odbc/package.json

@@ -10,6 +10,7 @@
     "typecheck": "tsc --noEmit",
     "lint": "eslint src",
     "test": "node --test ./src/index.test.ts",
+    "coverage": "mkdir -p coverage && node --experimental-test-coverage --test-reporter=lcov --test-reporter-destination=coverage/lcov.info --test-coverage-include='src/**/*.ts' --test-coverage-exclude='**/*.test.ts' --test ./src/index.test.ts",
     "test:integration": "node --test ./src/integration.test.ts"
   },
   "dependencies": {

packages/adapters-odbc/src/index.test.ts

@@ -1,8 +1,85 @@
 import assert from "node:assert/strict";
 import { test } from "node:test";
-import { buildOdbcConnectionString } from "./index.ts";
+import type { ConnectionConfig } from "@omni-sql/ts-types";
+import { OdbcAdapter, buildOdbcConnectionString } from "./index.ts";
+
+const config: ConnectionConfig = {
+  id: "odbc-test", label: "Mock ODBC", dialect: "odbc", endpoint: "Test DSN", user: "alice",
+};
 
 test("builds DSN and DSN-less connection strings without persisting credentials", () => {
   assert.equal(buildOdbcConnectionString("Corporate DB", "alice", "s}ecret"), "DSN={Corporate DB};UID={alice};PWD={s}}ecret}");
   assert.equal(buildOdbcConnectionString("DRIVER={SQLite3};Database=C:\\db.sqlite;", "", undefined), "DRIVER={SQLite3};Database=C:\\db.sqlite");
 });
+
+test("ODBC introspects tables, views, columns, and primary keys through the driver", async () => {
+  let closeCount = 0;
+  const connection = {
+    close: async () => { closeCount++; },
+    tables: async () => [
+      { TABLE_CAT: "catalog", TABLE_SCHEM: "public", TABLE_NAME: "orders", TABLE_TYPE: "TABLE", REMARKS: " Orders " },
+      { TABLE_CAT: "catalog", TABLE_SCHEM: "public", TABLE_NAME: "orders", TABLE_TYPE: "TABLE" },
+      { TABLE_CAT: "catalog", TABLE_SCHEM: "public", TABLE_NAME: "order_view", TABLE_TYPE: "VIEW" },
+      { TABLE_NAME: "" },
+    ],
+    columns: async (_catalog: unknown, _schema: unknown, table: string) => table === "orders"
+      ? [
+          { COLUMN_NAME: "name", TYPE_NAME: "VARCHAR", NULLABLE: 1, ORDINAL_POSITION: 2, REMARKS: " Label " },
+          { COLUMN_NAME: "id", TYPE_NAME: "INTEGER", NULLABLE: 0, ORDINAL_POSITION: 1 },
+        ]
+      : [],
+    primaryKeys: async (_catalog: unknown, _schema: unknown, table: string) => table === "orders"
+      ? [{ COLUMN_NAME: "id" }] : [],
+  };
+  const driver = { connect: async () => connection } as unknown as ConstructorParameters<typeof OdbcAdapter>[2];
+  const adapter = new OdbcAdapter(config, "secret", driver);
+  assert.deepEqual(await adapter.listAvailableSchemas(), ["public"]);
+  await adapter.introspect();
+  assert.deepEqual(adapter.listTables("public").map((table) => [table.name, table.kind]), [
+    ["orders", "table"], ["order_view", "view"],
+  ]);
+  const columns = adapter.listColumns("public", "orders");
+  assert.deepEqual(columns.map((column) => column.name), ["id", "name"]);
+  assert.equal(columns[0]?.isPrimaryKey, true);
+  assert.equal(columns[1]?.description, "Label");
+  await adapter.close();
+  assert.equal(closeCount, 1);
+});
+
+test("ODBC returns bounded query rows and closes its cursor", async () => {
+  let closed = false;
+  const result = Object.assign([
+    { id: 1, amount: 12n, created: new Date("2026-09-16T00:00:00.000Z") },
+    { id: 2, amount: 13n, created: new Date("2026-09-17T00:00:00.000Z") },
+  ], {
+    columns: [
+      { name: "id", dataTypeName: "INTEGER", dataType: 4, nullable: false },
+      { name: "amount", dataTypeName: "BIGINT", dataType: -5, nullable: false },
+      { name: "created", dataTypeName: "TIMESTAMP", dataType: 93, nullable: false },
+    ],
+    count: -1,
+  });
+  const connection = {
+    close: async () => undefined,
+    query: async () => ({ fetch: async () => result, close: async () => { closed = true; }, noData: false }),
+  };
+  const driver = { connect: async () => connection } as unknown as ConstructorParameters<typeof OdbcAdapter>[2];
+  const adapter = new OdbcAdapter(config, undefined, driver);
+  const query = await adapter.runQuery("SELECT * FROM orders", 1);
+  assert.deepEqual(query.rows, [[1, "12", "2026-09-16T00:00:00.000Z"]]);
+  assert.equal(query.rowsMoreAvailable, true);
+  assert.equal(query.rowsAffected, undefined);
+  assert.equal(closed, true);
+  await adapter.close();
+});
+
+test("ODBC classifies driver errors without exposing passwords", async () => {
+  const driver = { connect: async () => { throw new Error("IM002 driver not found;PWD=secret"); } } as unknown as ConstructorParameters<typeof OdbcAdapter>[2];
+  const adapter = new OdbcAdapter(config, "secret", driver);
+  const status = await adapter.test();
+  assert.equal(status.ok, false);
+  assert.match(status.message ?? "", /PWD=\*\*\*/u);
+  assert.doesNotMatch(status.message ?? "", /secret/u);
+  await assert.rejects(adapter.connect(), (error: unknown) =>
+    error instanceof Error && "causeTag" in error && error.causeTag === "driver-missing");
+});

packages/autocomplete-engine/src/engine.ts

@@ -380,7 +380,7 @@ function joinForeignKeySuggestions(ctx: ResolvedContext, meta: MetadataSource):
         ...(partial ? { filterText: partial } : {}), relevance: 1000 });
     }
   };
-  for (const entry of left) {
+  for (const entry of left.reverse()) {
     add(rightRef, right, entry.ref, entry.relation);
     add(entry.ref, entry.relation, rightRef, right);
   }

packages/autocomplete-engine/src/index.test.ts

@@ -357,6 +357,57 @@ test("ON prioriza predicado da FK com aliases e aceita FK nos dois sentidos", ()
     .some((suggestion) => suggestion.detail === "chave estrangeira"));
 });
 
+test("ON usa a FK da relação recém-joinada contra qualquer relação anterior", () => {
+  const base = metaOf(postgresDescriptor);
+  const payments: Relation = {
+    schema: "public", name: "payments", kind: "table",
+    columns: [
+      { name: "id", dataType: "integer", nullable: false, isPrimaryKey: true, ordinalPosition: 0 },
+      { name: "order_id", dataType: "integer", nullable: false, isPrimaryKey: false, ordinalPosition: 1,
+        foreignKeyTo: { schema: "public", table: "orders", column: "id" } },
+      { name: "user_id", dataType: "integer", nullable: false, isPrimaryKey: false, ordinalPosition: 2,
+        foreignKeyTo: { schema: "public", table: "users", column: "id" } },
+    ],
+    constraints: [],
+  };
+  const meta: MetadataSource = {
+    ...base,
+    resolveRelation: (ref) => ref.table === "payments" ? payments : base.resolveRelation(ref),
+  };
+  const sql = "SELECT * FROM users u JOIN orders o ON true JOIN payments p ON ";
+  const suggestions = autocompleteTier1(sql, sql.length, meta);
+  assert.deepEqual(suggestions.slice(0, 2).map((suggestion) => suggestion.label), [
+    "p.order_id = o.id", "p.user_id = u.id",
+  ]);
+  assert.ok(suggestions.slice(0, 2).every((suggestion) => suggestion.detail === "chave estrangeira"));
+});
+
+test("ON respeita identificadores citados, schema e prefixo parcial", () => {
+  const base = metaOf(postgresDescriptor);
+  const orders: Relation = {
+    ...ORDERS,
+    columns: ORDERS.columns.map((column) => column.name === "user_id"
+      ? { ...column, foreignKeyTo: { schema: "public", table: "users", column: "id" } }
+      : column),
+  };
+  const meta: MetadataSource = {
+    ...base,
+    resolveRelation: (ref) => ref.table === "orders" ? orders : base.resolveRelation(ref),
+  };
+  const sql = 'SELECT * FROM public.users "User Alias" JOIN public.orders o ON user';
+  const suggestions = autocompleteTier1(sql, sql.length, meta);
+  assert.equal(suggestions[0]?.insertText, 'o.user_id = "User Alias".id');
+  assert.equal(suggestions[0]?.filterText, "user");
+
+  const otherSchema: MetadataSource = {
+    ...meta,
+    resolveRelation: (ref) => ref.table === "users" ? { ...USERS, schema: "audit" } : meta.resolveRelation(ref),
+  };
+  const withoutMatch = "SELECT * FROM audit.users u JOIN public.orders o ON ";
+  assert.ok(!autocompleteTier1(withoutMatch, withoutMatch.length, otherSchema)
+    .some((suggestion) => suggestion.detail === "chave estrangeira"));
+});
+
 test("após relação JOIN sugere ON prioritário, sem transições gerais", () => {
   const sql = "SELECT * FROM users JOIN orders ";
   const out = autocompleteTier1(sql, sql.length, metaOf(postgresDescriptor));

scripts/test-coverage.mjs

@@ -12,6 +12,7 @@ const reports = [
   ["packages/adapters-mssql", "coverage/lcov.info"],
   ["packages/adapters-oracle", "coverage/lcov.info"],
   ["packages/adapters-jdbc", "coverage/lcov.info"],
+  ["packages/adapters-odbc", "coverage/lcov.info"],
   ["packages/autocomplete-engine", "coverage/lcov.info"],
   ["packages/dialect-descriptors", "coverage/lcov.info"],
   ["packages/metadata-cache", "coverage/lcov.info"],

sonar-project.properties

@@ -18,6 +18,6 @@ sonar.exclusions=**/node_modules/**,**/dist/**,**/build/**,**/coverage/**,**/.tu
 # monorepo so the scanner bridge cannot become unresponsive under CI load.
 sonar.javascript.node.maxspace=4096
 
-sonar.javascript.lcov.reportPaths=apps/desktop/coverage/lcov.info,packages/adapters-pg/coverage/lcov.info,packages/adapters-mysql/coverage/lcov.info,packages/adapters-mssql/coverage/lcov.info,packages/adapters-oracle/coverage/lcov.info,packages/adapters-jdbc/coverage/lcov.info,packages/autocomplete-engine/coverage/lcov.info,packages/dialect-descriptors/coverage/lcov.info,packages/metadata-cache/coverage/lcov.info,packages/backend/coverage/lcov.info,packages/mcp-server/coverage/lcov.info,packages/ts-types/coverage/lcov.info
+sonar.javascript.lcov.reportPaths=apps/desktop/coverage/lcov.info,packages/adapters-pg/coverage/lcov.info,packages/adapters-mysql/coverage/lcov.info,packages/adapters-mssql/coverage/lcov.info,packages/adapters-oracle/coverage/lcov.info,packages/adapters-jdbc/coverage/lcov.info,packages/adapters-odbc/coverage/lcov.info,packages/autocomplete-engine/coverage/lcov.info,packages/dialect-descriptors/coverage/lcov.info,packages/metadata-cache/coverage/lcov.info,packages/backend/coverage/lcov.info,packages/mcp-server/coverage/lcov.info,packages/ts-types/coverage/lcov.info
 sonar.coverage.jacoco.xmlReportPaths=services/jvm-sidecar/build/reports/jacoco/test/jacocoTestReport.xml
 sonar.rust.lcov.reportPaths=apps/desktop/src-tauri/coverage/lcov.info