drizzle-kit 0.22.0-3b0ba5f → 0.22.0-ed86dfa

package/payload.mjs

@@ -8530,7 +8530,7 @@ var init_utils4 = __esm({
 
 // src/cli/views.ts
 import { Prompt, render, SelectState, TaskView } from "hanji";
-var error, isRenamePromptItem, ResolveColumnSelect, tableKey, ResolveSelect, ResolveSchemasSelect;
+var error, isRenamePromptItem, ResolveColumnSelect, tableKey, ResolveSelect, ResolveSchemasSelect, Spinner, ProgressView;
 var init_views = __esm({
   "src/cli/views.ts"() {
     "use strict";
@@ -8682,6 +8682,42 @@ Is ${source_default.bold.blue(
         return this.state.items[this.state.selectedIdx];
       }
     };
+    Spinner = class {
+      constructor(frames) {
+        this.frames = frames;
+        this.offset = 0;
+        this.tick = () => {
+          this.iterator();
+        };
+        this.value = () => {
+          return this.frames[this.offset];
+        };
+        this.iterator = () => {
+          this.offset += 1;
+          this.offset %= frames.length - 1;
+        };
+      }
+    };
+    ProgressView = class extends TaskView {
+      constructor(progressText, successText) {
+        super();
+        this.progressText = progressText;
+        this.successText = successText;
+        this.spinner = new Spinner("\u28F7\u28EF\u28DF\u287F\u28BF\u28FB\u28FD\u28FE".split(""));
+        this.timeout = setInterval(() => {
+          this.spinner.tick();
+          this.requestLayout();
+        }, 128);
+        this.on("detach", () => clearInterval(this.timeout));
+      }
+      render(status) {
+        if (status === "pending") {
+          const spin = this.spinner.value();
+          return `[${spin}] ${this.progressText}`;
+        }
+        return `[${source_default.green("\u2713")}] ${this.successText}`;
+      }
+    };
   }
 });
 
@@ -8802,6 +8838,12 @@ var init_sqlite = __esm({
         url: string6(),
         authToken: string6()
       }),
+      object6({
+        driver: literal5("d1-http"),
+        accountId: string6(),
+        databaseId: string6(),
+        token: string6()
+      }),
       object6({
         url: string6()
       })
@@ -8851,6 +8893,7 @@ var init_common2 = __esm({
       literal6("turso"),
       literal6("libsql"),
       literal6("d1"),
+      literal6("d1-http"),
       literal6("expo")
     ]);
     postgresDriver = literal6("aws-data-api");
@@ -9837,6 +9880,7 @@ ${withStyle.errorWarning(
       "time without time zone": "::time without time zone",
       // "timestamp with time zone": "::timestamp with time zone",
       "timestamp without time zone": "::timestamp without time zone",
+      "timestamp(": "::timestamp without time zone",
       // date: "::date",
       // interval: "::interval",
       // character: "::bpchar",
@@ -9849,15 +9893,15 @@ ${withStyle.errorWarning(
       "character(": "::bpchar"
     };
     defaultForColumn = (column4) => {
+      if (column4.column_default === null) {
+        return void 0;
+      }
       if (column4.data_type === "serial" || column4.data_type === "smallserial" || column4.data_type === "bigserial") {
         return void 0;
       }
       const hasDifferentDefaultCast = Object.keys(columnToDefault).find(
         (it) => column4.data_type.startsWith(it)
       );
-      if (column4.column_default === null) {
-        return void 0;
-      }
       const columnDefaultAsString = column4.column_default.toString();
       if (columnDefaultAsString.endsWith(
         hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : column4.data_type
@@ -11339,8 +11383,7 @@ var init_jsonDiffer = __esm({
     };
     findAlternationsInTable = (table4) => {
       const columns = table4.columns ?? {};
-      const isSemanticallyEqual = (it) => columns[it]["type"]?.__new.replace(" (", "(") === columns[it]["type"]?.__old.replace(" (", "(");
-      const altered = Object.keys(columns).filter((it) => !(it.includes("__deleted") || it.includes("__added") || isSemanticallyEqual(it))).map((it) => {
+      const altered = Object.keys(columns).filter((it) => !(it.includes("__deleted") || it.includes("__added"))).map((it) => {
         return { name: it, ...columns[it] };
       });
       const deletedIndexes = Object.fromEntries(
@@ -11442,6 +11485,9 @@ var init_jsonDiffer = __esm({
         return it;
       }).map((it) => {
         if ("type" in it) {
+          if (it.type.__old.replace(" (", "(") === it.type.__new.replace(" (", "(")) {
+            return void 0;
+          }
           return {
             ...it,
             type: { type: "changed", old: it.type.__old, new: it.type.__new }
@@ -11604,7 +11650,7 @@ var init_jsonDiffer = __esm({
           };
         }
         return it;
-      });
+      }).filter(Boolean);
       return result[0];
     };
   }
@@ -12488,7 +12534,7 @@ var init_jsonStatements = __esm({
           tableName,
           data: it,
           schema: schema4,
-          constraintName: json2.tables[`${schema4}.${tableName}`].compositePrimaryKeys[unsquashed.name].name
+          constraintName: json2.tables[`${schema4 || "public"}.${tableName}`].compositePrimaryKeys[unsquashed.name].name
         };
       });
     };
@@ -12511,8 +12557,8 @@ var init_jsonStatements = __esm({
           old: it.__old,
           new: it.__new,
           schema: schema4,
-          oldConstraintName: json1.tables[`${schema4}.${tableName}`].compositePrimaryKeys[PgSquasher.unsquashPK(it.__old).name].name,
-          newConstraintName: json2.tables[`${schema4}.${tableName}`].compositePrimaryKeys[PgSquasher.unsquashPK(it.__new).name].name
+          oldConstraintName: json1.tables[`${schema4 || "public"}.${tableName}`].compositePrimaryKeys[PgSquasher.unsquashPK(it.__old).name].name,
+          newConstraintName: json2.tables[`${schema4 || "public"}.${tableName}`].compositePrimaryKeys[PgSquasher.unsquashPK(it.__new).name].name
         };
       });
     };
@@ -12793,7 +12839,7 @@ var init_snapshotsDiffer = __esm({
       for (let ren of renamedTables) {
         if (table4.name === ren.from.name && table4.schema === ren.from.schema) {
           return {
-            key: `${ren.to.schema}.${ren.to.name}`,
+            key: `${ren.to.schema || "public"}.${ren.to.name}`,
             name: ren.to.name,
             schema: ren.to.schema
           };
@@ -14165,8 +14211,7 @@ var init_sqlgenerator = __esm({
       convert(st) {
         const { tableName, columns, schema: schema4, compositePKs, uniqueConstraints } = st;
         let statement = "";
-        const tName = schema4 ? `\`${schema4}\`.\`${tableName}\`` : `\`${tableName}\``;
-        statement += `CREATE TABLE ${tName} (
+        statement += `CREATE TABLE \`${tableName}\` (
 `;
         for (let i = 0; i < columns.length; i++) {
           const column4 = columns[i];
@@ -14286,8 +14331,7 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         const unsquashed = MySqlSquasher.unsquashUnique(statement.data);
-        const tableNameWithSchema = statement.schema ? `\`${statement.schema}\`.\`${statement.tableName}\`` : `\`${statement.tableName}\``;
-        return `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT \`${unsquashed.name}\` UNIQUE(\`${unsquashed.columns.join("`,`")}\`);`;
+        return `ALTER TABLE \`${statement.tableName}\` ADD CONSTRAINT \`${unsquashed.name}\` UNIQUE(\`${unsquashed.columns.join("`,`")}\`);`;
       }
     };
     MySQLAlterTableDropUniqueConstraintConvertor = class extends Convertor {
@@ -14296,8 +14340,7 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         const unsquashed = MySqlSquasher.unsquashUnique(statement.data);
-        const tableNameWithSchema = statement.schema ? `\`${statement.schema}\`.\`${statement.tableName}\`` : `\`${statement.tableName}\``;
-        return `ALTER TABLE ${tableNameWithSchema} DROP INDEX \`${unsquashed.name}\`;`;
+        return `ALTER TABLE \`${statement.tableName}\` DROP INDEX \`${unsquashed.name}\`;`;
       }
     };
     SQLiteAlterTableAddUniqueConstraintConvertor = class extends Convertor {
@@ -14412,10 +14455,8 @@ var init_sqlgenerator = __esm({
         return statement.type === "rename_table" && dialect7 === "mysql";
       }
       convert(statement) {
-        const { tableNameFrom, tableNameTo, fromSchema, toSchema } = statement;
-        const from = fromSchema ? `\`${fromSchema}\`.\`${tableNameFrom}\`` : `\`${tableNameFrom}\``;
-        const to = fromSchema ? `\`${fromSchema}\`.\`${tableNameTo}\`` : `\`${tableNameTo}\``;
-        return `RENAME TABLE ${from} TO ${to};`;
+        const { tableNameFrom, tableNameTo } = statement;
+        return `RENAME TABLE \`${tableNameFrom}\` TO \`${tableNameTo}\`;`;
       }
     };
     PgAlterTableRenameColumnConvertor = class extends Convertor {
@@ -15223,9 +15264,8 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
         return statement.type === "drop_index" && dialect7 === "mysql";
       }
       convert(statement) {
-        const tableName = typeof statement.schema === "undefined" ? `\`${statement.tableName}\`` : `\`${statement.schema}\`.\`${statement.tableName}\``;
         const { name: name2 } = MySqlSquasher.unsquashIdx(statement.data);
-        return `DROP INDEX \`${name2}\` ON ${tableName};`;
+        return `DROP INDEX \`${name2}\` ON \`${statement.tableName}\`;`;
       }
     };
     convertors = [];
@@ -18880,12 +18920,24 @@ The unique constraint ${source_default.underline.blue(
         `SELECT 
     m.name as "tableName", p.name as "columnName", p.type as "columnType", p."notnull" as "notNull", p.dflt_value as "defaultValue", p.pk as pk
     FROM sqlite_master AS m JOIN pragma_table_info(m.name) AS p
-    WHERE m.type = 'table' and m.tbl_name != 'sqlite_sequence' and m.tbl_name != 'sqlite_stat1' and m.tbl_name != '_litestream_seq' and m.tbl_name != '_litestream_lock' and m.tbl_name != 'libsql_wasm_func_table' and m.tbl_name != '__drizzle_migrations';
+    WHERE m.type = 'table' 
+    and m.tbl_name != 'sqlite_sequence' 
+    and m.tbl_name != 'sqlite_stat1' 
+    and m.tbl_name != '_litestream_seq' 
+    and m.tbl_name != '_litestream_lock' 
+    and m.tbl_name != 'libsql_wasm_func_table' 
+    and m.tbl_name != '__drizzle_migrations' 
+    and m.tbl_name != '_cf_KV';
     `
       );
       const tablesWithSeq = [];
       const seq = await db.query(
-        `SELECT * FROM sqlite_master WHERE name != 'sqlite_sequence' and name != 'sqlite_stat1' and name != '_litestream_seq' and name != '_litestream_lock' and sql GLOB '*[ *' || CHAR(9) || CHAR(10) || CHAR(13) || ']AUTOINCREMENT[^'']*';`
+        `SELECT * FROM sqlite_master WHERE name != 'sqlite_sequence' 
+    and name != 'sqlite_stat1' 
+    and name != '_litestream_seq' 
+    and name != '_litestream_lock' 
+    and tbl_name != '_cf_KV' 
+    and sql GLOB '*[ *' || CHAR(9) || CHAR(10) || CHAR(13) || ']AUTOINCREMENT[^'']*';`
       );
       for (const s of seq) {
         tablesWithSeq.push(s.name);
@@ -18970,7 +19022,8 @@ The unique constraint ${source_default.underline.blue(
       try {
         const fks = await db.query(
           `SELECT m.name as "tableFrom", f.id as "id", f."table" as "tableTo", f."from", f."to", f."on_update" as "onUpdate", f."on_delete" as "onDelete", f.seq as "seq"
-      FROM sqlite_master m, pragma_foreign_key_list(m.name) as f;`
+      FROM sqlite_master m, pragma_foreign_key_list(m.name) as f 
+      where m.tbl_name != '_cf_KV';`
         );
         const fkByTableName = {};
         for (const fkRow of fks) {
@@ -19029,7 +19082,9 @@ FROM sqlite_master AS m,
     pragma_index_list(m.name) AS il,
     pragma_index_info(il.name) AS ii
 WHERE 
-    m.type = 'table' and il.name NOT LIKE 'sqlite_autoindex_%';`
+    m.type = 'table' 
+    and il.name NOT LIKE 'sqlite_autoindex_%'
+    and m.tbl_name != '_cf_KV';`
       );
       for (const idxRow of idxs) {
         const tableName = idxRow.tableName;
@@ -23938,6 +23993,7 @@ var mysqlIntrospect_exports = {};
 __export(mysqlIntrospect_exports, {
   mysqlPushIntrospect: () => mysqlPushIntrospect
 });
+import { renderWithTask as renderWithTask3 } from "hanji";
 var mysqlPushIntrospect;
 var init_mysqlIntrospect = __esm({
   "src/cli/commands/mysqlIntrospect.ts"() {
@@ -23945,6 +24001,7 @@ var init_mysqlIntrospect = __esm({
     init_mysqlSerializer();
     init_global();
     init_mjs();
+    init_views();
     mysqlPushIntrospect = async (db, databaseName, filters) => {
       const matchers = filters.map((it) => {
         return new Minimatch(it);
@@ -23959,7 +24016,14 @@ var init_mysqlIntrospect = __esm({
         }
         return false;
       };
-      const res = await fromDatabase3(db, databaseName, filter2);
+      const progress = new ProgressView(
+        "Pulling schema from database...",
+        "Pulling schema from database..."
+      );
+      const res = await renderWithTask3(
+        progress,
+        fromDatabase3(db, databaseName, filter2)
+      );
       const schema4 = { id: originUUID, prevId: "", ...res };
       const { internal, ...schemaWithoutInternals } = schema4;
       return { schema: schemaWithoutInternals };
@@ -23980,6 +24044,8 @@ import { randomUUID } from "crypto";
 init_pgSerializer();
 init_global();
 init_mjs();
+init_views();
+import { renderWithTask } from "hanji";
 var pgPushIntrospect = async (db, filters, schemaFilters) => {
   const matchers = filters.map((it) => {
     return new Minimatch(it);
@@ -23994,7 +24060,14 @@ var pgPushIntrospect = async (db, filters, schemaFilters) => {
     }
     return false;
   };
-  const res = await fromDatabase(db, filter2, schemaFilters);
+  const progress = new ProgressView(
+    "Pulling schema from database...",
+    "Pulling schema from database..."
+  );
+  const res = await renderWithTask(
+    progress,
+    fromDatabase(db, filter2, schemaFilters)
+  );
   const schema4 = { id: originUUID, prevId: "", ...res };
   const { internal, ...schemaWithoutInternals } = schema4;
   return { schema: schemaWithoutInternals };
@@ -24412,7 +24485,7 @@ Array.prototype.random = function() {
 
 // src/cli/commands/sqliteIntrospect.ts
 init_mjs();
-import { renderWithTask } from "hanji";
+import { renderWithTask as renderWithTask2 } from "hanji";
 var sqlitePushIntrospect = async (db, filters) => {
   const matchers = filters.map((it) => {
     return new Minimatch(it);
@@ -24427,7 +24500,14 @@ var sqlitePushIntrospect = async (db, filters) => {
     }
     return false;
   };
-  const res = await fromDatabase2(db, filter2);
+  const progress = new ProgressView(
+    "Pulling schema from database...",
+    "Pulling schema from database..."
+  );
+  const res = await renderWithTask2(
+    progress,
+    fromDatabase2(db, filter2)
+  );
   const schema4 = { id: originUUID, prevId: "", ...res };
   return { schema: schema4 };
 };
@@ -24544,7 +24624,7 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
       ).find(
         (c) => SQLiteSquasher.unsquashIdx(c).columns.includes(statement.columnName)
       );
-      const columnIsPk = json1.tables[newTableName].columns[statement.columnName].primaryKey;
+      const columnIsPk = json2.tables[newTableName].columns[statement.columnName].primaryKey;
       const columnIsPartOfFk = Object.values(
         json1.tables[newTableName].foreignKeys
       ).find(
@@ -24628,48 +24708,52 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
         }
       }
     } else if (statement.type === "alter_table_alter_column_set_type" || statement.type === "alter_table_alter_column_set_default" || statement.type === "alter_table_alter_column_drop_default" || statement.type === "alter_table_alter_column_set_notnull" || statement.type === "alter_table_alter_column_drop_notnull" || statement.type === "alter_table_alter_column_drop_autoincrement" || statement.type === "alter_table_alter_column_set_autoincrement" || statement.type === "alter_table_alter_column_drop_pk" || statement.type === "alter_table_alter_column_set_pk") {
-      const newTableName = getOldTableName(statement.tableName, meta);
-      if (statement.type === "alter_table_alter_column_set_notnull" && typeof statement.columnDefault === "undefined") {
-        const res = await connection.query(
-          `select count(*) as count from \`${newTableName}\``
-        );
-        const count2 = Number(res[0].count);
-        if (count2 > 0) {
-          infoToPrint.push(
-            `\xB7 You're about to add not-null constraint to ${source_default.underline(
-              statement.columnName
-            )} column without default value, which contains ${count2} items`
+      if (!(statement.type === "alter_table_alter_column_set_notnull" && statement.columnPk)) {
+        const newTableName = getOldTableName(statement.tableName, meta);
+        if (statement.type === "alter_table_alter_column_set_notnull" && typeof statement.columnDefault === "undefined") {
+          const res = await connection.query(
+            `select count(*) as count from \`${newTableName}\``
           );
-          tablesToTruncate.push(newTableName);
-          shouldAskForApprove = true;
-        }
-        tablesContext[newTableName] = _moveDataStatements(
-          statement.tableName,
-          json2,
-          true
-        );
-      } else {
-        if (typeof tablesContext[newTableName] === "undefined") {
+          const count2 = Number(res[0].count);
+          if (count2 > 0) {
+            infoToPrint.push(
+              `\xB7 You're about to add not-null constraint to ${source_default.underline(
+                statement.columnName
+              )} column without default value, which contains ${count2} items`
+            );
+            tablesToTruncate.push(newTableName);
+            shouldAskForApprove = true;
+          }
           tablesContext[newTableName] = _moveDataStatements(
             statement.tableName,
-            json2
+            json2,
+            true
           );
+        } else {
+          if (typeof tablesContext[newTableName] === "undefined") {
+            tablesContext[newTableName] = _moveDataStatements(
+              statement.tableName,
+              json2
+            );
+          }
         }
-      }
-      const tablesReferncingCurrent = [];
-      for (const table4 of Object.values(json1.tables)) {
-        const tablesRefs = Object.values(json1.tables[table4.name].foreignKeys).filter((t) => SQLiteSquasher.unsquashFK(t).tableTo === newTableName).map((t) => {
-          return getNewTableName(
-            SQLiteSquasher.unsquashFK(t).tableFrom,
-            meta
-          );
-        });
-        tablesReferncingCurrent.push(...tablesRefs);
-      }
-      const uniqueTableRefs = [...new Set(tablesReferncingCurrent)];
-      for (const table4 of uniqueTableRefs) {
-        if (typeof tablesContext[table4] === "undefined") {
-          tablesContext[table4] = [..._moveDataStatements(table4, json2)];
+        const tablesReferncingCurrent = [];
+        for (const table4 of Object.values(json1.tables)) {
+          const tablesRefs = Object.values(json1.tables[table4.name].foreignKeys).filter(
+            (t) => SQLiteSquasher.unsquashFK(t).tableTo === newTableName
+          ).map((t) => {
+            return getNewTableName(
+              SQLiteSquasher.unsquashFK(t).tableFrom,
+              meta
+            );
+          });
+          tablesReferncingCurrent.push(...tablesRefs);
+        }
+        const uniqueTableRefs = [...new Set(tablesReferncingCurrent)];
+        for (const table4 of uniqueTableRefs) {
+          if (typeof tablesContext[table4] === "undefined") {
+            tablesContext[table4] = [..._moveDataStatements(table4, json2)];
+          }
         }
       }
     } else if (statement.type === "create_reference" || statement.type === "delete_reference" || statement.type === "alter_reference") {