@bytebase/dbhub 1.2.1 → 1.2.3

package/dist/{chunk-2DFLBX4D.js → chunk-F5TPYAVO.js}

@@ -1496,6 +1496,20 @@ function validateSourceConfig(source, configPath) {
     );
   }
 }
+function resolveSqliteDatabasePath(database, configPath) {
+  if (database === ":memory:") {
+    return database;
+  }
+  const expanded = expandHomeDir(database);
+  const absolute = path2.isAbsolute(expanded) ? expanded : path2.resolve(path2.dirname(configPath), expanded);
+  return absolute.replace(/\\/g, "/");
+}
+function buildSqliteDSN(database) {
+  if (database === ":memory:") {
+    return "sqlite:///:memory:";
+  }
+  return `sqlite://${database.startsWith("/") ? database : `/${database}`}`;
+}
 function processSourceConfigs(sources, configPath) {
   return sources.map((source) => {
     const processed = { ...source };
@@ -1506,7 +1520,7 @@ function processSourceConfigs(sources, configPath) {
       processed.sslrootcert = expandHomeDir(processed.sslrootcert);
     }
     if (processed.type === "sqlite" && processed.database) {
-      processed.database = expandHomeDir(processed.database);
+      processed.database = resolveSqliteDatabasePath(processed.database, configPath);
     }
     if (processed.dsn && processed.dsn.startsWith("sqlite:///~")) {
       processed.dsn = `sqlite:///${expandHomeDir(processed.dsn.substring(11))}`;
@@ -1629,7 +1643,7 @@ function buildDSNFromSource(source) {
         `Source '${source.id}': 'database' field is required for SQLite`
       );
     }
-    return `sqlite:///${source.database}`;
+    return buildSqliteDSN(source.database);
   }
   const isAwsIamPasswordless = source.aws_iam_auth === true && ["postgres", "mysql", "mariadb"].includes(source.type);
   const passwordRequired = source.authentication !== "azure-active-directory-access-token" && !isAwsIamPasswordless;

package/dist/index.js

@@ -18,7 +18,7 @@ import {
   resolveSourceConfigs,
   resolveTomlConfigPath,
   resolveTransport
-} from "./chunk-2DFLBX4D.js";
+} from "./chunk-F5TPYAVO.js";
 import {
   allowedKeywords,
   getFirstKeyword,
@@ -1913,7 +1913,7 @@ See documentation for more details on configuring database connections.
     const sources = sourceConfigsData.sources;
     console.error(`Configuration source: ${sourceConfigsData.source}`);
     await connectorManager.connectWithSources(sources);
-    const { initializeToolRegistry: initializeToolRegistry2 } = await import("./registry-D2QVU6AG.js");
+    const { initializeToolRegistry: initializeToolRegistry2 } = await import("./registry-6ABK3M6V.js");
     initializeToolRegistry2({
       sources: sourceConfigsData.sources,
       tools: sourceConfigsData.tools
@@ -2068,7 +2068,7 @@ See documentation for more details on configuring database connections.
 
 // src/index.ts
 var connectorModules = [
-  { load: () => import("./postgres-2FHS64EO.js"), name: "PostgreSQL", driver: "pg" },
+  { load: () => import("./postgres-OVI2PNIJ.js"), name: "PostgreSQL", driver: "pg" },
   { load: () => import("./sqlserver-WNVSBFJ3.js"), name: "SQL Server", driver: "mssql" },
   { load: () => import("./sqlite-ASYMU5BI.js"), name: "SQLite", driver: "node:sqlite" },
   { load: () => import("./mysql-GXDUNLJ6.js"), name: "MySQL", driver: "mysql2" },

package/dist/{postgres-2FHS64EO.js → postgres-OVI2PNIJ.js}

@@ -19,7 +19,7 @@ import {
 import fs from "fs";
 import os from "os";
 import path from "path";
-import pg from "pg";
+import pg2 from "pg";
 
 // src/connectors/postgres/failed-to-read-certificate.ts
 var FailedToReadCertificate = class extends Error {
@@ -29,8 +29,35 @@ var FailedToReadCertificate = class extends Error {
   }
 };
 
+// src/connectors/postgres/type-parsers.ts
+import pg from "pg";
+var VERBATIM_DATE_TIME_OIDS = /* @__PURE__ */ new Set([
+  1082,
+  // date
+  1114,
+  // timestamp without time zone
+  1184,
+  // timestamp with time zone
+  1182,
+  // date[]
+  1115,
+  // timestamp[]
+  1185
+  // timestamptz[]
+]);
+var passthrough = (value) => value;
+var postgresTypeParsers = {
+  getTypeParser(oid, format) {
+    if (VERBATIM_DATE_TIME_OIDS.has(oid) && (format === void 0 || format === "text")) {
+      return passthrough;
+    }
+    return pg.types.getTypeParser(oid, format);
+  }
+};
+
 // src/connectors/postgres/index.ts
-var { Pool } = pg;
+var { Pool } = pg2;
+var POSTGRES_CLIENT_QUERY_TIMEOUT_GRACE_MS = 5e3;
 var PostgresDSNParser = class {
   async parse(dsn, config) {
     const connectionTimeoutSeconds = config?.connectionTimeoutSeconds;
@@ -90,7 +117,9 @@ Expected: ${expectedFormat}`
         poolConfig.connectionTimeoutMillis = connectionTimeoutSeconds * 1e3;
       }
       if (queryTimeoutSeconds !== void 0) {
-        poolConfig.query_timeout = queryTimeoutSeconds * 1e3;
+        const queryTimeoutMs = queryTimeoutSeconds * 1e3;
+        poolConfig.statement_timeout = queryTimeoutMs;
+        poolConfig.query_timeout = queryTimeoutMs + POSTGRES_CLIENT_QUERY_TIMEOUT_GRACE_MS;
       }
       return poolConfig;
     } catch (error) {
@@ -136,6 +165,7 @@ var PostgresConnector = class _PostgresConnector {
     this.defaultSchema = "public";
     try {
       const poolConfig = await this.dsnParser.parse(dsn, config);
+      poolConfig.types = postgresTypeParsers;
       if (config?.readonly) {
         poolConfig.options = (poolConfig.options || "") + " -c default_transaction_read_only=on";
       }