fix libsql for push command

Author: AlexBlokh

drizzle-kit/src/cli/commands/push-libsql.ts

@@ -1 +1,18 @@
-export { handle } from './push-sqlite';
+import type { EntitiesFilterConfig } from '../validations/cli';
+import type { CasingType } from '../validations/common';
+import type { LibSQLCredentials } from '../validations/libsql';
+import { handle as sqliteHandle } from './push-sqlite';
+
+export const handle = async (
+	schemaPath: string | string[],
+	verbose: boolean,
+	credentials: LibSQLCredentials,
+	filters: EntitiesFilterConfig,
+	force: boolean,
+	casing: CasingType | undefined,
+	explainFlag: boolean,
+) => {
+	const { connectToLibSQL } = await import('../connections');
+	const db = await connectToLibSQL(credentials);
+	return sqliteHandle(schemaPath, verbose, credentials, filters, force, casing, explainFlag, db);
+};

drizzle-kit/src/cli/commands/push-sqlite.ts

@@ -25,11 +25,12 @@ export const handle = async (
 	force: boolean,
 	casing: CasingType | undefined,
 	explainFlag: boolean,
+	sqliteDB?: SQLiteDB,
 ) => {
 	const { connectToSQLite } = await import('../connections');
 	const { introspect: sqliteIntrospect } = await import('./pull-sqlite');
 
-	const db = await connectToSQLite(credentials);
+	const db = sqliteDB ?? await connectToSQLite(credentials);
 	const files = prepareFilenames(schemaPath);
 	const res = await prepareFromSchemaFiles(files);
 

drizzle-kit/src/cli/connections.ts

@@ -1425,77 +1425,77 @@ export const connectToLibSQL = async (credentials: LibSQLCredentials): Promise<
 		transactionProxy: TransactionProxy;
 	}
 > => {
-	if (await checkPackage('@libsql/client')) {
-		const { createClient } = await import('@libsql/client');
-		const { drizzle } = await import('drizzle-orm/libsql');
-		const { migrate } = await import('drizzle-orm/libsql/migrator');
+	if (!(await checkPackage('@libsql/client'))) {
+		console.log(
+			"Please install '@libsql/client' for Drizzle Kit to connect to LibSQL databases",
+		);
+		process.exit(1);
+	}
 
-		const client = createClient({
-			url: normaliseSQLiteUrl(credentials.url, 'libsql'),
-			authToken: credentials.authToken,
-		});
-		const drzl = drizzle({ client });
-		const migrateFn = async (config: MigrationConfig) => {
-			return migrate(drzl, config);
-		};
+	const { createClient } = await import('@libsql/client');
+	const { drizzle } = await import('drizzle-orm/libsql');
+	const { migrate } = await import('drizzle-orm/libsql/migrator');
 
-		const db: LibSQLDB = {
-			query: async <T>(sql: string, params?: any[]) => {
-				const res = await client.execute({ sql, args: params || [] }).catch((e) => {
-					throw new QueryError(e, sql, params || []);
-				});
-				return res.rows as T[];
-			},
-			run: async (query: string) => {
-				await client.execute(query).catch((e) => {
-					throw new QueryError(e, query, []);
-				});
-			},
-			batchWithPragma: async (queries: string[]) => {
-				await client.migrate(queries);
-			},
-		};
-
-		type Transaction = Awaited<ReturnType<typeof client.transaction>>;
+	const client = createClient({
+		url: normaliseSQLiteUrl(credentials.url, 'libsql'),
+		authToken: credentials.authToken,
+	});
+	const drzl = drizzle({ client });
+	const migrateFn = async (config: MigrationConfig) => {
+		return migrate(drzl, config);
+	};
 
-		const proxy = async (params: ProxyParams) => {
-			const preparedParams = prepareSqliteParams(params.params || []);
-			const result = await client.execute({
-				sql: params.sql,
-				args: preparedParams,
+	const db: LibSQLDB = {
+		query: async <T>(sql: string, params?: any[]) => {
+			const res = await client.execute({ sql, args: params || [] }).catch((e) => {
+				throw new QueryError(e, sql, params || []);
 			});
+			return res.rows as T[];
+		},
+		run: async (query: string) => {
+			await client.execute(query).catch((e) => {
+				throw new QueryError(e, query, []);
+			});
+		},
+		batchWithPragma: async (queries: string[]) => {
+			await client.migrate(queries);
+		},
+	};
 
-			if (params.mode === 'array') {
-				return result.rows.map((row) => Object.values(row));
-			} else {
-				return result.rows;
-			}
-		};
+	type Transaction = Awaited<ReturnType<typeof client.transaction>>;
 
-		const transactionProxy: TransactionProxy = async (queries) => {
-			const results: (any[] | Error)[] = [];
-			let transaction: Transaction | null = null;
-			try {
-				transaction = await client.transaction();
-				for (const query of queries) {
-					const result = await transaction.execute(query.sql);
-					results.push(result.rows);
-				}
-				await transaction.commit();
-			} catch (error) {
-				results.push(error as Error);
-				await transaction?.rollback();
-			} finally {
-				transaction?.close();
-			}
-			return results;
-		};
+	const proxy = async (params: ProxyParams) => {
+		const preparedParams = prepareSqliteParams(params.params || []);
+		const result = await client.execute({
+			sql: params.sql,
+			args: preparedParams,
+		});
 
-		return { ...db, packageName: '@libsql/client', proxy, transactionProxy, migrate: migrateFn };
-	}
+		if (params.mode === 'array') {
+			return result.rows.map((row) => Object.values(row));
+		} else {
+			return result.rows;
+		}
+	};
 
-	console.log(
-		"Please install '@libsql/client' for Drizzle Kit to connect to LibSQL databases",
-	);
-	process.exit(1);
+	const transactionProxy: TransactionProxy = async (queries) => {
+		const results: (any[] | Error)[] = [];
+		let transaction: Transaction | null = null;
+		try {
+			transaction = await client.transaction();
+			for (const query of queries) {
+				const result = await transaction.execute(query.sql);
+				results.push(result.rows);
+			}
+			await transaction.commit();
+		} catch (error) {
+			results.push(error as Error);
+			await transaction?.rollback();
+		} finally {
+			transaction?.close();
+		}
+		return results;
+	};
+
+	return { ...db, packageName: '@libsql/client', proxy, transactionProxy, migrate: migrateFn };
 };