drizzle-kit 0.23.0-b9c41b5 → 0.23.0-eb2ca29

package/bin.cjs

@@ -11183,7 +11183,7 @@ var init_common = __esm({
     configMigrations = objectType({
       table: stringType().optional(),
       schema: stringType().optional(),
-      prefix: unionType([literalType("index"), literalType("timestamp"), literalType("none")]).optional().default("index")
+      prefix: prefix.optional().default("index")
     }).optional();
     configCommonSchema = objectType({
       dialect: dialect3,
@@ -20190,7 +20190,6 @@ var init_sqlgenerator = __esm({
           statement += `PRIMARY KEY(${it.map((it2) => `\`${it2}\``).join(", ")})`;
         });
         for (let i2 = 0; i2 < referenceData.length; i2++) {
-          const referenceAsString = referenceData[i2];
           const {
             name,
             tableFrom,
@@ -20199,7 +20198,7 @@ var init_sqlgenerator = __esm({
             columnsTo,
             onDelete,
             onUpdate
-          } = SQLiteSquasher.unsquashFK(referenceAsString);
+          } = referenceData[i2];
           const onDeleteStatement = onDelete ? ` ON DELETE ${onDelete}` : "";
           const onUpdateStatement = onUpdate ? ` ON UPDATE ${onUpdate}` : "";
           const fromColumnsString = columnsFrom.map((it) => `\`${it}\``).join(",");
@@ -24622,17 +24621,20 @@ var init_jsonStatements = __esm({
         internals
       };
     };
-    prepareSQLiteCreateTable = (table4) => {
+    prepareSQLiteCreateTable = (table4, action) => {
       const { name, columns, uniqueConstraints } = table4;
       const references2 = Object.values(table4.foreignKeys);
       const composites = Object.values(table4.compositePrimaryKeys).map(
         (it) => SQLiteSquasher.unsquashPK(it)
       );
+      const fks = references2.map(
+        (it) => action === "push" ? SQLiteSquasher.unsquashPushFK(it) : SQLiteSquasher.unsquashFK(it)
+      );
       return {
         type: "sqlite_create_table",
         tableName: name,
         columns: Object.values(columns),
-        referenceData: references2,
+        referenceData: fks,
         compositePKs: composites,
         uniqueConstraints: Object.values(uniqueConstraints)
       };
@@ -26876,7 +26878,7 @@ var init_snapshotsDiffer = __esm({
         _meta
       };
     };
-    applySqliteSnapshotsDiff = async (json1, json2, tablesResolver2, columnsResolver2, prevFull, curFull) => {
+    applySqliteSnapshotsDiff = async (json1, json2, tablesResolver2, columnsResolver2, prevFull, curFull, action) => {
       const tablesDiff = diffSchemasOrTables(json1.tables, json2.tables);
       const {
         created: createdTables,
@@ -26953,7 +26955,7 @@ var init_snapshotsDiffer = __esm({
         tablesMap[obj.name] = obj;
       });
       const jsonCreateTables = createdTables.map((it) => {
-        return prepareSQLiteCreateTable(it);
+        return prepareSQLiteCreateTable(it, action);
       });
       const jsonCreateIndexesForCreatedTables = createdTables.map((it) => {
         return prepareCreateIndexesJson(
@@ -28818,7 +28820,8 @@ var init_migrate = __esm({
         tablesResolver,
         columnsResolver,
         validatedPrev,
-        validatedCur
+        validatedCur,
+        "push"
       );
       return {
         sqlStatements,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.23.0-b9c41b5",
+  "version": "0.23.0-eb2ca29",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/payload.js

@@ -16154,7 +16154,7 @@ var init_common2 = __esm({
     configMigrations = objectType({
       table: stringType().optional(),
       schema: stringType().optional(),
-      prefix: unionType([literalType("index"), literalType("timestamp"), literalType("none")]).optional().default("index")
+      prefix: prefix.optional().default("index")
     }).optional();
     configCommonSchema = objectType({
       dialect: dialect3,
@@ -21402,17 +21402,20 @@ var init_jsonStatements = __esm({
         internals
       };
     };
-    prepareSQLiteCreateTable = (table4) => {
+    prepareSQLiteCreateTable = (table4, action) => {
       const { name: name2, columns, uniqueConstraints } = table4;
       const references2 = Object.values(table4.foreignKeys);
       const composites = Object.values(table4.compositePrimaryKeys).map(
         (it) => SQLiteSquasher.unsquashPK(it)
       );
+      const fks = references2.map(
+        (it) => action === "push" ? SQLiteSquasher.unsquashPushFK(it) : SQLiteSquasher.unsquashFK(it)
+      );
       return {
         type: "sqlite_create_table",
         tableName: name2,
         columns: Object.values(columns),
-        referenceData: references2,
+        referenceData: fks,
         compositePKs: composites,
         uniqueConstraints: Object.values(uniqueConstraints)
       };
@@ -23684,7 +23687,7 @@ var init_snapshotsDiffer = __esm({
         _meta
       };
     };
-    applySqliteSnapshotsDiff = async (json1, json2, tablesResolver2, columnsResolver2, prevFull, curFull) => {
+    applySqliteSnapshotsDiff = async (json1, json2, tablesResolver2, columnsResolver2, prevFull, curFull, action) => {
       const tablesDiff = diffSchemasOrTables(json1.tables, json2.tables);
       const {
         created: createdTables,
@@ -23761,7 +23764,7 @@ var init_snapshotsDiffer = __esm({
         tablesMap[obj.name] = obj;
       });
       const jsonCreateTables = createdTables.map((it) => {
-        return prepareSQLiteCreateTable(it);
+        return prepareSQLiteCreateTable(it, action);
       });
       const jsonCreateIndexesForCreatedTables = createdTables.map((it) => {
         return prepareCreateIndexesJson(
@@ -24409,7 +24412,6 @@ var init_sqlgenerator = __esm({
           statement += `PRIMARY KEY(${it.map((it2) => `\`${it2}\``).join(", ")})`;
         });
         for (let i = 0; i < referenceData.length; i++) {
-          const referenceAsString = referenceData[i];
           const {
             name: name2,
             tableFrom,
@@ -24418,7 +24420,7 @@ var init_sqlgenerator = __esm({
             columnsTo,
             onDelete,
             onUpdate
-          } = SQLiteSquasher.unsquashFK(referenceAsString);
+          } = referenceData[i];
           const onDeleteStatement = onDelete ? ` ON DELETE ${onDelete}` : "";
           const onUpdateStatement = onUpdate ? ` ON UPDATE ${onUpdate}` : "";
           const fromColumnsString = columnsFrom.map((it) => `\`${it}\``).join(",");
@@ -35694,7 +35696,8 @@ var pushSQLiteSchema = async (imports, drizzleInstance) => {
     tablesResolver,
     columnsResolver,
     validatedPrev,
-    validatedCur
+    validatedCur,
+    "push"
   );
   const { shouldAskForApprove, statementsToExecute, infoToPrint } = await logSuggestionsAndReturn(
     db,

package/payload.mjs

@@ -16160,7 +16160,7 @@ var init_common2 = __esm({
     configMigrations = objectType({
       table: stringType().optional(),
       schema: stringType().optional(),
-      prefix: unionType([literalType("index"), literalType("timestamp"), literalType("none")]).optional().default("index")
+      prefix: prefix.optional().default("index")
     }).optional();
     configCommonSchema = objectType({
       dialect: dialect3,
@@ -21408,17 +21408,20 @@ var init_jsonStatements = __esm({
         internals
       };
     };
-    prepareSQLiteCreateTable = (table4) => {
+    prepareSQLiteCreateTable = (table4, action) => {
       const { name: name2, columns, uniqueConstraints } = table4;
       const references2 = Object.values(table4.foreignKeys);
       const composites = Object.values(table4.compositePrimaryKeys).map(
         (it) => SQLiteSquasher.unsquashPK(it)
       );
+      const fks = references2.map(
+        (it) => action === "push" ? SQLiteSquasher.unsquashPushFK(it) : SQLiteSquasher.unsquashFK(it)
+      );
       return {
         type: "sqlite_create_table",
         tableName: name2,
         columns: Object.values(columns),
-        referenceData: references2,
+        referenceData: fks,
         compositePKs: composites,
         uniqueConstraints: Object.values(uniqueConstraints)
       };
@@ -23690,7 +23693,7 @@ var init_snapshotsDiffer = __esm({
         _meta
       };
     };
-    applySqliteSnapshotsDiff = async (json1, json2, tablesResolver2, columnsResolver2, prevFull, curFull) => {
+    applySqliteSnapshotsDiff = async (json1, json2, tablesResolver2, columnsResolver2, prevFull, curFull, action) => {
       const tablesDiff = diffSchemasOrTables(json1.tables, json2.tables);
       const {
         created: createdTables,
@@ -23767,7 +23770,7 @@ var init_snapshotsDiffer = __esm({
         tablesMap[obj.name] = obj;
       });
       const jsonCreateTables = createdTables.map((it) => {
-        return prepareSQLiteCreateTable(it);
+        return prepareSQLiteCreateTable(it, action);
       });
       const jsonCreateIndexesForCreatedTables = createdTables.map((it) => {
         return prepareCreateIndexesJson(
@@ -24415,7 +24418,6 @@ var init_sqlgenerator = __esm({
           statement += `PRIMARY KEY(${it.map((it2) => `\`${it2}\``).join(", ")})`;
         });
         for (let i = 0; i < referenceData.length; i++) {
-          const referenceAsString = referenceData[i];
           const {
             name: name2,
             tableFrom,
@@ -24424,7 +24426,7 @@ var init_sqlgenerator = __esm({
             columnsTo,
             onDelete,
             onUpdate
-          } = SQLiteSquasher.unsquashFK(referenceAsString);
+          } = referenceData[i];
           const onDeleteStatement = onDelete ? ` ON DELETE ${onDelete}` : "";
           const onUpdateStatement = onUpdate ? ` ON UPDATE ${onUpdate}` : "";
           const fromColumnsString = columnsFrom.map((it) => `\`${it}\``).join(",");
@@ -35686,7 +35688,8 @@ var pushSQLiteSchema = async (imports, drizzleInstance) => {
     tablesResolver,
     columnsResolver,
     validatedPrev,
-    validatedCur
+    validatedCur,
+    "push"
   );
   const { shouldAskForApprove, statementsToExecute, infoToPrint } = await logSuggestionsAndReturn(
     db,