drizzle-kit 1.0.0-beta.1-2e234ba → 1.0.0-beta.1-9e70ee7

package/bin.cjs

@@ -7865,6 +7865,9 @@ function escapeSingleQuotes(str) {
   return str.replace(/'/g, "''");
 }
 function unescapeSingleQuotes(str, ignoreFirstAndLastChar) {
+  if (str === "''") {
+    return str;
+  }
   const regex = ignoreFirstAndLastChar ? /(?<!^)'(?!$)/g : /'/g;
   return str.replace(/''/g, "'").replace(regex, "\\'");
 }
@@ -18444,6 +18447,30 @@ function prepareRoles(entities) {
   }
   return { useRoles, includeRoles, excludeRoles };
 }
+function parsePgArray(input) {
+  const content = input.slice(1, -1);
+  const result = [];
+  let current = "";
+  let inQuotes = false;
+  for (let i2 = 0; i2 < content.length; i2++) {
+    const char = content[i2];
+    if (char === '"') {
+      if (inQuotes && content[i2 + 1] === '"') {
+        current += '"';
+        i2++;
+      } else {
+        inQuotes = !inQuotes;
+      }
+    } else if (char === "," && !inQuotes) {
+      result.push(current);
+      current = "";
+    } else {
+      current += char;
+    }
+  }
+  result.push(current);
+  return result.map((item) => item.trim());
+}
 var import_drizzle_orm4, import_pg_core2, indexName2, generatePgSnapshot, trimChar, fromDatabase2, defaultForColumn, getColumnsInfoQuery;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
