Merge pull request #12 from replit/jackyzha0/fix-conns

thread through pool

Author: jackyzha0

.envrc

@@ -0,0 +1,3 @@
+use flake
+dotenv_if_exists
+PATH_add ./node_modules/.bin

.gitignore

@@ -12,4 +12,5 @@ dist-dts
 rollup.config-*.mjs
 *.log
 .DS_Store
-drizzle-seed/src/dev
+drizzle-seed/src/dev
+.direnv

drizzle-kit/README.md

@@ -9,7 +9,7 @@ pnpm install && pnpm build
 ```
 
 #### Development
-Make any changes you require to the `drizzle-kit/api` file ([see here](./drizzle-kit/src/api.ts)), then run:
+Make any changes you require to the `drizzle-kit/api` file ([see here](./drizzle-kit/src/api.ts)), then run (from `drizzle-kit`):
 ```bash
 pnpm build
 ```

drizzle-kit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drizzle-team/drizzle-kit",
-	"version": "0.31.11",
+	"version": "0.32.0",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",

drizzle-kit/src/api.ts

@@ -84,25 +84,15 @@ export const introspectPgDB = async (
 };
 
 export const preparePgDB = async (
-	credentials: DrizzlePostgresCredentials,
+	pool: import('pg').Pool | import('pg').PoolClient,
 ): Promise<
 	DrizzlePgDB
 > => {
-	console.log(`Using 'pg' driver for database querying`);
 	const { default: pg } = await import('pg');
+
 	const { drizzle } = await import('drizzle-orm/node-postgres');
 	const { migrate } = await import('drizzle-orm/node-postgres/migrator');
 
-	const ssl = 'ssl' in credentials
-		? credentials.ssl === 'prefer'
-				|| credentials.ssl === 'require'
-				|| credentials.ssl === 'allow'
-			? { rejectUnauthorized: false }
-			: credentials.ssl === 'verify-full'
-			? {}
-			: credentials.ssl
-		: {};
-
 	// Override pg default date parsers
 	const types: { getTypeParser: typeof pg.types.getTypeParser } = {
 		// @ts-ignore
@@ -124,17 +114,13 @@ export const preparePgDB = async (
 		},
 	};
 
-	const client = 'url' in credentials
-		? new pg.Pool({ connectionString: credentials.url, max: 1 })
-		: new pg.Pool({ ...credentials, ssl, max: 1 });
-
-	const db = drizzle(client);
+	const db = drizzle(pool);
 	const migrateFn = async (config: MigrationConfig) => {
 		return migrate(db, config);
 	};
 
 	const query = async (sql: string, params?: any[]) => {
-		const result = await client.query({
+		const result = await pool.query({
 			text: sql,
 			values: params ?? [],
 			types,
@@ -143,7 +129,7 @@ export const preparePgDB = async (
 	};
 
 	const proxy: Proxy = async (params: ProxyParams) => {
-		const result = await client.query({
+		const result = await pool.query({
 			text: params.sql,
 			values: params.params,
 			...(params.mode === 'array' && { rowMode: 'array' }),
@@ -155,17 +141,6 @@ export const preparePgDB = async (
 	return { query, proxy, migrate: migrateFn };
 };
 
-export const getPgClientPool = async (
-	targetCredentials: DrizzlePostgresCredentials,
-) => {
-	const { default: pg } = await import('pg');
-	const pool = 'url' in targetCredentials
-		? new pg.Pool({ connectionString: targetCredentials.url, max: 1 })
-		: new pg.Pool({ ...targetCredentials, ssl: undefined, max: 1 });
-
-	return pool;
-};
-
 export type { SelectResolverInput, SelectResolverOutput } from './cli/commands/pgPushUtils';
 export { applyPgSnapshotsDiff } from './snapshotsDiffer';
 export type {

drizzle-kit/src/serializer/pgSerializer.ts

@@ -19,6 +19,7 @@ import {
 	PgView,
 	uniqueKeyName,
 } from 'drizzle-orm/pg-core';
+import { parse as parsePostgresArray } from 'postgres-array';
 import { CasingType } from 'src/cli/validations/common';
 import { vectorOps } from 'src/extensions/vector';
 import { withStyle } from '../cli/validations/outputs';
@@ -40,7 +41,6 @@ import type {
 	UniqueConstraint,
 	View,
 } from '../serializer/pgSchema';
-import { parse as parsePostgresArray } from 'postgres-array';
 import { type DB, escapeSingleQuotes, isPgArrayType } from '../utils';
 import { getColumnCasing, sqlToStr } from './utils';
 
@@ -1942,21 +1942,25 @@ WHERE
  */
 const formatArrayElement = (element: any, dataType: string): string | null => {
 	if (element === null) return element;
-	
+
 	// Remove outer quotes from postgres-array parsed elements if present
 	// First trim spaces since postgres-array includes leading spaces in array elements
 	let cleanElement = typeof element === 'string' ? element.trim() : element;
-	if (typeof cleanElement === 'string' && ((cleanElement.startsWith("'") && cleanElement.endsWith("'")) || (cleanElement.startsWith('"') && cleanElement.endsWith('"')))) {
+	if (
+		typeof cleanElement === 'string'
+		&& ((cleanElement.startsWith("'") && cleanElement.endsWith("'"))
+			|| (cleanElement.startsWith('"') && cleanElement.endsWith('"')))
+	) {
 		cleanElement = cleanElement.slice(1, -1);
 	}
 
 	// remove [] from dataType if it exists
-	if (!dataType.endsWith("[]")) {
+	if (!dataType.endsWith('[]')) {
 		throw new Error(`array dataType ${dataType} does not end with '[]'`);
 	}
 
-	const baseDataType = dataType.slice(0, -"[]".length);
-	
+	const baseDataType = dataType.slice(0, -'[]'.length);
+
 	if (['integer', 'smallint', 'bigint', 'double precision', 'real'].includes(baseDataType)) {
 		return cleanElement;
 	} else if (dataType.startsWith('timestamp')) {
@@ -1968,7 +1972,7 @@ const formatArrayElement = (element: any, dataType: string): string | null => {
 	} else if (['json', 'jsonb'].includes(baseDataType)) {
 		// For JSON/JSONB arrays, cleanElement is already a JSON string
 		// We just need to ensure it's properly quoted
-		
+
 		// First, try to parse it to validate it's valid JSON
 		const parsed = JSON.parse(cleanElement);
 		// Then stringify it back to ensure consistent formatting
@@ -1986,36 +1990,38 @@ const handleArrayDefault = (columnDefaultAsString: string, dataType: string): st
 	// Handle common simple cases
 	if (columnDefaultAsString === '{}' || columnDefaultAsString === "'{}'") {
 		return "'{}'";
-	} else if (columnDefaultAsString === '{""}' || columnDefaultAsString === "'{\"\"}'") {
-		return "'{\"\"}'";
+	} else if (columnDefaultAsString === '{""}' || columnDefaultAsString === '\'{""}\'') {
+		return '\'{""}\'';
 	}
 
 	// Convert ARRAY constructor syntax to PostgreSQL bracket notation that postgres-array can parse
 	let normalizedArrayString = columnDefaultAsString;
-	
+
 	if (columnDefaultAsString.startsWith('ARRAY[') && columnDefaultAsString.endsWith(']')) {
 		// Convert ARRAY['a'::text, 'b', 'c'::varchar] -> {'a', 'b', 'c'}
 		const content = columnDefaultAsString.slice(6, -1); // Remove 'ARRAY[' and ']'
-		
+
 		// Remove type casting from individual elements (::text, ::varchar, etc.)
 		const cleanContent = content.replace(/::\w+/g, '');
 		normalizedArrayString = `{${cleanContent}}`;
 	}
-	
+
 	// Handle various bracket notation formats to ensure compatibility with postgres-array
 	if (normalizedArrayString.startsWith("'{") && normalizedArrayString.endsWith("}'")) {
 		normalizedArrayString = normalizedArrayString.slice(1, -1); // Remove outer quotes
-	} else if (!normalizedArrayString.startsWith("{") && !normalizedArrayString.startsWith("'") && normalizedArrayString !== '{}') {
+	} else if (
+		!normalizedArrayString.startsWith('{') && !normalizedArrayString.startsWith("'") && normalizedArrayString !== '{}'
+	) {
 		// Handle cases where array string doesn't have proper brackets
 		normalizedArrayString = `{${normalizedArrayString}}`;
 	}
 
 	// Use postgres-array library to parse the normalized string
 	const parsedArray = [...parsePostgresArray(normalizedArrayString)];
-	
+
 	// Format elements according to data type
 	const formattedElements = parsedArray.map((element) => formatArrayElement(element, dataType));
-	
+
 	return `'{${formattedElements.join(',')}}'`;
 };