drizzle-kit 0.29.0 → 0.30.0-1abaaf8

package/bin.cjs

@@ -42787,7 +42787,7 @@ var init_sqlgenerator = __esm({
         const { tableName, schema: schema6, columns, compositePKs, uniqueConstraints, checkConstraints, policies, isRLSEnabled } = st;
         let statement = "";
         const name = schema6 ? `"${schema6}"."${tableName}"` : `"${tableName}"`;
-        statement += `CREATE TABLE IF NOT EXISTS ${name} (
+        statement += `CREATE TABLE ${name} (
 `;
         for (let i2 = 0; i2 < columns.length; i2++) {
           const column9 = columns[i2];
@@ -43633,7 +43633,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
       convert(statement) {
         const { tableName, columnName, schema: schema6 } = statement;
         const tableNameWithSchema = schema6 ? `"${schema6}"."${tableName}"` : `"${tableName}"`;
-        return `ALTER TABLE ${tableNameWithSchema} DROP COLUMN IF EXISTS "${columnName}";`;
+        return `ALTER TABLE ${tableNameWithSchema} DROP COLUMN "${columnName}";`;
       }
     };
     MySqlAlterTableDropColumnConvertor = class extends Convertor {
@@ -44054,7 +44054,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
         for (const table5 of Object.values(json2.tables)) {
           for (const index5 of Object.values(table5.indexes)) {
             const unsquashed = SQLiteSquasher.unsquashIdx(index5);
-            sqlStatements.push(`DROP INDEX IF EXISTS "${unsquashed.name}";`);
+            sqlStatements.push(`DROP INDEX "${unsquashed.name}";`);
             indexes.push({ ...unsquashed, tableName: table5.name });
           }
         }
@@ -44570,13 +44570,8 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${statement.newC
         const toColumnsString = columnsTo.map((it) => `"${it}"`).join(",");
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${tableFrom}"` : `"${tableFrom}"`;
         const tableToNameWithSchema = schemaTo ? `"${schemaTo}"."${tableTo}"` : `"${tableTo}"`;
-        const alterStatement = `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${name}" FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableToNameWithSchema}(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
-        let sql = "DO $$ BEGIN\n";
-        sql += " " + alterStatement + ";\n";
-        sql += "EXCEPTION\n";
-        sql += " WHEN duplicate_object THEN null;\n";
-        sql += "END $$;\n";
-        return sql;
+        const alterStatement = `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${name}" FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableToNameWithSchema}(${toColumnsString})${onDeleteStatement}${onUpdateStatement};`;
+        return alterStatement;
       }
     };
     LibSQLCreateForeignKeyConvertor = class extends Convertor {
@@ -44633,12 +44628,8 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${statement.newC
         const toColumnsString = newFk.columnsTo.map((it) => `"${it}"`).join(",");
         const tableFromNameWithSchema = oldFk.schemaTo ? `"${oldFk.schemaTo}"."${oldFk.tableFrom}"` : `"${oldFk.tableFrom}"`;
         const tableToNameWithSchema = newFk.schemaTo ? `"${newFk.schemaTo}"."${newFk.tableFrom}"` : `"${newFk.tableFrom}"`;
-        const alterStatement = `ALTER TABLE ${tableFromNameWithSchema} ADD CONSTRAINT "${newFk.name}" FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableToNameWithSchema}(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
-        sql += "DO $$ BEGIN\n";
-        sql += " " + alterStatement + ";\n";
-        sql += "EXCEPTION\n";
-        sql += " WHEN duplicate_object THEN null;\n";
-        sql += "END $$;\n";
+        const alterStatement = `ALTER TABLE ${tableFromNameWithSchema} ADD CONSTRAINT "${newFk.name}" FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableToNameWithSchema}(${toColumnsString})${onDeleteStatement}${onUpdateStatement};`;
+        sql += alterStatement;
         return sql;
       }
     };
@@ -44694,7 +44685,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${statement.newC
           reversedString = reversedString.slice(0, -1);
           return reversedString;
         }
-        return `CREATE ${indexPart}${concurrently ? " CONCURRENTLY" : ""} IF NOT EXISTS "${name}" ON ${tableNameWithSchema} USING ${method} (${value})${Object.keys(withMap).length !== 0 ? ` WITH (${reverseLogic(withMap)})` : ""}${where ? ` WHERE ${where}` : ""};`;
+        return `CREATE ${indexPart}${concurrently ? " CONCURRENTLY" : ""} "${name}" ON ${tableNameWithSchema} USING ${method} (${value})${Object.keys(withMap).length !== 0 ? ` WITH (${reverseLogic(withMap)})` : ""}${where ? ` WHERE ${where}` : ""};`;
       }
     };
     CreateMySqlIndexConvertor = class extends Convertor {
@@ -44752,7 +44743,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${statement.newC
       }
       convert(statement) {
         const { name } = PgSquasher.unsquashIdx(statement.data);
-        return `DROP INDEX IF EXISTS "${name}";`;
+        return `DROP INDEX "${name}";`;
       }
     };
     PgCreateSchemaConvertor = class extends Convertor {
@@ -44823,7 +44814,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${statement.newC
       }
       convert(statement) {
         const { name } = PgSquasher.unsquashIdx(statement.data);
-        return `DROP INDEX IF EXISTS \`${name}\`;`;
+        return `DROP INDEX \`${name}\`;`;
       }
     };
     MySqlDropIndexConvertor = class extends Convertor {
@@ -81454,8 +81445,7 @@ var init_introspect_sqlite = __esm({
         });
         if (Object.keys(table5.indexes).length > 0 || filteredFKs.length > 0 || Object.keys(table5.compositePrimaryKeys).length > 0 || Object.keys(table5.uniqueConstraints).length > 0 || Object.keys(table5.checkConstraints).length > 0) {
           statement += ",\n";
-          statement += "(table) => {\n";
-          statement += "	return {\n";
+          statement += "(table) => [";
           statement += createTableIndexes(
             table5.name,
             Object.values(table5.indexes),
@@ -81474,8 +81464,7 @@ var init_introspect_sqlite = __esm({
             Object.values(table5.checkConstraints),
             casing2
           );
-          statement += "	}\n";
-          statement += "}";
+          statement += "\n]";
         }
         statement += ");";
         return statement;
@@ -81632,12 +81621,11 @@ var init_introspect_sqlite = __esm({
         idxKey = withCasing(idxKey, casing2);
         const indexGeneratedName = indexName4(tableName, it.columns);
         const escapedIndexName = indexGeneratedName === it.name ? "" : `"${it.name}"`;
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += it.isUnique ? "uniqueIndex(" : "index(";
         statement += `${escapedIndexName})`;
         statement += `.on(${it.columns.map((it2) => `table.${withCasing(it2, casing2)}`).join(", ")}),`;
-        statement += `
-`;
       });
       return statement;
     };
@@ -81645,39 +81633,36 @@ var init_introspect_sqlite = __esm({
       let statement = "";
       unqs.forEach((it) => {
         const idxKey = withCasing(it.name, casing2);
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += "unique(";
         statement += `"${it.name}")`;
         statement += `.on(${it.columns.map((it2) => `table.${withCasing(it2, casing2)}`).join(", ")}),`;
-        statement += `
-`;
       });
       return statement;
     };
     createTableChecks = (checks, casing2) => {
       let statement = "";
       checks.forEach((it) => {
-        const checkKey = withCasing(it.name, casing2);
-        statement += `		${checkKey}: `;
+        statement += `
+	`;
         statement += "check(";
         statement += `"${it.name}", `;
         statement += `sql\`${it.value}\`)`;
-        statement += `,
-`;
+        statement += `,`;
       });
       return statement;
     };
     createTablePKs = (pks, casing2) => {
       let statement = "";
       pks.forEach((it, i2) => {
-        statement += `		pk${i2}: `;
+        statement += `
+	`;
         statement += "primaryKey({ columns: [";
         statement += `${it.columns.map((c) => {
           return `table.${withCasing(c, casing2)}`;
         }).join(", ")}]${it.name ? `, name: "${it.name}"` : ""}}`;
         statement += ")";
-        statement += `
-`;
       });
       return statement;
     };
@@ -81686,7 +81671,9 @@ var init_introspect_sqlite = __esm({
       fks.forEach((it) => {
         const isSelf4 = it.tableTo === it.tableFrom;
         const tableTo = isSelf4 ? "table" : `${withCasing(it.tableTo, casing2)}`;
-        statement += `		${withCasing(it.name, casing2)}: foreignKey(() => ({
+        statement += `
+	`;
+        statement += `foreignKey(() => ({
 `;
         statement += `			columns: [${it.columnsFrom.map((i2) => `table.${withCasing(i2, casing2)}`).join(", ")}],
 `;
@@ -81697,8 +81684,7 @@ var init_introspect_sqlite = __esm({
         statement += `		}))`;
         statement += it.onUpdate && it.onUpdate !== "no action" ? `.onUpdate("${it.onUpdate}")` : "";
         statement += it.onDelete && it.onDelete !== "no action" ? `.onDelete("${it.onDelete}")` : "";
-        statement += `,
-`;
+        statement += `,`;
       });
       return statement;
     };
@@ -82827,8 +82813,7 @@ var init_introspect_mysql = __esm({
         });
         if (Object.keys(table5.indexes).length > 0 || filteredFKs.length > 0 || Object.keys(table5.compositePrimaryKeys).length > 0 || Object.keys(table5.uniqueConstraints).length > 0 || Object.keys(table5.checkConstraint).length > 0) {
           statement += ",\n";
-          statement += "(table) => {\n";
-          statement += "	return {\n";
+          statement += "(table) => [";
           statement += createTableIndexes2(
             table5.name,
             Object.values(table5.indexes),
@@ -82847,8 +82832,7 @@ var init_introspect_mysql = __esm({
             Object.values(table5.checkConstraint),
             withCasing4
           );
-          statement += "	}\n";
-          statement += "}";
+          statement += "\n]";
         }
         statement += ");";
         return statement;
@@ -83218,12 +83202,11 @@ import { sql } from "drizzle-orm"
         idxKey = casing2(idxKey);
         const indexGeneratedName = indexName(tableName, it.columns);
         const escapedIndexName = indexGeneratedName === it.name ? "" : `"${it.name}"`;
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += it.isUnique ? "uniqueIndex(" : "index(";
         statement += `${escapedIndexName})`;
         statement += `.on(${it.columns.map((it2) => `table.${casing2(it2)}`).join(", ")}),`;
-        statement += `
-`;
       });
       return statement;
     };
@@ -83231,25 +83214,23 @@ import { sql } from "drizzle-orm"
       let statement = "";
       unqs.forEach((it) => {
         const idxKey = casing2(it.name);
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += "unique(";
         statement += `"${it.name}")`;
         statement += `.on(${it.columns.map((it2) => `table.${casing2(it2)}`).join(", ")}),`;
-        statement += `
-`;
       });
       return statement;
     };
     createTableChecks2 = (checks, casing2) => {
       let statement = "";
       checks.forEach((it) => {
-        const checkKey = casing2(it.name);
-        statement += `		${checkKey}: `;
+        statement += `
+	`;
         statement += "check(";
         statement += `"${it.name}", `;
         statement += `sql\`${it.value.replace(/`/g, "\\`")}\`)`;
-        statement += `,
-`;
+        statement += `,`;
       });
       return statement;
     };
