@happyvertical/sql 0.89.0 → 0.89.1

package/README.md

@@ -32,6 +32,8 @@ const tursoDb = await getDatabase({
 const pgDb = await getDatabase({
   type: 'postgres',
   url: 'postgresql://user:pass@localhost:5432/dbname',
+  connectionTimeoutMillis: 10_000,
+  idleTimeoutMillis: 30_000,
 });
 
 // DuckDB with JSON file auto-registration
@@ -50,6 +52,11 @@ const jsonDb = await getDatabase({
 });
 ```
 
+PostgreSQL also accepts `max` (20 by default), `connectionTimeoutMillis`, and
+`idleTimeoutMillis`. Lifecycle timeouts must be integer milliseconds from `0`
+through Node.js's maximum timer delay of `2,147,483,647`; `0` disables the
+corresponding timeout. Omitted timeout values retain `pg`'s defaults.
+
 ### Connection caching and cleanup
 
 PostgreSQL, JSON, and explicitly identified SQLite connections are shared by
@@ -82,10 +89,12 @@ always `await clearConnectionCache()` before opening a replacement connection.
 An explicit `dbid` is an opaque, stable caller-owned cache identity and must be
 non-empty. Without
 one, PostgreSQL derives a credential- and pool-option-sensitive identity using
-a process-keyed digest; connection URLs, usernames, passwords, and option names
-are not stored in readable cache keys. SQLite caches only connections with a
-`dbid` (automatically assigned to the default `:memory:` path). JSON derives an
-identity from its directory and behavior options.
+a process-keyed digest. The pool identity includes `max`,
+`connectionTimeoutMillis`, and `idleTimeoutMillis`; connection URLs, usernames,
+passwords, and option names are not stored in readable cache keys. SQLite
+caches only connections with a `dbid` (automatically assigned to the default
+`:memory:` path). JSON derives an identity from its directory and behavior
+options.
 
 DuckDB already creates a fresh adapter for every call, so `cache` and
 `clearCache` are accepted for uniform configuration but do not change its
@@ -364,6 +373,10 @@ await syncSchema({
 const exists = await db.tableExists('users');
 ```
 
+On PostgreSQL, `syncSchema()` recognizes `CREATE [UNIQUE] INDEX CONCURRENTLY
+[IF NOT EXISTS]` statements, including optional `USING` index methods, and
+skips indexes that already exist when a schema is applied again.
+
 ### Vector Search (PostgreSQL)
 
 PostgreSQL adapters expose `db.vector` when pgvector is available:

package/dist/index.js

@@ -1717,6 +1717,7 @@ var postgres_exports = /* @__PURE__ */ __exportAll({
 	clearPostgresConnectionCache: () => clearPostgresConnectionCache,
 	getDatabase: () => getDatabase$1
 });
+var MAX_TIMER_DELAY_MILLIS = 2147483647;
 globalThis.__haveSqlPostgresCacheHmacKey ??= webcrypto.subtle.generateKey({
 	name: "HMAC",
 	hash: "SHA-256"
@@ -1753,8 +1754,11 @@ function resolvePostgresConfig(options) {
 	const legacyPort = process.env.SQLOO_PORT;
 	const port = legacy(primary.port, legacyPort === void 0 ? void 0 : Number(legacyPort)) ?? 5432;
 	const max = options.max ?? 20;
+	const { connectionTimeoutMillis, idleTimeoutMillis } = options;
 	if (!Number.isInteger(port) || port < 1 || port > 65535) throw new Error("PostgreSQL port must be an integer between 1 and 65535");
 	if (!Number.isInteger(max) || max < 1) throw new Error("PostgreSQL pool max must be a positive integer");
+	if (connectionTimeoutMillis !== void 0 && (!Number.isInteger(connectionTimeoutMillis) || connectionTimeoutMillis < 0 || connectionTimeoutMillis > MAX_TIMER_DELAY_MILLIS)) throw new Error(`PostgreSQL pool connectionTimeoutMillis must be an integer between 0 and ${MAX_TIMER_DELAY_MILLIS}`);
+	if (idleTimeoutMillis !== void 0 && (!Number.isInteger(idleTimeoutMillis) || idleTimeoutMillis < 0 || idleTimeoutMillis > MAX_TIMER_DELAY_MILLIS)) throw new Error(`PostgreSQL pool idleTimeoutMillis must be an integer between 0 and ${MAX_TIMER_DELAY_MILLIS}`);
 	return {
 		url: legacy(primary.url, process.env.SQLOO_URL),
 		database: legacy(primary.database, process.env.SQLOO_DATABASE),
@@ -1762,7 +1766,9 @@ function resolvePostgresConfig(options) {
 		user: legacy(primary.user, process.env.SQLOO_USER),
 		password: legacy(primary.password, process.env.SQLOO_PASSWORD),
 		port,
-		max
+		max,
+		connectionTimeoutMillis,
+		idleTimeoutMillis
 	};
 }
 async function derivePostgresConnectionCacheKey(options, effective) {
@@ -1774,7 +1780,9 @@ async function derivePostgresConnectionCacheKey(options, effective) {
 		database: effective.database ?? null,
 		user: effective.user ?? null,
 		password: effective.password ?? null,
-		max: effective.max
+		max: effective.max,
+		connectionTimeoutMillis: effective.connectionTimeoutMillis ?? null,
+		idleTimeoutMillis: effective.idleTimeoutMillis ?? null
 	});
 	const hmacKey = await globalThis.__haveSqlPostgresCacheHmacKey;
 	if (!hmacKey) throw new Error("PostgreSQL cache identity key was not initialized");
@@ -2115,17 +2123,21 @@ async function getDatabase$1(options = {}) {
 async function createDatabase(config) {
 	const { database, host = "localhost", user, password, port = 5432 } = config;
 	const url = config.url || `postgresql://${user}${password ? `:${password}` : ""}@${host}:${port}/${database || "postgres"}`;
-	const poolMax = config.max;
+	const { max: poolMax, connectionTimeoutMillis, idleTimeoutMillis } = config;
 	const pool = new Pool(config.url ? {
 		connectionString: config.url,
-		max: poolMax
+		max: poolMax,
+		connectionTimeoutMillis,
+		idleTimeoutMillis
 	} : {
 		host,
 		user,
 		password,
 		port,
 		database,
-		max: poolMax
+		max: poolMax,
+		connectionTimeoutMillis,
+		idleTimeoutMillis
 	});
 	pool.on("error", (error) => {
 		console.warn("Warning: PostgreSQL pool client error (connection discarded):", error instanceof Error ? error.message : String(error));
@@ -2804,11 +2816,18 @@ async function createDatabase(config) {
 		};
 		const syncSchema = async (schema) => {
 			const commands = schema.trim().split(";").filter((command) => command.trim() !== "");
-			const createIndexRegex = /CREATE (UNIQUE )?INDEX (IF NOT EXISTS )?"?(\w+)"? ON "?(\w+)"?\s*\(([^)]+)\)/i;
+			const createIndexRegex = /CREATE\s+(?:UNIQUE\s+)?INDEX\s+(?:CONCURRENTLY\s+)?(?:IF\s+NOT\s+EXISTS\s+)?"?(?<indexName>\w+)"?\s+ON\s+"?(?<tableName>\w+)"?\s*(?:USING\s+"?\w+"?\s*)?\([^)]+\)/i;
+			const parseCreateIndex = (command) => {
+				const { indexName, tableName } = command.match(createIndexRegex)?.groups ?? {};
+				return indexName && tableName ? {
+					indexName,
+					tableName
+				} : null;
+			};
 			const indexNames = [];
 			for (const command of commands) {
-				const indexMatch = command.trim().match(createIndexRegex);
-				if (indexMatch) indexNames.push(indexMatch[3]);
+				const indexMatch = parseCreateIndex(command.trim());
+				if (indexMatch) indexNames.push(indexMatch.indexName);
 			}
 			const existingIndexes = /* @__PURE__ */ new Set();
 			if (indexNames.length > 0) {
@@ -2850,10 +2869,9 @@ async function createDatabase(config) {
 					}
 					continue;
 				}
-				const indexMatch = trimmedCommand.match(createIndexRegex);
+				const indexMatch = parseCreateIndex(trimmedCommand);
 				if (indexMatch) {
-					const indexName = indexMatch[3];
-					const indexTableName = indexMatch[4];
+					const { indexName, tableName: indexTableName } = indexMatch;
 					if (!existingIndexes.has(indexName)) try {
 						await runTolerated(() => executor.query(trimmedCommand));
 						existingIndexes.add(indexName);