@agentuity/drizzle 1.0.3 → 1.0.5

package/dist/postgres.d.ts

@@ -1,4 +1,25 @@
+import { SQL as BunSQL } from 'bun';
+import { type CallablePostgresClient, type PostgresConfig } from '@agentuity/postgres';
 import type { PostgresDrizzleConfig, PostgresDrizzle } from './types';
+/**
+ * Resolves the PostgreSQL client configuration from Drizzle config options.
+ *
+ * URL priority chain: `connection.url` > `url` > `connectionString` > `process.env.DATABASE_URL`
+ *
+ * @internal Exported for testing — not part of the public package API.
+ */
+export declare function resolvePostgresClientConfig<TSchema extends Record<string, unknown> = Record<string, never>>(config?: PostgresDrizzleConfig<TSchema>): PostgresConfig;
+/**
+ * Creates a dynamic SQL proxy that always delegates to the PostgresClient's
+ * current raw connection. This ensures that after automatic reconnection,
+ * Drizzle ORM uses the fresh connection instead of a stale reference.
+ *
+ * The proxy also wraps `unsafe()` calls with the client's retry logic,
+ * providing automatic retry on transient connection errors.
+ *
+ * @internal Exported for testing — not part of the public package API.
+ */
+export declare function createResilientSQLProxy(client: CallablePostgresClient): InstanceType<typeof BunSQL>;
 /**
  * Creates a Drizzle ORM instance with a resilient PostgreSQL connection.
  *

package/dist/postgres.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../src/postgres.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,qBAAqB,CACpC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAoDnE"}
+{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../src/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAY,KAAK,sBAAsB,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEtE;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAC1C,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,cAAc,CA0BzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACtC,MAAM,EAAE,sBAAsB,GAC5B,YAAY,CAAC,OAAO,MAAM,CAAC,CAqC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,qBAAqB,CACpC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAoCnE"}

package/dist/postgres.js

@@ -1,5 +1,81 @@
 import { drizzle } from 'drizzle-orm/bun-sql';
 import { postgres } from '@agentuity/postgres';
+/**
+ * Resolves the PostgreSQL client configuration from Drizzle config options.
+ *
+ * URL priority chain: `connection.url` > `url` > `connectionString` > `process.env.DATABASE_URL`
+ *
+ * @internal Exported for testing — not part of the public package API.
+ */
+export function resolvePostgresClientConfig(config) {
+    // Clone the connection config to avoid mutating the caller's object
+    const clientConfig = config?.connection ? { ...config.connection } : {};
+    // Resolve URL using priority chain
+    if (!clientConfig.url) {
+        if (config?.url) {
+            clientConfig.url = config.url;
+        }
+        else if (config?.connectionString) {
+            clientConfig.url = config.connectionString;
+        }
+        else if (process.env.DATABASE_URL) {
+            clientConfig.url = process.env.DATABASE_URL;
+        }
+    }
+    // Add reconnection configuration
+    if (config?.reconnect) {
+        clientConfig.reconnect = config.reconnect;
+    }
+    // Add callbacks
+    if (config?.onReconnected) {
+        clientConfig.onreconnected = config.onReconnected;
+    }
+    return clientConfig;
+}
+/**
+ * Creates a dynamic SQL proxy that always delegates to the PostgresClient's
+ * current raw connection. This ensures that after automatic reconnection,
+ * Drizzle ORM uses the fresh connection instead of a stale reference.
+ *
+ * The proxy also wraps `unsafe()` calls with the client's retry logic,
+ * providing automatic retry on transient connection errors.
+ *
+ * @internal Exported for testing — not part of the public package API.
+ */
+export function createResilientSQLProxy(client) {
+    return new Proxy({}, {
+        get(_target, prop, _receiver) {
+            // Always resolve from the CURRENT raw connection (changes after reconnect)
+            const raw = client.raw;
+            if (prop === 'unsafe') {
+                // Wrap unsafe() with retry logic for resilient queries.
+                // Returns a thenable that also supports .values() chaining,
+                // matching the SQLQuery interface that Drizzle expects:
+                //   client.unsafe(query, params)           → Promise<rows>
+                //   client.unsafe(query, params).values()   → Promise<rows>
+                return (query, params) => {
+                    const makeExecutor = (useValues) => client.executeWithRetry(async () => {
+                        // Re-resolve raw inside retry to get post-reconnect instance
+                        const currentRaw = client.raw;
+                        const q = currentRaw.unsafe(query, params);
+                        return useValues ? q.values() : q;
+                    });
+                    // Return a thenable with .values() to match Bun's SQLQuery interface
+                    const result = makeExecutor(false);
+                    return Object.assign(result, {
+                        values: () => makeExecutor(true),
+                    });
+                };
+            }
+            const value = raw[prop];
+            if (typeof value === 'function') {
+                // Bind to raw so `this` is correct inside begin(), savepoint(), etc.
+                return value.bind(raw);
+            }
+            return value;
+        },
+    });
+}
 /**
  * Creates a Drizzle ORM instance with a resilient PostgreSQL connection.
  *
@@ -45,27 +121,8 @@ import { postgres } from '@agentuity/postgres';
  * ```
  */
 export function createPostgresDrizzle(config) {
-    // Build postgres client configuration by cloning the connection config
-    // to avoid mutating the caller's object
-    const clientConfig = config?.connection ? { ...config.connection } : {};
-    // Use connectionString only if no url is already present on the cloned config
-    // This ensures connection (when provided) keeps precedence over connectionString
-    if (!clientConfig.url) {
-        if (config?.connectionString) {
-            clientConfig.url = config.connectionString;
-        }
-        else if (process.env.DATABASE_URL) {
-            clientConfig.url = process.env.DATABASE_URL;
-        }
-    }
-    // Add reconnection configuration
-    if (config?.reconnect) {
-        clientConfig.reconnect = config.reconnect;
-    }
-    // Add callbacks
-    if (config?.onReconnected) {
-        clientConfig.onreconnected = config.onReconnected;
-    }
+    // Resolve the postgres client configuration
+    const clientConfig = resolvePostgresClientConfig(config);
     // Create the postgres client
     const client = postgres(clientConfig);
     // Wait for connection before calling onConnect callback
@@ -75,10 +132,14 @@ export function createPostgresDrizzle(config) {
             config.onConnect();
         });
     }
