drizzle-kit 0.30.5-f8a2f3c → 0.30.6-29155cc

package/bin.cjs

@@ -20102,6 +20102,13 @@ function extractGeneratedColumns(input) {
   }
   return columns;
 }
+function filterIgnoredTablesByField(fieldName) {
+  return `${fieldName} != '__drizzle_migrations'
+			AND ${fieldName} NOT LIKE '\\_cf\\_%' ESCAPE '\\'
+			AND ${fieldName} NOT LIKE '\\_litestream\\_%' ESCAPE '\\'
+			AND ${fieldName} NOT LIKE 'libsql\\_%' ESCAPE '\\'
+			AND ${fieldName} NOT LIKE 'sqlite\\_%' ESCAPE '\\'`;
+}
 var import_drizzle_orm6, import_sqlite_core2, generateSqliteSnapshot, fromDatabase3;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
@@ -20406,29 +20413,26 @@ ${withStyle.errorWarning(
     fromDatabase3 = async (db, tablesFilter = (table6) => true, progressCallback) => {
       const result = {};
       const resultViews = {};
-      const columns = await db.query(
-        `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, p.hidden as hidden, m.sql, m.type as type
-    FROM sqlite_master AS m JOIN pragma_table_xinfo(m.name) AS p
-    WHERE (m.type = 'table' OR m.type = 'view')
-    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 columns = await db.query(`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,
+		  p.hidden as hidden,
+		  m.sql,
+		  m.type as type
+		FROM sqlite_master AS m
+		JOIN pragma_table_xinfo(m.name) AS p
+		WHERE (m.type = 'table' OR m.type = 'view') 
+		  AND ${filterIgnoredTablesByField("m.tbl_name")};`);
       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 tbl_name != '_cf_KV' 
-    and sql GLOB '*[ *' || CHAR(9) || CHAR(10) || CHAR(13) || ']AUTOINCREMENT[^'']*';`
-      );
+      const seq = await db.query(`SELECT
+		  *
+		FROM sqlite_master
+		WHERE sql GLOB '*[ *' || CHAR(9) || CHAR(10) || CHAR(13) || ']AUTOINCREMENT[^'']*'
+    	  AND ${filterIgnoredTablesByField("tbl_name")};`);
       for (const s2 of seq) {
         tablesWithSeq.push(s2.name);
       }
@@ -20523,11 +20527,19 @@ ${withStyle.errorWarning(
         progressCallback("tables", tablesCount.size, "done");
       }
       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 
-      where m.tbl_name != '_cf_KV';`
-        );
+        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
+      		WHERE ${filterIgnoredTablesByField("m.tbl_name")};`);
         const fkByTableName = {};
         for (const fkRow of fks) {
           foreignKeysCount += 1;
@@ -20574,21 +20586,20 @@ ${withStyle.errorWarning(
       if (progressCallback) {
         progressCallback("fks", foreignKeysCount, "done");
       }
-      const idxs = await db.query(
-        `SELECT 
-    m.tbl_name as tableName,
-    il.name as indexName,
-    ii.name as columnName,
-    il.[unique] as isUnique,
-    il.seq as seq
-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_%'
-    and m.tbl_name != '_cf_KV';`
-      );
+      const idxs = await db.query(`SELECT 
+    	  m.tbl_name as tableName,
+    	  il.name as indexName,
+    	  ii.name as columnName,
+    	  il.[unique] as isUnique,
+    	  il.seq as seq
+		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\\_%' ESCAPE '\\'
+    	  AND ${filterIgnoredTablesByField("m.tbl_name")};`);
       for (const idxRow of idxs) {
         const tableName = idxRow.tableName;
         const constraintName = idxRow.indexName;
@@ -20648,9 +20659,12 @@ WHERE
       const unnamedCheckPattern = /CHECK\s*\((.*?)\)/gi;
       let checkCounter = 0;
       const checkConstraints = {};
-      const checks = await db.query(`SELECT name as "tableName", sql as "sql"
+      const checks = await db.query(`SELECT
+		  name as "tableName",
+		  sql as "sql"
 		FROM sqlite_master 
-		WHERE type = 'table' AND name != 'sqlite_sequence';`);
+		WHERE type = 'table'
+		  AND ${filterIgnoredTablesByField("tbl_name")};`);
       for (const check2 of checks) {
         if (!tablesFilter(check2.tableName))
           continue;
@@ -82010,18 +82024,17 @@ var init_push = __esm({
           (0, import_hanji13.render)(`
 [${source_default.blue("i")}] No changes detected`);
         } else {
-          if (!("driver" in credentials2)) {
-            await db.run("begin");
-            try {
-              for (const dStmnt of statementsToExecute) {
-                await db.run(dStmnt);
-              }
-              await db.run("commit");
-            } catch (e2) {
-              console.error(e2);
-              await db.run("rollback");
-              process.exit(1);
+          const isNotD1 = !("driver" in credentials2 && credentials2.driver === "d1-http");
+          isNotD1 ?? await db.run("begin");
+          try {
+            for (const dStmnt of statementsToExecute) {
+              await db.run(dStmnt);
             }
+            isNotD1 ?? await db.run("commit");
+          } catch (e2) {
+            console.error(e2);
+            isNotD1 ?? await db.run("rollback");
+            process.exit(1);
           }
           (0, import_hanji13.render)(`[${source_default.green("\u2713")}] Changes applied`);
         }
@@ -92615,7 +92628,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.30.5-f8a2f3c";
+  const envVersion = "0.30.6-29155cc";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.30.5-f8a2f3c",
+	"version": "0.30.6-29155cc",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",