@@ -19308,74 +19335,77 @@ WHERE
             }
             const tableForeignKeys = await db.query(
               `SELECT
-            con.contype AS constraint_type,
-            nsp.nspname AS constraint_schema,
-            con.conname AS constraint_name,
-            rel.relname AS table_name,
-            att.attname AS column_name,
-            fnsp.nspname AS foreign_table_schema,
-            frel.relname AS foreign_table_name,
-            fatt.attname AS foreign_column_name,
-            CASE con.confupdtype
-              WHEN 'a' THEN 'NO ACTION'
-              WHEN 'r' THEN 'RESTRICT'
-              WHEN 'n' THEN 'SET NULL'
-              WHEN 'c' THEN 'CASCADE'
-              WHEN 'd' THEN 'SET DEFAULT'
-            END AS update_rule,
-            CASE con.confdeltype
-              WHEN 'a' THEN 'NO ACTION'
-              WHEN 'r' THEN 'RESTRICT'
-              WHEN 'n' THEN 'SET NULL'
-              WHEN 'c' THEN 'CASCADE'
-              WHEN 'd' THEN 'SET DEFAULT'
-            END AS delete_rule
-          FROM
-            pg_catalog.pg_constraint con
-            JOIN pg_catalog.pg_class rel ON rel.oid = con.conrelid
-            JOIN pg_catalog.pg_namespace nsp ON nsp.oid = con.connamespace
-            LEFT JOIN pg_catalog.pg_attribute att ON att.attnum = ANY (con.conkey)
-              AND att.attrelid = con.conrelid
-            LEFT JOIN pg_catalog.pg_class frel ON frel.oid = con.confrelid
-            LEFT JOIN pg_catalog.pg_namespace fnsp ON fnsp.oid = frel.relnamespace
-            LEFT JOIN pg_catalog.pg_attribute fatt ON fatt.attnum = ANY (con.confkey)
-              AND fatt.attrelid = con.confrelid
-          WHERE
-            nsp.nspname = '${tableSchema}'
-            AND rel.relname = '${tableName}'
-            AND con.contype IN ('f');`
+    con.contype::text AS constraint_type,
+    nsp.nspname AS constraint_schema,
+    con.conname AS constraint_name,
+    rel.relname AS table_name,
+    pg_get_constraintdef(con.oid) AS expression,
+    fnsp.nspname AS foreign_table_schema,
+    frel.relname AS foreign_table_name,
+    -- Aggregate the local column names in order
+    array_agg(att.attname ORDER BY gs.n) AS column_names,
+    -- Aggregate the column order numbers (which will be 1,2,...)
+    array_agg(gs.n ORDER BY gs.n) AS column_positions,
+    -- Aggregate the foreign (referenced) column names in order
+    array_agg(fatt.attname ORDER BY gs.n) AS foreign_column_names,
+    CASE con.confupdtype
+         WHEN 'a' THEN 'NO ACTION'
+         WHEN 'r' THEN 'RESTRICT'
+         WHEN 'n' THEN 'SET NULL'
+         WHEN 'c' THEN 'CASCADE'
+         WHEN 'd' THEN 'SET DEFAULT'
+    END AS update_rule,
+    CASE con.confdeltype
+         WHEN 'a' THEN 'NO ACTION'
+         WHEN 'r' THEN 'RESTRICT'
+         WHEN 'n' THEN 'SET NULL'
+         WHEN 'c' THEN 'CASCADE'
+         WHEN 'd' THEN 'SET DEFAULT'
+    END AS delete_rule
+FROM pg_constraint con
+JOIN pg_namespace nsp ON nsp.oid = con.connamespace
+JOIN pg_class rel ON rel.oid = con.conrelid
+-- Unnest the array of referencing column numbers with ordinality
+JOIN LATERAL unnest(con.conkey) WITH ORDINALITY AS gs(attnum, n) ON true
+JOIN pg_attribute att 
+       ON att.attrelid = con.conrelid 
+      AND att.attnum = gs.attnum
+LEFT JOIN pg_class frel ON frel.oid = con.confrelid
+LEFT JOIN pg_namespace fnsp ON fnsp.oid = frel.relnamespace
+-- Unnest the array of referenced column numbers in the same order
+JOIN LATERAL unnest(con.confkey) WITH ORDINALITY AS gs2(attnum, n) ON gs.n = gs2.n
+JOIN pg_attribute fatt 
+       ON fatt.attrelid = con.confrelid 
+      AND fatt.attnum = gs2.attnum
+WHERE con.contype = 'f'
+  AND rel.relname = '${tableName}'
+  AND nsp.nspname = '${tableSchema}'
+GROUP BY con.oid, nsp.nspname, con.conname, rel.relname, fnsp.nspname, frel.relname,
+         con.contype, con.confupdtype, con.confdeltype
+ORDER BY con.conname;`
             );
             foreignKeysCount += tableForeignKeys.length;
             if (progressCallback) {
               progressCallback("fks", foreignKeysCount, "fetching");
             }
             for (const fk5 of tableForeignKeys) {
-              const columnFrom = fk5.column_name;
+              const columnsFrom = parsePgArray(fk5.column_names);
               const tableTo = fk5.foreign_table_name;
-              const columnTo = fk5.foreign_column_name;
+              const columnsTo = parsePgArray(fk5.foreign_column_names);
               const schemaTo = fk5.foreign_table_schema;
               const foreignKeyName = fk5.constraint_name;
               const onUpdate = (_a = fk5.update_rule) == null ? void 0 : _a.toLowerCase();
               const onDelete = (_b = fk5.delete_rule) == null ? void 0 : _b.toLowerCase();
-              if (typeof foreignKeysToReturn[foreignKeyName] !== "undefined") {
-                foreignKeysToReturn[foreignKeyName].columnsFrom.push(columnFrom);
-                foreignKeysToReturn[foreignKeyName].columnsTo.push(columnTo);
-              } else {
-                foreignKeysToReturn[foreignKeyName] = {
-                  name: foreignKeyName,
-                  tableFrom: tableName,
-                  tableTo,
-                  schemaTo,
-                  columnsFrom: [columnFrom],
-                  columnsTo: [columnTo],
-                  onDelete,
-                  onUpdate
-                };
-              }
-              foreignKeysToReturn[foreignKeyName].columnsFrom = [
-                ...new Set(foreignKeysToReturn[foreignKeyName].columnsFrom)
-              ];
-              foreignKeysToReturn[foreignKeyName].columnsTo = [...new Set(foreignKeysToReturn[foreignKeyName].columnsTo)];
+              foreignKeysToReturn[foreignKeyName] = {
+                name: foreignKeyName,
+                tableFrom: tableName,
+                tableTo,
+                schemaTo,
+                columnsFrom,
+                columnsTo,
+                onDelete,
+                onUpdate
+              };
             }
             const uniqueConstrainsRows = tableConstraints.filter((mapRow) => mapRow.constraint_type === "UNIQUE");
             for (const unqs of uniqueConstrainsRows) {
@@ -20102,6 +20132,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 +20443,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 +20557,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 +20616,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 +20689,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;
@@ -82011,18 +82055,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`);
         }