-    // Create Drizzle instance using the client's raw SQL connection
-    // The bun-sql driver accepts a client that implements the Bun.SQL interface
+    // Create a resilient proxy that always delegates to the current raw SQL
+    // connection. This ensures that after reconnection, Drizzle automatically
+    // uses the new connection instead of the stale one.
+    const resilientSQL = createResilientSQLProxy(client);
+    // Create Drizzle instance using the resilient proxy instead of a static
+    // reference to client.raw, which would become stale after reconnection.
     const db = drizzle({
-        client: client.raw,
+        client: resilientSQL,
         schema: config?.schema,
         logger: config?.logger,
     });

package/dist/postgres.js.map

@@ -1 +1 @@
-{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../src/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAA+B,MAAM,qBAAqB,CAAC;AAG5E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,MAAM,UAAU,qBAAqB,CAEnC,MAAuC;IACxC,uEAAuE;IACvE,wCAAwC;IACxC,MAAM,YAAY,GAAG,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAExE,8EAA8E;IAC9E,iFAAiF;IACjF,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,MAAM,EAAE,gBAAgB,EAAE,CAAC;YAC9B,YAAY,CAAC,GAAG,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAC5C,CAAC;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;YACrC,YAAY,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;QAC7C,CAAC;IACF,CAAC;IAED,iCAAiC;IACjC,IAAI,MAAM,EAAE,SAAS,EAAE,CAAC;QACvB,YAAY,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IAC3C,CAAC;IAED,gBAAgB;IAChB,IAAI,MAAM,EAAE,aAAa,EAAE,CAAC;QAC3B,YAAY,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;IACnD,CAAC;IAED,6BAA6B;IAC7B,MAAM,MAAM,GAA2B,QAAQ,CAAC,YAAY,CAAC,CAAC;IAE9D,wDAAwD;IACxD,8EAA8E;IAC9E,IAAI,MAAM,EAAE,SAAS,EAAE,CAAC;QACvB,MAAM,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACpC,MAAM,CAAC,SAAU,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,gEAAgE;IAChE,4EAA4E;IAC5E,MAAM,EAAE,GAAG,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC,GAAG;QAClB,MAAM,EAAE,MAAM,EAAE,MAAM;QACtB,MAAM,EAAE,MAAM,EAAE,MAAM;KACtB,CAAC,CAAC;IAEH,gCAAgC;IAChC,OAAO;QACN,EAAE;QACF,MAAM;QACN,KAAK,EAAE,KAAK,IAAI,EAAE;YACjB,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC;KACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../src/postgres.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -7,6 +7,12 @@ import type { PostgresConfig, ReconnectConfig, CallablePostgresClient } from '@a
  * @template TSchema - The Drizzle schema type
  */
 export interface PostgresDrizzleConfig<TSchema extends Record<string, unknown> = Record<string, never>> {
+    /**
+     * PostgreSQL connection URL.
+     * Shorthand for `connection.url`.
+     * If not provided, falls back to `connectionString`, then `process.env.DATABASE_URL`.
+     */
+    url?: string;
     /**
      * PostgreSQL connection string.
      * If not provided, uses `process.env.DATABASE_URL`.

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAEnG;;;;GAIG;AACH,MAAM,WAAW,qBAAqB,CACrC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;IAE/D;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAEjC;;OAEG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;IAE5B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAEvB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAe,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;IAC/F;;OAEG;IACH,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAE5B;;;OAGG;IACH,MAAM,EAAE,sBAAsB,CAAC;IAE/B;;OAEG;IACH,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAEnG;;;;GAIG;AACH,MAAM,WAAW,qBAAqB,CACrC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;IAE/D;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAEjC;;OAEG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;IAE5B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAEvB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAe,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;IAC/F;;OAEG;IACH,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAE5B;;;OAGG;IACH,MAAM,EAAE,sBAAsB,CAAC;IAE/B;;OAEG;IACH,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agentuity/drizzle",
-	"version": "1.0.3",
+	"version": "1.0.5",
 	"license": "Apache-2.0",
 	"author": "Agentuity employees and contributors",
 	"type": "module",
@@ -31,12 +31,12 @@
 		"prepublishOnly": "bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@agentuity/postgres": "1.0.3",
+		"@agentuity/postgres": "1.0.5",
 		"drizzle-orm": "^0.45.0",
 		"better-auth": "^1.4.9"
 	},
 	"devDependencies": {
-		"@agentuity/test-utils": "1.0.3",
+		"@agentuity/test-utils": "1.0.5",
 		"@types/bun": "latest",
 		"bun-types": "latest",
 		"typescript": "^5.9.0"

package/src/postgres.ts

@@ -1,7 +1,96 @@
+import { SQL as BunSQL } from 'bun';
 import { drizzle } from 'drizzle-orm/bun-sql';
-import { postgres, type CallablePostgresClient } from '@agentuity/postgres';
+import { postgres, type CallablePostgresClient, type PostgresConfig } from '@agentuity/postgres';
 import type { PostgresDrizzleConfig, PostgresDrizzle } from './types';
 
+/**
+ * Resolves the PostgreSQL client configuration from Drizzle config options.
+ *
+ * URL priority chain: `connection.url` > `url` > `connectionString` > `process.env.DATABASE_URL`
+ *
+ * @internal Exported for testing — not part of the public package API.
+ */
+export function resolvePostgresClientConfig<
+	TSchema extends Record<string, unknown> = Record<string, never>,
+>(config?: PostgresDrizzleConfig<TSchema>): PostgresConfig {
+	// Clone the connection config to avoid mutating the caller's object
+	const clientConfig: PostgresConfig = config?.connection ? { ...config.connection } : {};
+
+	// Resolve URL using priority chain
+	if (!clientConfig.url) {
+		if (config?.url) {
+			clientConfig.url = config.url;
+		} else if (config?.connectionString) {
+			clientConfig.url = config.connectionString;
+		} else if (process.env.DATABASE_URL) {
+			clientConfig.url = process.env.DATABASE_URL;
+		}
+	}
+
+	// Add reconnection configuration
+	if (config?.reconnect) {
+		clientConfig.reconnect = config.reconnect;
+	}
+
+	// Add callbacks
+	if (config?.onReconnected) {
+		clientConfig.onreconnected = config.onReconnected;
+	}
+
+	return clientConfig;
+}
+
+/**
+ * Creates a dynamic SQL proxy that always delegates to the PostgresClient's
+ * current raw connection. This ensures that after automatic reconnection,
+ * Drizzle ORM uses the fresh connection instead of a stale reference.
+ *
+ * The proxy also wraps `unsafe()` calls with the client's retry logic,
+ * providing automatic retry on transient connection errors.
+ *
+ * @internal Exported for testing — not part of the public package API.
+ */
+export function createResilientSQLProxy(
+	client: CallablePostgresClient
+): InstanceType<typeof BunSQL> {
+	return new Proxy({} as InstanceType<typeof BunSQL>, {
+		get(_target, prop, _receiver) {
+			// Always resolve from the CURRENT raw connection (changes after reconnect)
+			const raw = client.raw;
+
+			if (prop === 'unsafe') {
+				// Wrap unsafe() with retry logic for resilient queries.
+				// Returns a thenable that also supports .values() chaining,
+				// matching the SQLQuery interface that Drizzle expects:
+				//   client.unsafe(query, params)           → Promise<rows>
+				//   client.unsafe(query, params).values()   → Promise<rows>
+				return (query: string, params?: unknown[]) => {
+					const makeExecutor = (useValues: boolean) =>
+						client.executeWithRetry(async () => {
+							// Re-resolve raw inside retry to get post-reconnect instance
+							const currentRaw = client.raw;
+							const q = currentRaw.unsafe(query, params);
+							return useValues ? q.values() : q;
+						});
+
+					// Return a thenable with .values() to match Bun's SQLQuery interface
+					const result = makeExecutor(false);
+					return Object.assign(result, {
+						values: () => makeExecutor(true),
+					});
+				};
+			}
+
+			const value = (raw as unknown as Record<string | symbol, unknown>)[prop];
+			if (typeof value === 'function') {
+				// Bind to raw so `this` is correct inside begin(), savepoint(), etc.
+				return (value as (...args: unknown[]) => unknown).bind(raw);
+			}
+			return value;
+		},
+	});
+}
+
 /**
  * Creates a Drizzle ORM instance with a resilient PostgreSQL connection.
  *
@@ -49,29 +138,8 @@ import type { PostgresDrizzleConfig, PostgresDrizzle } from './types';
 export function createPostgresDrizzle<
 	TSchema extends Record<string, unknown> = Record<string, never>,
 >(config?: PostgresDrizzleConfig<TSchema>): PostgresDrizzle<TSchema> {
-	// Build postgres client configuration by cloning the connection config
-	// to avoid mutating the caller's object
-	const clientConfig = config?.connection ? { ...config.connection } : {};
-
-	// Use connectionString only if no url is already present on the cloned config
-	// This ensures connection (when provided) keeps precedence over connectionString
-	if (!clientConfig.url) {
-		if (config?.connectionString) {
-			clientConfig.url = config.connectionString;
-		} else if (process.env.DATABASE_URL) {
-			clientConfig.url = process.env.DATABASE_URL;
-		}
-	}
-
-	// Add reconnection configuration
-	if (config?.reconnect) {
-		clientConfig.reconnect = config.reconnect;
-	}
-
-	// Add callbacks
-	if (config?.onReconnected) {
-		clientConfig.onreconnected = config.onReconnected;
-	}
+	// Resolve the postgres client configuration
+	const clientConfig = resolvePostgresClientConfig(config);
 
 	// Create the postgres client
 	const client: CallablePostgresClient = postgres(clientConfig);
@@ -84,10 +152,15 @@ export function createPostgresDrizzle<
 		});
 	}
 
-	// Create Drizzle instance using the client's raw SQL connection
-	// The bun-sql driver accepts a client that implements the Bun.SQL interface
+	// Create a resilient proxy that always delegates to the current raw SQL
+	// connection. This ensures that after reconnection, Drizzle automatically
+	// uses the new connection instead of the stale one.
+	const resilientSQL = createResilientSQLProxy(client);
+
+	// Create Drizzle instance using the resilient proxy instead of a static
+	// reference to client.raw, which would become stale after reconnection.
 	const db = drizzle({
-		client: client.raw,
+		client: resilientSQL,
 		schema: config?.schema,
 		logger: config?.logger,
 	});

package/src/types.ts

@@ -10,6 +10,13 @@ import type { PostgresConfig, ReconnectConfig, CallablePostgresClient } from '@a
 export interface PostgresDrizzleConfig<
 	TSchema extends Record<string, unknown> = Record<string, never>,
 > {
+	/**
+	 * PostgreSQL connection URL.
+	 * Shorthand for `connection.url`.
+	 * If not provided, falls back to `connectionString`, then `process.env.DATABASE_URL`.
+	 */
+	url?: string;
+
 	/**
 	 * PostgreSQL connection string.
 	 * If not provided, uses `process.env.DATABASE_URL`.