@@ -83257,14 +83238,13 @@ import { sql } from "drizzle-orm"
       let statement = "";
       pks.forEach((it) => {
         let idxKey = casing2(it.name);
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += "primaryKey({ columns: [";
         statement += `${it.columns.map((c) => {
           return `table.${casing2(c)}`;
         }).join(", ")}]${it.name ? `, name: "${it.name}"` : ""}}`;
         statement += "),";
-        statement += `
-`;
       });
       return statement;
     };
@@ -83273,7 +83253,9 @@ import { sql } from "drizzle-orm"
       fks.forEach((it) => {
         const isSelf4 = it.tableTo === it.tableFrom;
         const tableTo = isSelf4 ? "table" : `${casing2(it.tableTo)}`;
-        statement += `		${casing2(it.name)}: foreignKey({
+        statement += `
+	`;
+        statement += `foreignKey({
 `;
         statement += `			columns: [${it.columnsFrom.map((i2) => `table.${casing2(i2)}`).join(", ")}],
 `;
@@ -83284,8 +83266,7 @@ import { sql } from "drizzle-orm"
         statement += `		})`;
         statement += it.onUpdate && it.onUpdate !== "no action" ? `.onUpdate("${it.onUpdate}")` : "";
         statement += it.onDelete && it.onDelete !== "no action" ? `.onDelete("${it.onDelete}")` : "";
-        statement += `,
-`;
+        statement += `,`;
       });
       return statement;
     };
@@ -83630,8 +83611,7 @@ var init_introspect_pg = __esm({
         statement += "}";
         if (Object.keys(table5.indexes).length > 0 || Object.values(table5.foreignKeys).length > 0 || Object.values(table5.policies).length > 0 || Object.keys(table5.compositePrimaryKeys).length > 0 || Object.keys(table5.uniqueConstraints).length > 0 || Object.keys(table5.checkConstraints).length > 0) {
           statement += ", ";
-          statement += "(table) => {\n";
-          statement += "	return {\n";
+          statement += "(table) => [";
           statement += createTableIndexes3(table5.name, Object.values(table5.indexes), casing2);
           statement += createTableFKs3(Object.values(table5.foreignKeys), schemas, casing2);
           statement += createTablePKs3(
@@ -83651,8 +83631,7 @@ var init_introspect_pg = __esm({
             Object.values(table5.checkConstraints),
             casing2
           );
-          statement += "	}\n";
-          statement += "}";
+          statement += "\n]";
         }
         statement += ");";
         return statement;
@@ -84047,7 +84026,8 @@ import { sql } from "drizzle-orm"
           it.columns.map((it2) => it2.expression)
         );
         const escapedIndexName = indexGeneratedName === it.name ? "" : `"${it.name}"`;
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += it.isUnique ? "uniqueIndex(" : "index(";
         statement += `${escapedIndexName})`;
         statement += `${it.concurrently ? `.concurrently()` : ""}`;
@@ -84070,23 +84050,21 @@ import { sql } from "drizzle-orm"
           return `${reversedString}}`;
         }
         statement += it.with && Object.keys(it.with).length > 0 ? `.with(${reverseLogic(it.with)})` : "";
-        statement += `,
-`;
+        statement += `,`;
       });
       return statement;
     };
     createTablePKs3 = (pks, casing2) => {
       let statement = "";
       pks.forEach((it) => {
-        let idxKey = withCasing2(it.name, casing2);
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += "primaryKey({ columns: [";
         statement += `${it.columns.map((c) => {
           return `table.${withCasing2(c, casing2)}`;
         }).join(", ")}]${it.name ? `, name: "${it.name}"` : ""}}`;
         statement += ")";
-        statement += `,
-`;
+        statement += `,`;
       });
       return statement;
     };
@@ -84098,39 +84076,37 @@ import { sql } from "drizzle-orm"
         const mappedItTo = (_a = it.to) == null ? void 0 : _a.map((v) => {
           return rolesNameToTsKey[v] ? withCasing2(rolesNameToTsKey[v], casing2) : `"${v}"`;
         });
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += "pgPolicy(";
         statement += `"${it.name}", { `;
         statement += `as: "${(_b = it.as) == null ? void 0 : _b.toLowerCase()}", for: "${(_c = it.for) == null ? void 0 : _c.toLowerCase()}", to: [${mappedItTo == null ? void 0 : mappedItTo.join(", ")}]${it.using ? `, using: sql\`${it.using}\`` : ""}${it.withCheck ? `, withCheck: sql\`${it.withCheck}\` ` : ""}`;
-        statement += ` }),
-`;
+        statement += ` }),`;
       });
       return statement;
     };
     createTableUniques3 = (unqs, casing2) => {
       let statement = "";
       unqs.forEach((it) => {
-        const idxKey = withCasing2(it.name, casing2);
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += "unique(";
         statement += `"${it.name}")`;
         statement += `.on(${it.columns.map((it2) => `table.${withCasing2(it2, casing2)}`).join(", ")})`;
         statement += it.nullsNotDistinct ? `.nullsNotDistinct()` : "";
-        statement += `,
-`;
+        statement += `,`;
       });
       return statement;
     };
     createTableChecks3 = (checkConstraints, casing2) => {
       let statement = "";
       checkConstraints.forEach((it) => {
-        const checkKey = withCasing2(it.name, casing2);
-        statement += `		${checkKey}: `;
+        statement += `
+	`;
         statement += "check(";
         statement += `"${it.name}", `;
         statement += `sql\`${it.value}\`)`;
