alepha 0.19.2 → 0.19.3

package/dist/orm/core/index.js

@@ -64,7 +64,7 @@ var DrizzleKitProvider = class {
 		}
 		if (this.alepha.isTest()) {
 			const { statements } = await this.generateMigration(provider);
-			await this.executeFallbackStatements(statements, provider);
+			await this.executeStatements(statements.map((s) => s.replace(/^CREATE SCHEMA /i, "CREATE SCHEMA IF NOT EXISTS ")), provider);
 			return;
 		}
 		const now = this.dateTime.nowMillis();
@@ -80,7 +80,7 @@ var DrizzleKitProvider = class {
 		} catch (error) {
 			this.log.debug("Push sync not available, falling back to migration generation", { error });
 			const { statements } = await this.generateMigration(provider);
-			await this.executeFallbackStatements(statements, provider);
+			await this.executeStatementsLenient(statements, provider);
 		}
 		this.log.info(`Synchronization of '${provider.name}' OK [${this.dateTime.nowMillis() - now}ms]`);
 	}
@@ -181,10 +181,10 @@ var DrizzleKitProvider = class {
 			hasDataLoss: false
 		};
 		let result;
-		if (provider.dialect === "sqlite") result = await this.muteSpinner(() => kit.pushSQLiteSchema(models, provider.db));
+		if (provider.dialect === "sqlite") result = await kit.pushSQLiteSchema(models, provider.db);
 		else {
 			const wrappedDb = this.wrapDbForDrizzleKit(provider.db);
-			result = await this.muteSpinner(() => kit.pushSchema(models, wrappedDb, [provider.schema]));
+			result = await kit.pushSchema(models, wrappedDb, [provider.schema]);
 		}
 		return {
 			statements: result.statementsToExecute,
@@ -193,8 +193,8 @@ var DrizzleKitProvider = class {
 		};
 	}
 	async pushSqlite(kit, models, provider) {
-		const result = await this.muteSpinner(() => kit.pushSQLiteSchema(models, provider.db));
-		await this.runPushResult(result, provider);
+		const { statementsToExecute } = await kit.pushSQLiteSchema(models, provider.db);
+		await this.executeStatements(statementsToExecute, provider);
 	}
 	/**
 	* Push schema changes to PostgreSQL using Drizzle Kit's pushSchema with schema filters.
@@ -202,39 +202,32 @@ var DrizzleKitProvider = class {
 	async pushPostgres(kit, models, provider) {
 		if (provider.schema !== "public") await this.createSchemaIfNotExists(provider, provider.schema);
 		const wrappedDb = this.wrapDbForDrizzleKit(provider.db);
-		const result = await this.muteSpinner(() => kit.pushSchema(models, wrappedDb, [provider.schema]));
-		await this.runPushResult(result, provider);
+		const { statementsToExecute } = await kit.pushSchema(models, wrappedDb, [provider.schema]);
+		await this.executeStatements(statementsToExecute, provider);
 	}
 	/**
-	* Run the statements returned by Drizzle Kit's pushSchema, with safety filters and logging.
+	* Execute a list of SQL statements against the provider.
 	*/
-	async runPushResult(result, provider) {
-		const safe = result.statementsToExecute.filter((s) => {
-			const upper = s.trimStart().toUpperCase();
-			if (upper.startsWith("DROP SCHEMA") || upper.startsWith("DROP TABLE")) {
-				this.log.warn("Skipping destructive statement", { statement: s });
-				return false;
-			}
-			return true;
-		});
-		if (result.hasDataLoss) this.log.warn("Push would cause data loss", {
-			warnings: result.warnings,
-			statements: result.statementsToExecute
-		});
-		if (safe.length > 0) {
-			this.log.debug(`Pushing ${safe.length} statements ...`, { statements: safe });
-			for (const statement of safe) await provider.execute(sql$1.raw(statement));
-		}
+	async executeStatements(statements, provider) {
+		if (statements.length > 0) this.log.debug(`Executing ${statements.length} statements ...`, { statements });
+		for (const statement of statements) await provider.execute(sql$1.raw(statement));
 	}
 	/**
-	* Execute migration statements as a fallback when push sync is not available.
-	* Used for drivers that don't support Drizzle Kit introspection (e.g. PgLite).
+	* Execute SQL statements, ignoring "already exists" errors.
+	*
+	* Used by the fallback migration path where push may have partially
+	* applied changes before erroring, leaving some objects already created.
 	*/
-	async executeFallbackStatements(statements, provider) {
-		for (const statement of statements) {
-			const upper = statement.trimStart().toUpperCase();
-			if (upper.startsWith("DROP SCHEMA") || upper.startsWith("CREATE SCHEMA")) continue;
+	async executeStatementsLenient(statements, provider) {
+		if (statements.length > 0) this.log.debug(`Executing ${statements.length} statements (lenient) ...`, { statements });
+		for (const statement of statements) try {
 			await provider.execute(sql$1.raw(statement));
+		} catch (error) {
+			if ((error?.message ?? "").includes("already exists")) {
+				this.log.debug(`Skipped (already exists): ${statement.slice(0, 80)}`);
+				continue;
+			}
+			throw error;
 		}
 	}
 	async createSchemaIfNotExists(provider, schemaName) {
@@ -265,30 +258,6 @@ var DrizzleKitProvider = class {
 		} });
 	}
 	/**
-	* Suppress Drizzle Kit's spinner output during a callback.
-	*
-	* Drizzle Kit uses hanji's renderWithTask with a setInterval-based spinner.
-	* If the wrapped task throws, the interval is never cleared and leaks
-	* spinner frames to stdout. We keep the filter active until the next
-	* tick after the promise settles to catch any straggling writes.
-	*/
-	async muteSpinner(fn) {
-		const originalWrite = process.stdout.write;
-		const filter = (chunk, ...args) => {
-			const str = typeof chunk === "string" ? chunk : chunk?.toString?.() ?? "";
-			if (str.includes("Pulling schema from database")) return true;
-			if (str.includes("\x1B[1A")) return true;
-			return originalWrite.call(process.stdout, chunk, ...args);
-		};
-		process.stdout.write = filter;
-		try {
-			return await fn();
-		} finally {
-			await new Promise((r) => setTimeout(r, 200));
-			process.stdout.write = originalWrite;
-		}
-	}
-	/**
 	* Try to load the official Drizzle Kit API.
 	*/
 	importDrizzleKit() {