@@ -84323,6 +84366,7 @@ var init_introspect_pg = __esm({
       "interval",
       "cidr",
       "inet",
+      "bytea",
       "macaddr",
       "macaddr8",
       "bigint",
@@ -84417,7 +84461,7 @@ var init_introspect_pg = __esm({
         return escapeColumnKey4(value);
       }
       if (casing2 === "camel") {
-        return escapeColumnKey4(value.camelCase());
+        return escapeColumnKey4((0, import_casing5.toCamelCase)(value));
       }
       assertUnreachable(casing2);
     };
@@ -84700,6 +84744,9 @@ import { sql } from "drizzle-orm"
       if (enumTypes.has(`${typeSchema}.${type.replace("[]", "")}`)) {
         return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault4(unescapeSingleQuotes(defaultValue, true), isExpression)})` : "";
       }
+      if (lowered.startsWith("bytea")) {
+        return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault4(defaultValue, isExpression)})` : "";
+      }
       if (lowered.startsWith("integer")) {
         return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault4(defaultValue, isExpression)})` : "";
       }
@@ -84797,6 +84844,10 @@ import { sql } from "drizzle-orm"
       if (lowered.startsWith("bigserial")) {
         return `${withCasing3(name, casing2)}: bigserial(${dbColumnName4({ name, casing: casing2, withMode: true })}{ mode: "bigint" })`;
       }
+      if (lowered.startsWith("bytea")) {
+        let out = `${withCasing3(name, casing2)}: bytea(${dbColumnName4({ name, casing: casing2 })})`;
+        return out;
+      }
       if (lowered.startsWith("integer")) {
         let out = `${withCasing3(name, casing2)}: integer(${dbColumnName4({ name, casing: casing2 })})`;
         return out;
@@ -86204,11 +86255,14 @@ var init_introspect = __esm({
             }
             tableRelations[toTable2].push({
               name: (0, import_pluralize.plural)(toTable1),
-              type: "many",
+              type: "many-through",
               tableFrom: tableFrom2,
               columnsFrom: fk22.columnsFrom,
               tableTo: toTable2,
-              columnsTo: columnsTo2
+              columnsTo: columnsTo2,
+              tableThrough,
+              columnsThroughFrom,
+              columnsThroughTo
             });
           }
         } else {
@@ -86267,7 +86321,7 @@ import * as schema from "./schema";
               (it, originIndex) => relationIndex !== originIndex && it.name === relation.name
             );
             if (hasDuplicatedRelation) {
-              name = `${relation.name}_${relation.type === "one" ? relation.columnsFrom.join("_") : relation.columnsTo.join("_")}`;
+              name = `${relation.name}_${relation.type === "through" ? `via_${relation.tableThrough}` : relation.type === "many-through" ? `via_${relation.tableThrough}` : relation.type === "one" ? relation.columnsFrom.join("_") : relation.columnsTo.join("_")}`;
             }
             return {
               ...relation,
@@ -86288,14 +86342,14 @@ import * as schema from "./schema";
 			to: ${to}` + (relation.relationName ? `,
 			alias: "${relation.relationName}"` : "") + `
 		}),`;
-          } else if (relation.type === "many") {
+          } else if (relation.type === "many" || relation.type === "many-through") {
             relationString += `
 		${relation.name}: r.many.${relation.tableTo}(` + (relation.relationName ? `{
 			alias: "${relation.relationName}"
 		}` : "") + `),`;
           } else {
             const from = relation.columnsThroughFrom.length === 1 ? `r.${relation.tableFrom}.${relation.columnsFrom[0]}.through(r.${relation.tableThrough}.${relation.columnsThroughFrom[0]})` : `[${relation.columnsThroughFrom.map((it) => `r.${relation.tableFrom}.${it}.through(${relation.tableThrough}.${it})`).join(", ")}]`;
-            const to = relation.columnsThroughTo.length === 1 ? `r.${relation.tableTo}.${relation.columnsThroughTo[0]}.through(r.${relation.tableThrough}.${relation.columnsThroughTo[0]})` : `[${relation.columnsThroughTo.map((it) => `r.${relation.tableTo}.${it}.through(${relation.tableThrough}.${it})`).join(", ")}]`;
+            const to = relation.columnsThroughTo.length === 1 ? `r.${relation.tableTo}.${relation.columnsTo[0]}.through(r.${relation.tableThrough}.${relation.columnsThroughTo[0]})` : `[${relation.columnsThroughTo.map((it) => `r.${relation.tableTo}.${it}.through(${relation.tableThrough}.${it})`).join(", ")}]`;
             relationString += `
 		${relation.name}: r.many.${relation.tableTo}({
 			from: ${from},
@@ -92667,7 +92721,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "1.0.0-beta.1-2e234ba";
+  const envVersion = "1.0.0-beta.1-9e70ee7";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "1.0.0-beta.1-2e234ba",
+	"version": "1.0.0-beta.1-9e70ee7",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",

package/utils.js

@@ -6254,6 +6254,9 @@ function escapeSingleQuotes(str) {
   return str.replace(/'/g, "''");
 }
 function unescapeSingleQuotes(str, ignoreFirstAndLastChar) {
+  if (str === "''") {
+    return str;
+  }
   const regex = ignoreFirstAndLastChar ? /(?<!^)'(?!$)/g : /'/g;
   return str.replace(/''/g, "'").replace(regex, "\\'");
 }

package/utils.mjs

@@ -6231,6 +6231,9 @@ function escapeSingleQuotes(str) {
   return str.replace(/'/g, "''");
 }
 function unescapeSingleQuotes(str, ignoreFirstAndLastChar) {
+  if (str === "''") {
+    return str;
+  }
   const regex = ignoreFirstAndLastChar ? /(?<!^)'(?!$)/g : /'/g;
   return str.replace(/''/g, "'").replace(regex, "\\'");
 }