-        statement += `,
-`;
+        statement += `,`;
       });
       return statement;
     };
@@ -84141,7 +84117,9 @@ import { sql } from "drizzle-orm"
         const paramName = paramNameFor(it.tableTo, tableSchema);
         const isSelf4 = it.tableTo === it.tableFrom;
         const tableTo = isSelf4 ? "table" : `${withCasing2(paramName, casing2)}`;
-        statement += `		${withCasing2(it.name, casing2)}: foreignKey({
+        statement += `
+	`;
+        statement += `foreignKey({
 `;
         statement += `			columns: [${it.columnsFrom.map((i2) => `table.${withCasing2(i2, casing2)}`).join(", ")}],
 `;
@@ -84152,8 +84130,7 @@ import { sql } from "drizzle-orm"
         statement += `		})`;
         statement += it.onUpdate && it.onUpdate !== "no action" ? `.onUpdate("${it.onUpdate}")` : "";
         statement += it.onDelete && it.onDelete !== "no action" ? `.onDelete("${it.onDelete}")` : "";
-        statement += `,
-`;
+        statement += `,`;
       });
       return statement;
     };
@@ -84319,8 +84296,7 @@ var init_introspect_singlestore = __esm({
         statement += "}";
         if (Object.keys(table5.indexes).length > 0 || Object.keys(table5.compositePrimaryKeys).length > 0 || Object.keys(table5.uniqueConstraints).length > 0) {
           statement += ",\n";
-          statement += "(table) => {\n";
-          statement += "	return {\n";
+          statement += "(table) => [";
           statement += createTableIndexes4(
             table5.name,
             Object.values(table5.indexes),
@@ -84334,8 +84310,7 @@ var init_introspect_singlestore = __esm({
             Object.values(table5.uniqueConstraints),
             withCasing4
           );
-          statement += "	}\n";
-          statement += "}";
+          statement += "\n]";
         }
         statement += ");";
         return statement;
@@ -84638,25 +84613,22 @@ import { sql } from "drizzle-orm"
         idxKey = casing2(idxKey);
         const indexGeneratedName = indexName3(tableName, it.columns);
         const escapedIndexName = indexGeneratedName === it.name ? "" : `"${it.name}"`;
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += it.isUnique ? "uniqueIndex(" : "index(";
         statement += `${escapedIndexName})`;
         statement += `.on(${it.columns.map((it2) => `table.${casing2(it2)}`).join(", ")}),`;
-        statement += `
-`;
       });
       return statement;
     };
     createTableUniques4 = (unqs, casing2) => {
       let statement = "";
       unqs.forEach((it) => {
-        const idxKey = casing2(it.name);
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += "unique(";
         statement += `"${it.name}")`;
         statement += `.on(${it.columns.map((it2) => `table.${casing2(it2)}`).join(", ")}),`;
-        statement += `
-`;
       });
       return statement;
     };
@@ -84664,14 +84636,13 @@ import { sql } from "drizzle-orm"
       let statement = "";
       pks.forEach((it) => {
         let idxKey = casing2(it.name);
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += "primaryKey({ columns: [";
         statement += `${it.columns.map((c) => {
           return `table.${casing2(c)}`;
         }).join(", ")}]${it.name ? `, name: "${it.name}"` : ""}}`;
         statement += "),";
-        statement += `
-`;
       });
       return statement;
     };
@@ -91840,7 +91811,7 @@ var generate = command2({
     } else if (dialect6 === "turso") {
       await prepareAndMigrateLibSQL2(opts);
     } else if (dialect6 === "singlestore") {
-      await prepareAndMigrateSqlite2(opts);
+      await prepareAndMigrateSingleStore2(opts);
     } else {
       assertUnreachable(dialect6);
     }
@@ -92435,7 +92406,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.29.0";
+  const envVersion = "0.30.0-1abaaf8";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

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