drizzle-kit 1.0.0-beta.21 → 1.0.0-beta.22-1b8fcb2

package/api-mysql.js

@@ -6,7 +6,7 @@ const startStudioServer = async (imports, credentials, options) => {
 	const { is } = require("drizzle-orm");
 	const { MySqlTable, getTableConfig } = require("drizzle-orm/mysql-core");
 	const { Relations } = require("drizzle-orm/_relations");
-	const { drizzleForMySQL, prepareServer } = await Promise.resolve().then(() => require("./studio-BRMcKTKQ.js"));
+	const { drizzleForMySQL, prepareServer } = await Promise.resolve().then(() => require("./studio-6WVuyNxo.js"));
 	const mysqlSchema = {};
 	const relations = {};
 	Object.entries(imports).forEach(([k, t]) => {

package/api-mysql.mjs

@@ -213394,7 +213394,7 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
 			const { driver } = credentials;
 			if (driver === "d1-http") {
 				const { drizzle } = await import("drizzle-orm/sqlite-proxy");
-				const { migrate } = await import("drizzle-orm/sqlite-proxy/migrator");
+				const { migrateInternal } = await import("drizzle-orm/sqlite-proxy/migrator.internal");
 				const remoteCallback = async (sql, params, method) => {
 					const data = await (await fetch$1(`https://api.cloudflare.com/client/v4/accounts/${credentials.accountId}/d1/database/${credentials.databaseId}/${method === "values" ? "raw" : "query"}`, {
 						method: "POST",
@@ -213431,9 +213431,9 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
 				};
 				const drzl = drizzle(remoteCallback);
 				const migrateFn = async (config) => {
-					return migrate(drzl, async (queries) => {
+					return migrateInternal(drzl, async (queries) => {
 						for (const query of queries) await remoteCallback(query, [], "run");
-					}, config);
+					}, config, "run");
 				};
 				const query = async (sql, params) => {
 					return (await remoteCallback(sql, params || [], "all")).rows;

package/api-postgres.js

@@ -372,7 +372,7 @@ const generateDrizzleJson = async (imports, prevId, schemaFilters, casing) => {
 };
 const generateMigration = async (prev, cur) => {
 	const { resolver } = await Promise.resolve().then(() => require("./prompts-DfsG1lFx.js")).then((n) => n.prompts_exports);
-	const { ddlDiff } = await Promise.resolve().then(() => require("./diff-BQc-7Nm8.js")).then((n) => n.diff_exports);
+	const { ddlDiff } = await Promise.resolve().then(() => require("./diff-BHBkEJHk.js")).then((n) => n.diff_exports);
 	const from = require_ddl.createDDL();
 	const to = require_ddl.createDDL();
 	for (const it of prev.ddl) from.entities.push(it);
@@ -385,9 +385,9 @@ const pushSchema = async (imports, drizzleInstance, casing, entitiesConfig, migr
 	const { resolver } = await Promise.resolve().then(() => require("./prompts-DfsG1lFx.js")).then((n) => n.prompts_exports);
 	const { fromDatabaseForDrizzle } = await Promise.resolve().then(() => require("./introspect-Dl3YI0in.js"));
 	const { fromDrizzleSchema, fromExports } = await Promise.resolve().then(() => require("./drizzle-DX4zjwm_.js")).then((n) => n.drizzle_exports);
-	const { suggestions } = await Promise.resolve().then(() => require("./push-postgres-DzAXAQgJ.js"));
+	const { suggestions } = await Promise.resolve().then(() => require("./push-postgres-BJDZb4tT.js"));
 	const { extractPostgresExisting } = await Promise.resolve().then(() => require("./drizzle-Bj7v9CEh.js")).then((n) => n.drizzle_exports);
-	const { ddlDiff } = await Promise.resolve().then(() => require("./diff-BQc-7Nm8.js")).then((n) => n.diff_exports);
+	const { ddlDiff } = await Promise.resolve().then(() => require("./diff-BHBkEJHk.js")).then((n) => n.diff_exports);
 	const { sql } = require("drizzle-orm");
 	const migrations = {
 		schema: migrationsConfig?.schema || "drizzle",
@@ -423,7 +423,7 @@ const startStudioServer = async (imports, credentials, options) => {
 	const { is } = require("drizzle-orm");
 	const { PgTable, getTableConfig } = require("drizzle-orm/pg-core");
 	const { Relations } = require("drizzle-orm/_relations");
-	const { drizzleForPostgres, prepareServer } = await Promise.resolve().then(() => require("./studio-BRMcKTKQ.js"));
+	const { drizzleForPostgres, prepareServer } = await Promise.resolve().then(() => require("./studio-6WVuyNxo.js"));
 	const pgSchema = {};
 	const relations = {};
 	Object.entries(imports).forEach(([k, t]) => {

package/api-postgres.mjs

@@ -10,7 +10,7 @@ import fs, { existsSync, lstatSync, mkdirSync, readdirSync, writeFileSync } from
 import m from "node:path";
 import re, { promises } from "node:fs";
 import Be from "os";
-import Ie, { dirname, join, resolve } from "path";
+import path, { dirname, join, resolve } from "path";
 import { parse, pathToFileURL } from "url";
 import { fileURLToPath, format } from "node:url";
 import { deprecate, promisify, types } from "node:util";
@@ -1825,7 +1825,7 @@ function Et(e) {
 	throw new RangeError(`invalid RFC 9557 time-only string ${e}; may need a T prefix`);
 }
 function It(e) {
-	const t = Ie$1.exec(e);
+	const t = Ie.exec(e);
 	let n, r, o, i;
 	if (t) {
 		o = Tt(t[3]);
@@ -4252,7 +4252,7 @@ function zi(e, t) {
 function Ai(e, t) {
 	return vt(e, wt), Hi(e).time[t];
 }
-var import_jsbi_cjs, t$4, n$3, r$4, o$3, i$5, a$4, s$5, c$3, d$4, h$6, u$4, l$3, w$4, v$4, b$3, D$1, T$1, M, E$3, I$3, C$2, O$2, $, Y$1, R$1, S$1, j$3, k$3, N$1, x$4, L, P$2, U, B$1, Z$2, F$2, H$2, z$1, A$3, q$4, W, _$1, J$2, G$2, K$1, V, X$1, Q$1, ee$1, te$1, ie$1, TimeDuration, me$1, fe$1, ye$1, pe$1, ge$1, we$1, ve$1, be$1, De$1, Te$1, Me$1, Ee, Ie$1, Ce$1, Oe$1, $e$1, Ye$1, Re$1, Se$1, je$1, ke$1, Ne$1, xe, Le$1, Pe$1, Ue$1, Be$1, Ze$1, Fe$1, He$1, ze$1, Qe$1, et, tt, nt, rt, ot, it, at, st, ct, dt, Ot, $t, qt, cr, dr, Po, Wo, _o, Xo, OneObjectCache, HelperBase, HebrewHelper, IslamicBaseHelper, IslamicHelper, IslamicUmalquraHelper, IslamicTblaHelper, IslamicCivilHelper, IslamicRgsaHelper, IslamicCcHelper, PersianHelper, IndianHelper, GregorianBaseHelperFixedEpoch, GregorianBaseHelper, SameMonthDayAsGregorianBaseHelper, ii, OrthodoxBaseHelperFixedEpoch, OrthodoxBaseHelper, EthioaaHelper, CopticHelper, EthiopicHelper, RocHelper, BuddhistHelper, GregoryHelper, JapaneseHelper, ChineseBaseHelper, ChineseHelper, DangiHelper, NonIsoCalendar, ai, DateTimeFormatImpl, di, Ri, Si, Instant, PlainDate, PlainDateTime, Duration, PlainMonthDay, Bi, PlainTime, PlainYearMonth, Fi, ZonedDateTime, qi, _i;
+var import_jsbi_cjs, t$4, n$3, r$4, o$3, i$5, a$4, s$5, c$3, d$4, h$6, u$4, l$3, w$4, v$4, b$3, D$1, T$1, M, E$3, I$3, C$2, O$2, $, Y$1, R$1, S$1, j$3, k$3, N$1, x$4, L, P$2, U, B$1, Z$2, F$2, H$2, z$1, A$3, q$4, W, _$1, J$2, G$2, K$1, V, X$1, Q$1, ee$1, te$1, ie$1, TimeDuration, me$1, fe$1, ye$1, pe$1, ge$1, we$1, ve$1, be$1, De$1, Te$1, Me$1, Ee, Ie, Ce$1, Oe$1, $e$1, Ye$1, Re$1, Se$1, je$1, ke$1, Ne$1, xe, Le$1, Pe$1, Ue$1, Be$1, Ze$1, Fe$1, He$1, ze$1, Qe$1, et, tt, nt, rt, ot, it, at, st, ct, dt, Ot, $t, qt, cr, dr, Po, Wo, _o, Xo, OneObjectCache, HelperBase, HebrewHelper, IslamicBaseHelper, IslamicHelper, IslamicUmalquraHelper, IslamicTblaHelper, IslamicCivilHelper, IslamicRgsaHelper, IslamicCcHelper, PersianHelper, IndianHelper, GregorianBaseHelperFixedEpoch, GregorianBaseHelper, SameMonthDayAsGregorianBaseHelper, ii, OrthodoxBaseHelperFixedEpoch, OrthodoxBaseHelper, EthioaaHelper, CopticHelper, EthiopicHelper, RocHelper, BuddhistHelper, GregoryHelper, JapaneseHelper, ChineseBaseHelper, ChineseHelper, DangiHelper, NonIsoCalendar, ai, DateTimeFormatImpl, di, Ri, Si, Instant, PlainDate, PlainDateTime, Duration, PlainMonthDay, Bi, PlainTime, PlainYearMonth, Fi, ZonedDateTime, qi, _i;
 var init_index_esm = __esmMin((() => {
 	import_jsbi_cjs = /* @__PURE__ */ __toESM(require_jsbi_cjs(), 1);
 	t$4 = import_jsbi_cjs.default.BigInt(0), n$3 = import_jsbi_cjs.default.BigInt(1), r$4 = import_jsbi_cjs.default.BigInt(2), o$3 = import_jsbi_cjs.default.BigInt(10), i$5 = import_jsbi_cjs.default.BigInt(24), a$4 = import_jsbi_cjs.default.BigInt(60), s$5 = import_jsbi_cjs.default.BigInt(1e3), c$3 = import_jsbi_cjs.default.BigInt(1e6), d$4 = import_jsbi_cjs.default.BigInt(1e9), h$6 = import_jsbi_cjs.default.multiply(import_jsbi_cjs.default.BigInt(3600), d$4), u$4 = import_jsbi_cjs.default.multiply(a$4, d$4), l$3 = import_jsbi_cjs.default.multiply(h$6, i$5);
@@ -4339,7 +4339,7 @@ var init_index_esm = __esmMin((() => {
 		`(?:${De$1.source})?`,
 		`(?:\\[!?${fe$1.source}\\])?`,
 		`((?:${Te$1.source})*)$`
-	].join("")), Ie$1 = new RegExp(`^(${ye$1.source})-?(${pe$1.source})(?:\\[!?${fe$1.source}\\])?((?:${Te$1.source})*)$`), Ce$1 = new RegExp(`^(?:--)?(${pe$1.source})-?(${ge$1.source})(?:\\[!?${fe$1.source}\\])?((?:${Te$1.source})*)$`), Oe$1 = /(\d+)(?:[.,](\d{1,9}))?/, $e$1 = new RegExp(`(?:${Oe$1.source}H)?(?:${Oe$1.source}M)?(?:${Oe$1.source}S)?`), Ye$1 = new RegExp(`^([+-])?P${/(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)W)?(?:(\d+)D)?/.source}(?:T(?!$)${$e$1.source})?$`, "i"), Re$1 = 864e5, Se$1 = 1e6 * Re$1, je$1 = 6e10, ke$1 = 1e8 * Re$1, Ne$1 = xo(ke$1), xe = import_jsbi_cjs.default.unaryMinus(Ne$1), Le$1 = import_jsbi_cjs.default.add(import_jsbi_cjs.default.subtract(xe, l$3), n$3), Pe$1 = import_jsbi_cjs.default.subtract(import_jsbi_cjs.default.add(Ne$1, l$3), n$3), Ue$1 = 146097 * Re$1, Be$1 = -271821, Ze$1 = 275760, Fe$1 = Date.UTC(1847, 0, 1), He$1 = [
+	].join("")), Ie = new RegExp(`^(${ye$1.source})-?(${pe$1.source})(?:\\[!?${fe$1.source}\\])?((?:${Te$1.source})*)$`), Ce$1 = new RegExp(`^(?:--)?(${pe$1.source})-?(${ge$1.source})(?:\\[!?${fe$1.source}\\])?((?:${Te$1.source})*)$`), Oe$1 = /(\d+)(?:[.,](\d{1,9}))?/, $e$1 = new RegExp(`(?:${Oe$1.source}H)?(?:${Oe$1.source}M)?(?:${Oe$1.source}S)?`), Ye$1 = new RegExp(`^([+-])?P${/(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)W)?(?:(\d+)D)?/.source}(?:T(?!$)${$e$1.source})?$`, "i"), Re$1 = 864e5, Se$1 = 1e6 * Re$1, je$1 = 6e10, ke$1 = 1e8 * Re$1, Ne$1 = xo(ke$1), xe = import_jsbi_cjs.default.unaryMinus(Ne$1), Le$1 = import_jsbi_cjs.default.add(import_jsbi_cjs.default.subtract(xe, l$3), n$3), Pe$1 = import_jsbi_cjs.default.subtract(import_jsbi_cjs.default.add(Ne$1, l$3), n$3), Ue$1 = 146097 * Re$1, Be$1 = -271821, Ze$1 = 275760, Fe$1 = Date.UTC(1847, 0, 1), He$1 = [
 		"iso8601",
 		"hebrew",
 		"islamic",
@@ -17023,7 +17023,7 @@ var init_unescape = __esmMin((() => {
 }));
 //#endregion
 //#region ../node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/index.js
-var import_brace_expansion, minimatch, starDotExtRE, starDotExtTest, starDotExtTestDot, starDotExtTestNocase, starDotExtTestNocaseDot, starDotStarRE, starDotStarTest, starDotStarTestDot, dotStarRE, dotStarTest, starRE, starTest, starTestDot, qmarksRE, qmarksTestNocase, qmarksTestNocaseDot, qmarksTestDot, qmarksTest, qmarksTestNoExt, qmarksTestNoExtDot, defaultPlatform, path$6, sep, GLOBSTAR, plTypes, qmark, star, twoStarDot, twoStarNoDot, charSet, reSpecials, addPatternStartSet, filter, ext, defaults$2, braceExpand, MAX_PATTERN_LENGTH, assertValidPattern, makeRe, match$1, globUnescape, globMagic, regExpEscape, Minimatch;
+var import_brace_expansion, minimatch, starDotExtRE, starDotExtTest, starDotExtTestDot, starDotExtTestNocase, starDotExtTestNocaseDot, starDotStarRE, starDotStarTest, starDotStarTestDot, dotStarRE, dotStarTest, starRE, starTest, starTestDot, qmarksRE, qmarksTestNocase, qmarksTestNocaseDot, qmarksTestDot, qmarksTest, qmarksTestNoExt, qmarksTestNoExtDot, defaultPlatform, path$7, sep, GLOBSTAR, plTypes, qmark, star, twoStarDot, twoStarNoDot, charSet, reSpecials, addPatternStartSet, filter, ext, defaults$2, braceExpand, MAX_PATTERN_LENGTH, assertValidPattern, makeRe, match$1, globUnescape, globMagic, regExpEscape, Minimatch;
 var init_mjs = __esmMin((() => {
 	import_brace_expansion = /* @__PURE__ */ __toESM(require_brace_expansion(), 1);
 	init_brace_expressions();
@@ -17083,11 +17083,11 @@ var init_mjs = __esmMin((() => {
 		return (f) => f.length === len && f !== "." && f !== "..";
 	};
 	defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix";
-	path$6 = {
+	path$7 = {
 		win32: { sep: "\\" },
 		posix: { sep: "/" }
 	};
-	sep = defaultPlatform === "win32" ? path$6.win32.sep : path$6.posix.sep;
+	sep = defaultPlatform === "win32" ? path$7.win32.sep : path$7.posix.sep;
 	minimatch.sep = sep;
 	GLOBSTAR = Symbol("globstar **");
 	minimatch.GLOBSTAR = GLOBSTAR;
@@ -24054,8 +24054,15 @@ const users = mysqlTable('users', {
 			}, 128);
 			this.on("detach", () => clearInterval(this.timeout));
 		}
-		render(status) {
-			if (status === "pending" || status === "rejected") return `[${this.spinner.value()}] applying migrations...`;
+		render(status, error) {
+			if (status === "rejected") {
+				if (error?.cause) {
+					console.log("\n");
+					console.log(error.cause);
+				}
+				return `[${chalk.red("✗")}] Error during migration:\n${chalk.red(error ? error.message : "unknown error occured")}\n`;
+			}
+			if (status === "pending") return `[${this.spinner.value()}] applying migrations...`;
 			return `[${chalk.green("✓")}] migrations applied successfully!`;
 		}
 	};
@@ -24077,8 +24084,15 @@ const users = mysqlTable('users', {
 			}, 128);
 			this.on("detach", () => clearInterval(this.timeout));
 		}
-		render(status) {
-			if (status === "pending" || status === "rejected") return `[${this.spinner.value()}] ${this.progressText}\n`;
+		render(status, error) {
+			if (status === "rejected") {
+				if (error?.cause) {
+					console.log("\n");
+					console.log(error.cause);
+				}
+				return `[${chalk.red("✗")}] ${this.progressText}\n${chalk.red(error ? error.message : "unknown error occured")}\n`;
+			}
+			if (status === "pending") return `[${this.spinner.value()}] ${this.progressText}\n`;
 			return `[${chalk.green("✓")}] ${this.successText}\n`;
 		}
 	};
@@ -25501,7 +25515,7 @@ var init_dist$3 = __esmMin((() => {
 		}
 		return t;
 	}, "invertCase"), le = /* @__PURE__ */ new Map(), _e$3 = X((e, t) => {
-		const s = Ie.join(e, `.is-fs-case-sensitive-test-${process.pid}`);
+		const s = path.join(e, `.is-fs-case-sensitive-test-${process.pid}`);
 		try {
 			return t.writeFileSync(s, ""), !t.existsSync(Ae(s));
 		} finally {
@@ -26346,7 +26360,7 @@ var require_common$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 		return Object.prototype.hasOwnProperty.call(obj, field);
 	}
 	var fs$5 = __require("fs");
-	var path$5 = __require("path");
+	var path$6 = __require("path");
 	var minimatch = require_minimatch();
 	var isAbsolute$2 = __require("path").isAbsolute;
 	var Minimatch = minimatch.Minimatch;
@@ -26400,13 +26414,13 @@ var require_common$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 		setupIgnores(self, options);
 		self.changedCwd = false;
 		var cwd = process.cwd();
-		if (!ownProp(options, "cwd")) self.cwd = path$5.resolve(cwd);
+		if (!ownProp(options, "cwd")) self.cwd = path$6.resolve(cwd);
 		else {
-			self.cwd = path$5.resolve(options.cwd);
+			self.cwd = path$6.resolve(options.cwd);
 			self.changedCwd = self.cwd !== cwd;
 		}
-		self.root = options.root || path$5.resolve(self.cwd, "/");
-		self.root = path$5.resolve(self.root);
+		self.root = options.root || path$6.resolve(self.cwd, "/");
+		self.root = path$6.resolve(self.root);
 		self.cwdAbs = isAbsolute$2(self.cwd) ? self.cwd : makeAbs(self, self.cwd);
 		self.nomount = !!options.nomount;
 		if (process.platform === "win32") {
@@ -26473,10 +26487,10 @@ var require_common$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 	function makeAbs(self, f) {
 		var abs = f;
-		if (f.charAt(0) === "/") abs = path$5.join(self.root, f);
+		if (f.charAt(0) === "/") abs = path$6.join(self.root, f);
 		else if (isAbsolute$2(f) || f === "") abs = f;
-		else if (self.changedCwd) abs = path$5.resolve(self.cwd, f);
-		else abs = path$5.resolve(f);
+		else if (self.changedCwd) abs = path$6.resolve(self.cwd, f);
+		else abs = path$6.resolve(f);
 		if (process.platform === "win32") abs = abs.replace(/\\/g, "/");
 		return abs;
 	}
@@ -26503,7 +26517,7 @@ var require_sync = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	minimatch.Minimatch;
 	require_glob().Glob;
 	__require("util");
-	var path$4 = __require("path");
+	var path$5 = __require("path");
 	var assert$1 = __require("assert");
 	var isAbsolute$1 = __require("path").isAbsolute;
 	var common = require_common$1();
@@ -26599,7 +26613,7 @@ var require_sync = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				var e = matchedEntries[i];
 				if (prefix) if (prefix.slice(-1) !== "/") e = prefix + "/" + e;
 				else e = prefix + e;
-				if (e.charAt(0) === "/" && !this.nomount) e = path$4.join(this.root, e);
+				if (e.charAt(0) === "/" && !this.nomount) e = path$5.join(this.root, e);
 				this._emitMatch(index, e);
 			}
 			return;
@@ -26714,9 +26728,9 @@ var require_sync = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		if (!exists) return;
 		if (prefix && isAbsolute$1(prefix) && !this.nomount) {
 			var trail = /[\/\\]$/.test(prefix);
-			if (prefix.charAt(0) === "/") prefix = path$4.join(this.root, prefix);
+			if (prefix.charAt(0) === "/") prefix = path$5.join(this.root, prefix);
 			else {
-				prefix = path$4.resolve(this.root, prefix);
+				prefix = path$5.resolve(this.root, prefix);
 				if (trail) prefix += "/";
 			}
 		}
@@ -26877,7 +26891,7 @@ var require_glob = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	minimatch.Minimatch;
 	var inherits = require_inherits();
 	var EE$3 = __require("events").EventEmitter;
-	var path$3 = __require("path");
+	var path$4 = __require("path");
 	var assert = __require("assert");
 	var isAbsolute = __require("path").isAbsolute;
 	var globSync = require_sync();
@@ -27108,7 +27122,7 @@ var require_glob = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				var e = matchedEntries[i];
 				if (prefix) if (prefix !== "/") e = prefix + "/" + e;
 				else e = prefix + e;
-				if (e.charAt(0) === "/" && !this.nomount) e = path$3.join(this.root, e);
+				if (e.charAt(0) === "/" && !this.nomount) e = path$4.join(this.root, e);
 				this._emitMatch(index, e);
 			}
 			return cb();
@@ -27255,9 +27269,9 @@ var require_glob = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		if (!exists) return cb();
 		if (prefix && isAbsolute(prefix) && !this.nomount) {
 			var trail = /[\/\\]$/.test(prefix);
-			if (prefix.charAt(0) === "/") prefix = path$3.join(this.root, prefix);
+			if (prefix.charAt(0) === "/") prefix = path$4.join(this.root, prefix);
 			else {
-				prefix = path$3.resolve(this.root, prefix);
+				prefix = path$4.resolve(this.root, prefix);
 				if (trail) prefix += "/";
 			}
 		}
@@ -76208,7 +76222,7 @@ var init_convertor = __esmMin((() => {
 	alterUniqueConvertor = convertor("alter_unique", (st) => {
 		const statements = [];
 		statements.push(dropUniqueConvertor.convert({ unique: st.diff.$left }));
-		statements.push(addUniqueConvertor.convert({ unique: st.diff.$left }));
+		statements.push(addUniqueConvertor.convert({ unique: st.diff.$right }));
 		return statements;
 	});
 	createEnumConvertor = convertor("create_enum", (st) => {
@@ -83638,7 +83652,7 @@ var require_constants$5 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#region ../node_modules/.pnpm/node-gyp-build@4.8.4/node_modules/node-gyp-build/node-gyp-build.js
 var require_node_gyp_build$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var fs$4 = __require("fs");
-	var path$2 = __require("path");
+	var path$3 = __require("path");
 	var os$3 = __require("os");
 	var runtimeRequire = typeof __webpack_require__ === "function" ? __non_webpack_require__ : __require;
 	var vars = process.config && process.config.variables || {};
@@ -83655,20 +83669,20 @@ var require_node_gyp_build$1 = /* @__PURE__ */ __commonJSMin(((exports, module)
 		return runtimeRequire(load.resolve(dir));
 	}
 	load.resolve = load.path = function(dir) {
-		dir = path$2.resolve(dir || ".");
+		dir = path$3.resolve(dir || ".");
 		try {
-			var name = runtimeRequire(path$2.join(dir, "package.json")).name.toUpperCase().replace(/-/g, "_");
+			var name = runtimeRequire(path$3.join(dir, "package.json")).name.toUpperCase().replace(/-/g, "_");
 			if (process.env[name + "_PREBUILD"]) dir = process.env[name + "_PREBUILD"];
 		} catch (err) {}
 		if (!prebuildsOnly) {
-			var release = getFirst(path$2.join(dir, "build/Release"), matchBuild);
+			var release = getFirst(path$3.join(dir, "build/Release"), matchBuild);
 			if (release) return release;
-			var debug = getFirst(path$2.join(dir, "build/Debug"), matchBuild);
+			var debug = getFirst(path$3.join(dir, "build/Debug"), matchBuild);
 			if (debug) return debug;
 		}
 		var prebuild = resolve(dir);
 		if (prebuild) return prebuild;
-		var nearby = resolve(path$2.dirname(process.execPath));
+		var nearby = resolve(path$3.dirname(process.execPath));
 		if (nearby) return nearby;
 		var target = [
 			"platform=" + platform,
@@ -83684,11 +83698,11 @@ var require_node_gyp_build$1 = /* @__PURE__ */ __commonJSMin(((exports, module)
 		].filter(Boolean).join(" ");
 		throw new Error("No native build was found for " + target + "\n    loaded from: " + dir + "\n");
 		function resolve(dir) {
-			var tuple = readdirSync(path$2.join(dir, "prebuilds")).map(parseTuple).filter(matchTuple(platform, arch)).sort(compareTuples)[0];
+			var tuple = readdirSync(path$3.join(dir, "prebuilds")).map(parseTuple).filter(matchTuple(platform, arch)).sort(compareTuples)[0];
 			if (!tuple) return;
-			var prebuilds = path$2.join(dir, "prebuilds", tuple.name);
+			var prebuilds = path$3.join(dir, "prebuilds", tuple.name);
 			var winner = readdirSync(prebuilds).map(parseTags).filter(matchTags(runtime, abi)).sort(compareTags(runtime))[0];
-			if (winner) return path$2.join(prebuilds, winner.file);
+			if (winner) return path$3.join(prebuilds, winner.file);
 		}
 	};
 	function readdirSync(dir) {
@@ -83700,7 +83714,7 @@ var require_node_gyp_build$1 = /* @__PURE__ */ __commonJSMin(((exports, module)
 	}
 	function getFirst(dir, filter) {
 		var files = readdirSync(dir).filter(filter);
-		return files[0] && path$2.join(dir, files[0]);
+		return files[0] && path$3.join(dir, files[0]);
 	}
 	function matchBuild(name) {
 		return /\.node$/.test(name);
@@ -100008,7 +100022,7 @@ var require_dist_cjs$22 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	var getHomeDir = require_getHomeDir();
 	var getSSOTokenFilepath = require_getSSOTokenFilepath();
 	var getSSOTokenFromFile = require_getSSOTokenFromFile();
-	var path$1 = __require("path");
+	var path$2 = __require("path");
 	var types = require_dist_cjs$53();
 	var readFile = require_readFile();
 	const ENV_PROFILE = "AWS_PROFILE";
@@ -100026,9 +100040,9 @@ var require_dist_cjs$22 = /* @__PURE__ */ __commonJSMin(((exports) => {
 		return acc;
 	}, { ...data.default && { default: data.default } });
 	const ENV_CONFIG_PATH = "AWS_CONFIG_FILE";
-	const getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || path$1.join(getHomeDir.getHomeDir(), ".aws", "config");
+	const getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || path$2.join(getHomeDir.getHomeDir(), ".aws", "config");
 	const ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE";
-	const getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || path$1.join(getHomeDir.getHomeDir(), ".aws", "credentials");
+	const getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || path$2.join(getHomeDir.getHomeDir(), ".aws", "credentials");
 	const prefixKeyRegex = /^([\w-]+)\s(["'])?([\w-@\+\.%:/]+)\2$/;
 	const profileNameBlockList = ["__proto__", "profile __proto__"];
 	const parseIni = (iniData) => {
@@ -100069,9 +100083,9 @@ var require_dist_cjs$22 = /* @__PURE__ */ __commonJSMin(((exports) => {
 		const homeDir = getHomeDir.getHomeDir();
 		const relativeHomeDirPrefix = "~/";
 		let resolvedFilepath = filepath;
-		if (filepath.startsWith(relativeHomeDirPrefix)) resolvedFilepath = path$1.join(homeDir, filepath.slice(2));
+		if (filepath.startsWith(relativeHomeDirPrefix)) resolvedFilepath = path$2.join(homeDir, filepath.slice(2));
 		let resolvedConfigFilepath = configFilepath;
-		if (configFilepath.startsWith(relativeHomeDirPrefix)) resolvedConfigFilepath = path$1.join(homeDir, configFilepath.slice(2));
+		if (configFilepath.startsWith(relativeHomeDirPrefix)) resolvedConfigFilepath = path$2.join(homeDir, configFilepath.slice(2));
 		const parsedFiles = await Promise.all([readFile.readFile(resolvedConfigFilepath, { ignoreCache: init.ignoreCache }).then(parseIni).then(getConfigData).catch(swallowError$1), readFile.readFile(resolvedFilepath, { ignoreCache: init.ignoreCache }).then(parseIni).catch(swallowError$1)]);
 		return {
 			configFile: parsedFiles[0],
@@ -161367,7 +161381,7 @@ var require_msal_node = /* @__PURE__ */ __commonJSMin(((exports) => {
 	var msalCommon = require_lib$1();
 	var jwt = require_jsonwebtoken();
 	var fs$2 = __require("fs");
-	var path = __require("path");
+	var path$1 = __require("path");
 	/**
 	* This class serializes cache entities to be saved into in-memory object types defined internally
 	* @internal
@@ -170750,7 +170764,7 @@ Content-Length: ${body.length}\r\n\r\n${body}`;
 				const secretFilePath = wwwAuthHeader.split("Basic realm=")[1];
 				if (!SUPPORTED_AZURE_ARC_PLATFORMS.hasOwnProperty(process.platform)) throw createManagedIdentityError(platformNotSupported);
 				const expectedSecretFilePath = SUPPORTED_AZURE_ARC_PLATFORMS[process.platform];
-				const fileName = path.basename(secretFilePath);
+				const fileName = path$1.basename(secretFilePath);
 				if (!fileName.endsWith(".key")) throw createManagedIdentityError(invalidFileExtension);
 				if (expectedSecretFilePath + fileName !== secretFilePath) throw createManagedIdentityError(invalidFilePath);
 				let secretFileSize;
@@ -219353,7 +219367,7 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
 			const { driver } = credentials;
 			if (driver === "d1-http") {
 				const { drizzle } = await import("drizzle-orm/sqlite-proxy");
-				const { migrate } = await import("drizzle-orm/sqlite-proxy/migrator");
+				const { migrateInternal } = await import("drizzle-orm/sqlite-proxy/migrator.internal");
 				const remoteCallback = async (sql, params, method) => {
 					const data = await (await fetch$1(`https://api.cloudflare.com/client/v4/accounts/${credentials.accountId}/d1/database/${credentials.databaseId}/${method === "values" ? "raw" : "query"}`, {
 						method: "POST",
@@ -219390,9 +219404,9 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
 				};
 				const drzl = drizzle(remoteCallback);
 				const migrateFn = async (config) => {
-					return migrate(drzl, async (queries) => {
+					return migrateInternal(drzl, async (queries) => {
 						for (const query of queries) await remoteCallback(query, [], "run");
-					}, config);
+					}, config, "run");
 				};
 				const query = async (sql, params) => {
 					return (await remoteCallback(sql, params || [], "all")).rows;
@@ -221668,13 +221682,13 @@ var init_generate_common = __esmMin((() => {
 			const js = embeddedMigrations([...snapshots || [], join(outFolder, `${tag}/snapshot.json`)], driver);
 			fs.writeFileSync(`${outFolder}/migrations.js`, js);
 		}
-		(0, import_hanji$2.render)(`[${chalk.green("✓")}] Your SQL migration ➜ ${chalk.bold.underline.blue(Ie.join(`${outFolder}/${tag}/migration.sql`))} 🚀`);
+		(0, import_hanji$2.render)(`[${chalk.green("✓")}] Your SQL migration ➜ ${chalk.bold.underline.blue(path.join(`${outFolder}/${tag}/migration.sql`))} 🚀`);
 	};
 	embeddedMigrations = (snapshots, driver) => {
 		let content = driver === "expo" ? "// This file is required for Expo/React Native SQLite migrations - https://orm.drizzle.team/quick-sqlite/expo\n\n" : "";
 		const migrations = {};
 		snapshots.forEach((entry, idx) => {
-			const prefix = entry.split("/")[entry.split("/").length - 2];
+			const prefix = entry.split(path.sep)[entry.split(path.sep).length - 2];
 			const importName = idx.toString().padStart(4, "0");
 			content += `import m${importName} from './${prefix}/migration.sql';\n`;
 			migrations[prefix] = importName;
@@ -222129,7 +222143,7 @@ var init_pull_common = __esmMin((() => {
 	};
 	relationsToTypeScript = (schema, casing, schemaPath) => {
 		const imports = [];
-		const tableRelations = {};
+		const tableRelations = Object.create(null);
 		schema.forEach((table) => {
 			const fks = Object.values(table.foreignKeys);
 			const tableColumns = table.columns?.map((it) => withCasing(it.name, casing)) ?? [];

package/api-sqlite.js

@@ -6,7 +6,7 @@ const startStudioServer = async (imports, credentials, options) => {
 	const { is } = require("drizzle-orm");
 	const { SQLiteTable } = require("drizzle-orm/sqlite-core");
 	const { Relations } = require("drizzle-orm/_relations");
-	const { drizzleForSQLite, prepareServer } = await Promise.resolve().then(() => require("./studio-BRMcKTKQ.js"));
+	const { drizzleForSQLite, prepareServer } = await Promise.resolve().then(() => require("./studio-6WVuyNxo.js"));
 	const sqliteSchema = {};
 	const relations = {};
 	Object.entries(imports).forEach(([k, t]) => {

package/api-sqlite.mjs

@@ -213394,7 +213394,7 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
 			const { driver } = credentials;
 			if (driver === "d1-http") {
 				const { drizzle } = await import("drizzle-orm/sqlite-proxy");
-				const { migrate } = await import("drizzle-orm/sqlite-proxy/migrator");
+				const { migrateInternal } = await import("drizzle-orm/sqlite-proxy/migrator.internal");
 				const remoteCallback = async (sql, params, method) => {
 					const data = await (await fetch$1(`https://api.cloudflare.com/client/v4/accounts/${credentials.accountId}/d1/database/${credentials.databaseId}/${method === "values" ? "raw" : "query"}`, {
 						method: "POST",
@@ -213431,9 +213431,9 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
 				};
 				const drzl = drizzle(remoteCallback);
 				const migrateFn = async (config) => {
-					return migrate(drzl, async (queries) => {
+					return migrateInternal(drzl, async (queries) => {
 						for (const query of queries) await remoteCallback(query, [], "run");
-					}, config);
+					}, config, "run");
 				};
 				const query = async (sql, params) => {
 					return (await remoteCallback(sql, params || [], "all")).rows;

package/bin.cjs

@@ -29396,8 +29396,15 @@ const users = mysqlTable('users', {
 			}, 128);
 			this.on("detach", () => clearInterval(this.timeout));
 		}
-		render(status) {
-			if (status === "pending" || status === "rejected") return `[${this.spinner.value()}] applying migrations...`;
+		render(status, error) {
+			if (status === "rejected") {
+				if (error?.cause) {
+					console.log("\n");
+					console.log(error.cause);
+				}
+				return `[${chalk.red("✗")}] Error during migration:\n${chalk.red(error ? error.message : "unknown error occured")}\n`;
+			}
+			if (status === "pending") return `[${this.spinner.value()}] applying migrations...`;
 			return `[${chalk.green("✓")}] migrations applied successfully!`;
 		}
 	};
@@ -29414,8 +29421,15 @@ const users = mysqlTable('users', {
 			}, 128);
 			this.on("detach", () => clearInterval(this.timeout));
 		}
-		render(status) {
-			if (status === "pending" || status === "rejected") return `[${this.spinner.value()}] ${this.progressText}\n`;
+		render(status, error) {
+			if (status === "rejected") {
+				if (error?.cause) {
+					console.log("\n");
+					console.log(error.cause);
+				}
+				return `[${chalk.red("✗")}] ${this.progressText}\n${chalk.red(error ? error.message : "unknown error occured")}\n`;
+			}
+			if (status === "pending") return `[${this.spinner.value()}] ${this.progressText}\n`;
 			return `[${chalk.green("✓")}] ${this.successText}\n`;
 		}
 	};
@@ -80523,7 +80537,7 @@ var init_convertor$4 = __esmMin((() => {
 	alterUniqueConvertor = convertor$4("alter_unique", (st) => {
 		const statements = [];
 		statements.push(dropUniqueConvertor.convert({ unique: st.diff.$left }));
-		statements.push(addUniqueConvertor.convert({ unique: st.diff.$left }));
+		statements.push(addUniqueConvertor.convert({ unique: st.diff.$right }));
 		return statements;
 	});
 	createEnumConvertor$1 = convertor$4("create_enum", (st) => {
@@ -85613,7 +85627,7 @@ var init_generate_common = __esmMin((() => {
 		let content = driver === "expo" ? "// This file is required for Expo/React Native SQLite migrations - https://orm.drizzle.team/quick-sqlite/expo\n\n" : "";
 		const migrations = {};
 		snapshots.forEach((entry, idx) => {
-			const prefix = entry.split("/")[entry.split("/").length - 2];
+			const prefix = entry.split(path.default.sep)[entry.split(path.default.sep).length - 2];
 			const importName = idx.toString().padStart(4, "0");
 			content += `import m${importName} from './${prefix}/migration.sql';\n`;
 			migrations[prefix] = importName;
@@ -92717,7 +92731,7 @@ var init_drizzle$1 = __esmMin((() => {
 					});
 					continue;
 				}
-				let where = index.config.where ? dialect.sqlToQuery(index.config.where).sql : "";
+				let where = index.config.where ? dialect.sqlToQuery(index.config.where, "indexes").sql : "";
 				where = where === "true" ? "" : where;
 				result.indexes.push({
 					entityType: "indexes",
@@ -234471,7 +234485,7 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
 			const { driver } = credentials;
 			if (driver === "d1-http") {
 				const { drizzle } = await import("drizzle-orm/sqlite-proxy");
-				const { migrate } = await import("drizzle-orm/sqlite-proxy/migrator");
+				const { migrateInternal } = await import("drizzle-orm/sqlite-proxy/migrator.internal");
 				const remoteCallback = async (sql, params, method) => {
 					const data = await (await fetch$1(`https://api.cloudflare.com/client/v4/accounts/${credentials.accountId}/d1/database/${credentials.databaseId}/${method === "values" ? "raw" : "query"}`, {
 						method: "POST",
@@ -234508,9 +234522,9 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
 				};
 				const drzl = drizzle(remoteCallback);
 				const migrateFn = async (config) => {
-					return migrate(drzl, async (queries) => {
+					return migrateInternal(drzl, async (queries) => {
 						for (const query of queries) await remoteCallback(query, [], "run");
-					}, config);
+					}, config, "run");
 				};
 				const query = async (sql, params) => {
 					return (await remoteCallback(sql, params || [], "all")).rows;
@@ -236352,12 +236366,15 @@ var init_introspect$4 = __esmMin((() => {
 			const algorithmMatch = createSqlStatement["Create View"].match(/ALGORITHM=([^ ]+)/);
 			const algorithm = algorithmMatch ? algorithmMatch[1].toLowerCase() : null;
 			const viewColumns = columns.filter((it) => it["TABLE_NAME"] === name);
-			for (const column of viewColumns) res.viewColumns.push({
-				view: name,
-				name: column["COLUMN_NAME"],
-				notNull: column["IS_NULLABLE"] === "NO",
-				type: column["DATA_TYPE"]
-			});
+			for (const column of viewColumns) {
+				const columnType = column["COLUMN_TYPE"].replace("decimal(10,0)", "decimal");
+				res.viewColumns.push({
+					view: name,
+					name: column["COLUMN_NAME"],
+					notNull: column["IS_NULLABLE"] === "NO",
+					type: columnType
+				});
+			}
 			res.views.push({
 				entityType: "views",
 				name,
@@ -237503,7 +237520,7 @@ var init_pull_common = __esmMin((() => {
 	};
 	relationsToTypeScript = (schema, casing, schemaPath) => {
 		const imports = [];
-		const tableRelations = {};
+		const tableRelations = Object.create(null);
 		schema.forEach((table) => {
 			const fks = Object.values(table.foreignKeys);
 			const tableColumns = table.columns?.map((it) => withCasing$3(it.name, casing)) ?? [];
@@ -245405,7 +245422,7 @@ init_views();
 const version = async () => {
 	const { npmVersion } = await ormCoreVersions();
 	const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-	const envVersion = "1.0.0-beta.21";
+	const envVersion = "1.0.0-beta.22";
 	const versions = `drizzle-kit: ${envVersion ? `v${envVersion}` : "--"}\n${ormVersion}`;
 	console.log(chalk.gray(versions), "\n");
 };

package/{connections-DRQjaCx9.js → connections-DF80m0CP.js}

@@ -7538,7 +7538,7 @@ const connectToSQLite = async (credentials) => {
 		const { driver } = credentials;
 		if (driver === "d1-http") {
 			const { drizzle } = await import("drizzle-orm/sqlite-proxy");
-			const { migrate } = await import("drizzle-orm/sqlite-proxy/migrator");
+			const { migrateInternal } = await import("drizzle-orm/sqlite-proxy/migrator.internal");
 			const remoteCallback = async (sql, params, method) => {
 				const data = await (await fetch(`https://api.cloudflare.com/client/v4/accounts/${credentials.accountId}/d1/database/${credentials.databaseId}/${method === "values" ? "raw" : "query"}`, {
 					method: "POST",
@@ -7575,9 +7575,9 @@ const connectToSQLite = async (credentials) => {
 			};
 			const drzl = drizzle(remoteCallback);
 			const migrateFn = async (config) => {
-				return migrate(drzl, async (queries) => {
+				return migrateInternal(drzl, async (queries) => {
 					for (const query of queries) await remoteCallback(query, [], "run");
-				}, config);
+				}, config, "run");
 			};
 			const query = async (sql, params) => {
 				return (await remoteCallback(sql, params || [], "all")).rows;

package/{diff-BQc-7Nm8.js → diff-BHBkEJHk.js}

@@ -544,7 +544,7 @@ const dropUniqueConvertor = convertor("drop_unique", (st) => {
 const alterUniqueConvertor = convertor("alter_unique", (st) => {
 	const statements = [];
 	statements.push(dropUniqueConvertor.convert({ unique: st.diff.$left }));
-	statements.push(addUniqueConvertor.convert({ unique: st.diff.$left }));
+	statements.push(addUniqueConvertor.convert({ unique: st.diff.$right }));
 	return statements;
 });
 const createEnumConvertor = convertor("create_enum", (st) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "1.0.0-beta.21",
+  "version": "1.0.0-beta.22-1b8fcb2",
   "homepage": "https://orm.drizzle.team",
   "keywords": [
     "drizzle",

package/{push-postgres-DzAXAQgJ.js → push-postgres-BJDZb4tT.js}

@@ -5,7 +5,7 @@ const require_views = require('./views-DkfVL_-7.js');
 require('./snapshot-CHMNRJxo.js');
 require('./brace-expansion-CQ04dhdS.js');
 require('./pull-utils-C1It_bwt.js');
-require('./diff-BQc-7Nm8.js');
+require('./diff-BHBkEJHk.js');
 require('./utils-node-DWTi1mTL.js');
 require('./prompts-DfsG1lFx.js');
 require('./drizzle-Bj7v9CEh.js');

package/{studio-BRMcKTKQ.js → studio-6WVuyNxo.js}

@@ -1966,7 +1966,7 @@ const getCustomDefaults = (schema, casing) => {
 	return customDefaults;
 };
 const drizzleForPostgres = async (credentials, pgSchema, relations, schemaFiles, casing) => {
-	const { preparePostgresDB } = await Promise.resolve().then(() => require("./connections-DRQjaCx9.js"));
+	const { preparePostgresDB } = await Promise.resolve().then(() => require("./connections-DF80m0CP.js"));
 	const db = await preparePostgresDB(credentials);
 	const customDefaults = getCustomDefaults(pgSchema, casing);
 	let dbUrl;
@@ -1993,7 +1993,7 @@ const drizzleForPostgres = async (credentials, pgSchema, relations, schemaFiles,
 	};
 };
 const drizzleForMySQL = async (credentials, mysqlSchema, relations, schemaFiles, casing) => {
-	const { connectToMySQL } = await Promise.resolve().then(() => require("./connections-DRQjaCx9.js"));
+	const { connectToMySQL } = await Promise.resolve().then(() => require("./connections-DF80m0CP.js"));
 	const { proxy, transactionProxy, benchmarkProxy, database, packageName } = await connectToMySQL(credentials);
 	const customDefaults = getCustomDefaults(mysqlSchema, casing);
 	let dbUrl;
@@ -2017,7 +2017,7 @@ const drizzleForMySQL = async (credentials, mysqlSchema, relations, schemaFiles,
 const drizzleForSQLite = async (credentials, sqliteSchema, relations, schemaFiles, casing) => {
 	const customDefaults = getCustomDefaults(sqliteSchema, casing);
 	if ("driver" in credentials && credentials.driver === "d1") {
-		const { connectToD1 } = await Promise.resolve().then(() => require("./connections-DRQjaCx9.js"));
+		const { connectToD1 } = await Promise.resolve().then(() => require("./connections-DF80m0CP.js"));
 		const sqliteDB = await connectToD1(credentials.binding);
 		return {
 			dbHash: (0, crypto$1.createHash)("sha256").update("d1://binding").digest("hex"),
@@ -2033,7 +2033,7 @@ const drizzleForSQLite = async (credentials, sqliteSchema, relations, schemaFile
 			casing
 		};
 	}
-	const { connectToSQLite } = await Promise.resolve().then(() => require("./connections-DRQjaCx9.js"));
+	const { connectToSQLite } = await Promise.resolve().then(() => require("./connections-DF80m0CP.js"));
 	const sqliteDB = await connectToSQLite(credentials);
 	let dbUrl;
 	if ("driver" in credentials) {