drizzle-kit 0.23.2 → 0.24.0

package/api.d.mts

@@ -1411,7 +1411,7 @@ declare const pushMySQLSchema: (imports: Record<string, unknown>, drizzleInstanc
     apply: () => Promise<void>;
 }>;
 declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
-    version: "6";
+    version: "7";
     dialect: "postgresql";
     tables: Record<string, {
         name: string;
@@ -1444,11 +1444,17 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
         }>;
         indexes: Record<string, {
             name: string;
-            columns: string[];
+            columns: {
+                expression: string;
+                isExpression: boolean;
+                asc: boolean;
+                nulls?: string | undefined;
+                opclass?: string | undefined;
+            }[];
             isUnique: boolean;
             method: string;
             concurrently: boolean;
-            with?: Record<string, string> | undefined;
+            with?: Record<string, any> | undefined;
             where?: string | undefined;
         }>;
         foreignKeys: Record<string, {
@@ -1477,6 +1483,16 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
         schema: string;
     }>;
     schemas: Record<string, string>;
+    sequences: Record<string, {
+        name: string;
+        schema: string;
+        increment?: string | undefined;
+        minValue?: string | undefined;
+        maxValue?: string | undefined;
+        startWith?: string | undefined;
+        cache?: string | undefined;
+        cycle?: boolean | undefined;
+    }>;
     _meta: {
         tables: Record<string, string>;
         columns: Record<string, string>;
@@ -1493,6 +1509,6 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
             } | undefined>;
         } | undefined>;
     } | undefined;
-};
+} | Record<string, unknown>;
 
 export { type DrizzleMySQLSnapshotJSON, type DrizzleSQLiteSnapshotJSON, type DrizzleSnapshotJSON, generateDrizzleJson, generateMigration, generateMySQLDrizzleJson, generateMySQLMigration, generateSQLiteDrizzleJson, generateSQLiteMigration, pushMySQLSchema, pushSQLiteSchema, pushSchema, upPgSnapshot };

package/api.d.ts

@@ -1411,7 +1411,7 @@ declare const pushMySQLSchema: (imports: Record<string, unknown>, drizzleInstanc
     apply: () => Promise<void>;
 }>;
 declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
-    version: "6";
+    version: "7";
     dialect: "postgresql";
     tables: Record<string, {
         name: string;
@@ -1444,11 +1444,17 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
         }>;
         indexes: Record<string, {
             name: string;
-            columns: string[];
+            columns: {
+                expression: string;
+                isExpression: boolean;
+                asc: boolean;
+                nulls?: string | undefined;
+                opclass?: string | undefined;
+            }[];
             isUnique: boolean;
             method: string;
             concurrently: boolean;
-            with?: Record<string, string> | undefined;
+            with?: Record<string, any> | undefined;
             where?: string | undefined;
         }>;
         foreignKeys: Record<string, {
@@ -1477,6 +1483,16 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
         schema: string;
     }>;
     schemas: Record<string, string>;
+    sequences: Record<string, {
+        name: string;
+        schema: string;
+        increment?: string | undefined;
+        minValue?: string | undefined;
+        maxValue?: string | undefined;
+        startWith?: string | undefined;
+        cache?: string | undefined;
+        cycle?: boolean | undefined;
+    }>;
     _meta: {
         tables: Record<string, string>;
         columns: Record<string, string>;
@@ -1493,6 +1509,6 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
             } | undefined>;
         } | undefined>;
     } | undefined;
-};
+} | Record<string, unknown>;
 
 export { type DrizzleMySQLSnapshotJSON, type DrizzleSQLiteSnapshotJSON, type DrizzleSnapshotJSON, generateDrizzleJson, generateMigration, generateMySQLDrizzleJson, generateMySQLMigration, generateSQLiteDrizzleJson, generateSQLiteMigration, pushMySQLSchema, pushSQLiteSchema, pushSchema, upPgSnapshot };

package/api.js

@@ -8338,6 +8338,9 @@ var init_sqliteSchema = __esm({
 });
 
 // src/utils.ts
+function isPgArrayType(sqlType) {
+  return sqlType.match(/.*\[\d*\].*|.*\[\].*/g) !== null;
+}
 var copy, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey;
 var init_utils = __esm({
   "src/utils.ts"() {
@@ -8711,14 +8714,14 @@ var require_heap = __commonJS({
         return item;
       };
       heapify = function(array, cmp) {
-        var i, _i2, _j, _len, _ref, _ref1, _results, _results1;
+        var i, _i2, _j2, _len, _ref, _ref1, _results, _results1;
         if (cmp == null) {
           cmp = defaultCmp;
         }
         _ref1 = function() {
           _results1 = [];
-          for (var _j2 = 0, _ref2 = floor(array.length / 2); 0 <= _ref2 ? _j2 < _ref2 : _j2 > _ref2; 0 <= _ref2 ? _j2++ : _j2--) {
-            _results1.push(_j2);
+          for (var _j3 = 0, _ref2 = floor(array.length / 2); 0 <= _ref2 ? _j3 < _ref2 : _j3 > _ref2; 0 <= _ref2 ? _j3++ : _j3--) {
+            _results1.push(_j3);
           }
           return _results1;
         }.apply(this).reverse();
@@ -8759,7 +8762,7 @@ var require_heap = __commonJS({
         return result.sort(cmp).reverse();
       };
       nsmallest = function(array, n, cmp) {
-        var elem, i, los, result, _i2, _j, _len, _ref, _ref1, _results;
+        var elem, i, los, result, _i2, _j2, _len, _ref, _ref1, _results;
         if (cmp == null) {
           cmp = defaultCmp;
         }
@@ -8782,7 +8785,7 @@ var require_heap = __commonJS({
         }
         heapify(array, cmp);
         _results = [];
-        for (i = _j = 0, _ref1 = min2(n, array.length); 0 <= _ref1 ? _j < _ref1 : _j > _ref1; i = 0 <= _ref1 ? ++_j : --_j) {
+        for (i = _j2 = 0, _ref1 = min2(n, array.length); 0 <= _ref1 ? _j2 < _ref1 : _j2 > _ref1; i = 0 <= _ref1 ? ++_j2 : --_j2) {
           _results.push(heappop(array, cmp));
         }
         return _results;
@@ -17477,7 +17480,7 @@ function getTableName(table4) {
 function getTableUniqueName(table4) {
   return `${table4[Schema] ?? "public"}.${table4[TableName]}`;
 }
-var TableName, Schema, Columns, ExtraConfigColumns, OriginalName, BaseName, IsAlias, ExtraConfigBuilder, IsDrizzleTable, _a3, _b, _c, _d, _e, _f, _g, _h, _i, Table2;
+var TableName, Schema, Columns, ExtraConfigColumns, OriginalName, BaseName, IsAlias, ExtraConfigBuilder, IsDrizzleTable, _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, Table2;
 var init_table = __esm({
   "../drizzle-orm/dist/table.js"() {
     "use strict";
@@ -17491,32 +17494,34 @@ var init_table = __esm({
     IsAlias = Symbol.for("drizzle:IsAlias");
     ExtraConfigBuilder = Symbol.for("drizzle:ExtraConfigBuilder");
     IsDrizzleTable = Symbol.for("drizzle:IsDrizzleTable");
-    _i = entityKind, _h = TableName, _g = OriginalName, _f = Schema, _e = Columns, _d = ExtraConfigColumns, _c = BaseName, _b = IsAlias, _a3 = ExtraConfigBuilder;
+    _j = entityKind, _i = TableName, _h = OriginalName, _g = Schema, _f = Columns, _e = ExtraConfigColumns, _d = BaseName, _c = IsAlias, _b = IsDrizzleTable, _a3 = ExtraConfigBuilder;
     Table2 = class {
       constructor(name2, schema4, baseName) {
         /**
          * @internal
          * Can be changed if the table is aliased.
          */
-        __publicField(this, _h);
+        __publicField(this, _i);
         /**
          * @internal
          * Used to store the original name of the table, before any aliasing.
          */
+        __publicField(this, _h);
+        /** @internal */
         __publicField(this, _g);
         /** @internal */
         __publicField(this, _f);
         /** @internal */
         __publicField(this, _e);
-        /** @internal */
-        __publicField(this, _d);
         /**
          *  @internal
          * Used to store the table name before the transformation via the `tableCreator` functions.
          */
-        __publicField(this, _c);
+        __publicField(this, _d);
         /** @internal */
-        __publicField(this, _b, false);
+        __publicField(this, _c, false);
+        /** @internal */
+        __publicField(this, _b, true);
         /** @internal */
         __publicField(this, _a3);
         this[TableName] = this[OriginalName] = name2;
@@ -17524,7 +17529,7 @@ var init_table = __esm({
         this[BaseName] = baseName;
       }
     };
-    __publicField(Table2, _i, "Table");
+    __publicField(Table2, _j, "Table");
     /** @internal */
     __publicField(Table2, "Symbol", {
       Name: TableName,
@@ -18100,7 +18105,7 @@ var version;
 var init_version = __esm({
   "../drizzle-orm/dist/version.js"() {
     "use strict";
-    version = "0.32.2";
+    version = "0.33.0";
   }
 });
 
@@ -18202,6 +18207,12 @@ function fillPlaceholders(params, values) {
       }
       return values[p.name];
     }
+    if (is(p, Param) && is(p.value, Placeholder)) {
+      if (!(p.value.name in values)) {
+        throw new Error(`No value for placeholder "${p.value.name}" was provided`);
+      }
+      return p.encoder.mapToDriverValue(values[p.value.name]);
+    }
     return p;
   });
 }
@@ -18315,6 +18326,9 @@ var init_sql = __esm({
             };
           }
           if (is(chunk, Param)) {
+            if (is(chunk.value, Placeholder)) {
+              return { sql: escapeParam(paramStartIndex.value++, chunk), params: [chunk], typings: ["none"] };
+            }
             const mappedValue = chunk.value === null ? null : chunk.encoder.mapToDriverValue(chunk.value);
             if (is(mappedValue, _SQL)) {
               return this.buildQueryFromSourceParams([mappedValue], config);
@@ -24636,6 +24650,30 @@ function minRangeForIdentityBasedOn(columnType) {
 function stringFromDatabaseIdentityProperty(field) {
   return typeof field === "string" ? field : typeof field === "undefined" ? void 0 : typeof field === "bigint" ? field.toString() : String(field);
 }
+function buildArrayString(array, sqlType) {
+  sqlType = sqlType.split("[")[0];
+  const values = array.map((value) => {
+    if (typeof value === "number" || typeof value === "bigint") {
+      return value.toString();
+    } else if (typeof value === "boolean") {
+      return value ? "true" : "false";
+    } else if (Array.isArray(value)) {
+      return buildArrayString(value, sqlType);
+    } else if (value instanceof Date) {
+      if (sqlType === "date") {
+        return `"${value.toISOString().split("T")[0]}"`;
+      } else if (sqlType === "timestamp") {
+        return `"${value.toISOString().replace("T", " ").slice(0, 23)}"`;
+      } else {
+        return `"${value.toISOString()}"`;
+      }
+    } else if (typeof value === "object") {
+      return `"${JSON.stringify(value).replaceAll('"', '\\"')}"`;
+    }
+    return `"${value}"`;
+  }).join(",");
+  return `{${values}}`;
+}
 var dialect4, indexName, generatePgSnapshot, trimChar, fromDatabase, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
@@ -24646,6 +24684,7 @@ var init_pgSerializer = __esm({
     init_pg_core();
     init_vector3();
     init_outputs();
+    init_utils();
     init_serializer();
     dialect4 = new PgDialect();
     indexName = (tableName, columns) => {
@@ -24752,6 +24791,11 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
                   } else {
                     columnToSet.default = `'${column4.default.toISOString()}'`;
                   }
+                } else if (isPgArrayType(sqlTypeLowered) && Array.isArray(column4.default)) {
+                  columnToSet.default = `'${buildArrayString(
+                    column4.default,
+                    sqlTypeLowered
+                  )}'::${sqlTypeLowered}`;
                 } else {
                   columnToSet.default = column4.default;
                 }
@@ -29031,7 +29075,7 @@ The unique constraint ${source_default.underline.blue(
         primaryKeys.forEach((it) => {
           if (it.columns.length > 1) {
             primaryKeysObject[it.getName()] = {
-              columns: it.columns.map((it2) => it2.name).sort(),
+              columns: it.columns.map((it2) => it2.name),
               name: it.getName()
             };
           } else {
@@ -29156,7 +29200,6 @@ The unique constraint ${source_default.underline.blue(
       }
       for (const [key, value] of Object.entries(tableToPk)) {
         if (value.length > 1) {
-          value.sort();
           result[key].compositePrimaryKeys = {
             [`${key}_${value.join("_")}_pk`]: {
               columns: value,
@@ -33600,7 +33643,7 @@ We have encountered a collision between the index name on columns ${source_defau
           onUpdate = true;
         }
         const newColumn = {
-          default: columnDefault === null ? void 0 : /^-?[\d.]+(?:e-?\d+)?$/.test(columnDefault) && !columnType.startsWith("decimal") ? Number(columnDefault) : isDefaultAnExpression ? clearDefaults(columnDefault, collation) : `'${columnDefault}'`,
+          default: columnDefault === null ? void 0 : /^-?[\d.]+(?:e-?\d+)?$/.test(columnDefault) && !["decimal", "char", "varchar"].some((type) => columnType.startsWith(type)) ? Number(columnDefault) : isDefaultAnExpression ? clearDefaults(columnDefault, collation) : `'${columnDefault}'`,
           autoincrement: isAutoincrement,
           name: columnName,
           type: changedType,
@@ -34817,6 +34860,37 @@ var updateUpToV6 = (json) => {
     enums
   };
 };
+var updateUpToV7 = (json) => {
+  const schema4 = pgSchemaV6.parse(json);
+  const tables = Object.fromEntries(
+    Object.entries(schema4.tables).map((it) => {
+      const table4 = it[1];
+      const mappedIndexes = Object.fromEntries(
+        Object.entries(table4.indexes).map((idx) => {
+          const { columns, ...rest } = idx[1];
+          const mappedColumns = columns.map((it2) => {
+            return {
+              expression: it2,
+              isExpression: false,
+              asc: true,
+              nulls: "last",
+              opClass: void 0
+            };
+          });
+          return [idx[0], { columns: mappedColumns, with: {}, ...rest }];
+        })
+      );
+      return [it[0], { ...table4, indexes: mappedIndexes }];
+    })
+  );
+  return {
+    ...schema4,
+    version: "7",
+    dialect: "postgresql",
+    sequences: {},
+    tables
+  };
+};
 
 // src/cli/commands/sqliteIntrospect.ts
 var import_hanji6 = __toESM(require_hanji());
@@ -35473,7 +35547,13 @@ var pushMySQLSchema = async (imports, drizzleInstance, databaseName) => {
   };
 };
 var upPgSnapshot = (snapshot) => {
-  return updateUpToV6(snapshot);
+  if (snapshot.version === "5") {
+    return updateUpToV7(updateUpToV6(snapshot));
+  }
+  if (snapshot.version === "6") {
+    return updateUpToV7(snapshot);
+  }
+  return snapshot;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/api.mjs

@@ -8343,6 +8343,9 @@ var init_sqliteSchema = __esm({
 });
 
 // src/utils.ts
+function isPgArrayType(sqlType) {
+  return sqlType.match(/.*\[\d*\].*|.*\[\].*/g) !== null;
+}
 var copy, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey;
 var init_utils = __esm({
   "src/utils.ts"() {
@@ -8716,14 +8719,14 @@ var require_heap = __commonJS({
         return item;
       };
       heapify = function(array, cmp) {
-        var i, _i2, _j, _len, _ref, _ref1, _results, _results1;
+        var i, _i2, _j2, _len, _ref, _ref1, _results, _results1;
         if (cmp == null) {
           cmp = defaultCmp;
         }
         _ref1 = function() {
           _results1 = [];
-          for (var _j2 = 0, _ref2 = floor(array.length / 2); 0 <= _ref2 ? _j2 < _ref2 : _j2 > _ref2; 0 <= _ref2 ? _j2++ : _j2--) {
-            _results1.push(_j2);
+          for (var _j3 = 0, _ref2 = floor(array.length / 2); 0 <= _ref2 ? _j3 < _ref2 : _j3 > _ref2; 0 <= _ref2 ? _j3++ : _j3--) {
+            _results1.push(_j3);
           }
           return _results1;
         }.apply(this).reverse();
@@ -8764,7 +8767,7 @@ var require_heap = __commonJS({
         return result.sort(cmp).reverse();
       };
       nsmallest = function(array, n, cmp) {
-        var elem, i, los, result, _i2, _j, _len, _ref, _ref1, _results;
+        var elem, i, los, result, _i2, _j2, _len, _ref, _ref1, _results;
         if (cmp == null) {
           cmp = defaultCmp;
         }
@@ -8787,7 +8790,7 @@ var require_heap = __commonJS({
         }
         heapify(array, cmp);
         _results = [];
-        for (i = _j = 0, _ref1 = min2(n, array.length); 0 <= _ref1 ? _j < _ref1 : _j > _ref1; i = 0 <= _ref1 ? ++_j : --_j) {
+        for (i = _j2 = 0, _ref1 = min2(n, array.length); 0 <= _ref1 ? _j2 < _ref1 : _j2 > _ref1; i = 0 <= _ref1 ? ++_j2 : --_j2) {
           _results.push(heappop(array, cmp));
         }
         return _results;
@@ -17482,7 +17485,7 @@ function getTableName(table4) {
 function getTableUniqueName(table4) {
   return `${table4[Schema] ?? "public"}.${table4[TableName]}`;
 }
-var TableName, Schema, Columns, ExtraConfigColumns, OriginalName, BaseName, IsAlias, ExtraConfigBuilder, IsDrizzleTable, _a3, _b, _c, _d, _e, _f, _g, _h, _i, Table2;
+var TableName, Schema, Columns, ExtraConfigColumns, OriginalName, BaseName, IsAlias, ExtraConfigBuilder, IsDrizzleTable, _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, Table2;
 var init_table = __esm({
   "../drizzle-orm/dist/table.js"() {
     "use strict";
@@ -17496,32 +17499,34 @@ var init_table = __esm({
     IsAlias = Symbol.for("drizzle:IsAlias");
     ExtraConfigBuilder = Symbol.for("drizzle:ExtraConfigBuilder");
     IsDrizzleTable = Symbol.for("drizzle:IsDrizzleTable");
-    _i = entityKind, _h = TableName, _g = OriginalName, _f = Schema, _e = Columns, _d = ExtraConfigColumns, _c = BaseName, _b = IsAlias, _a3 = ExtraConfigBuilder;
+    _j = entityKind, _i = TableName, _h = OriginalName, _g = Schema, _f = Columns, _e = ExtraConfigColumns, _d = BaseName, _c = IsAlias, _b = IsDrizzleTable, _a3 = ExtraConfigBuilder;
     Table2 = class {
       constructor(name2, schema4, baseName) {
         /**
          * @internal
          * Can be changed if the table is aliased.
          */
-        __publicField(this, _h);
+        __publicField(this, _i);
         /**
          * @internal
          * Used to store the original name of the table, before any aliasing.
          */
+        __publicField(this, _h);
+        /** @internal */
         __publicField(this, _g);
         /** @internal */
         __publicField(this, _f);
         /** @internal */
         __publicField(this, _e);
-        /** @internal */
-        __publicField(this, _d);
         /**
          *  @internal
          * Used to store the table name before the transformation via the `tableCreator` functions.
          */
-        __publicField(this, _c);
+        __publicField(this, _d);
         /** @internal */
-        __publicField(this, _b, false);
+        __publicField(this, _c, false);
+        /** @internal */
+        __publicField(this, _b, true);
         /** @internal */
         __publicField(this, _a3);
         this[TableName] = this[OriginalName] = name2;
@@ -17529,7 +17534,7 @@ var init_table = __esm({
         this[BaseName] = baseName;
       }
     };
-    __publicField(Table2, _i, "Table");
+    __publicField(Table2, _j, "Table");
     /** @internal */
     __publicField(Table2, "Symbol", {
       Name: TableName,
@@ -18105,7 +18110,7 @@ var version;
 var init_version = __esm({
   "../drizzle-orm/dist/version.js"() {
     "use strict";
-    version = "0.32.2";
+    version = "0.33.0";
   }
 });
 
@@ -18207,6 +18212,12 @@ function fillPlaceholders(params, values) {
       }
       return values[p.name];
     }
+    if (is(p, Param) && is(p.value, Placeholder)) {
+      if (!(p.value.name in values)) {
+        throw new Error(`No value for placeholder "${p.value.name}" was provided`);
+      }
+      return p.encoder.mapToDriverValue(values[p.value.name]);
+    }
     return p;
   });
 }
@@ -18320,6 +18331,9 @@ var init_sql = __esm({
             };
           }
           if (is(chunk, Param)) {
+            if (is(chunk.value, Placeholder)) {
+              return { sql: escapeParam(paramStartIndex.value++, chunk), params: [chunk], typings: ["none"] };
+            }
             const mappedValue = chunk.value === null ? null : chunk.encoder.mapToDriverValue(chunk.value);
             if (is(mappedValue, _SQL)) {
               return this.buildQueryFromSourceParams([mappedValue], config);
@@ -24641,6 +24655,30 @@ function minRangeForIdentityBasedOn(columnType) {
 function stringFromDatabaseIdentityProperty(field) {
   return typeof field === "string" ? field : typeof field === "undefined" ? void 0 : typeof field === "bigint" ? field.toString() : String(field);
 }
+function buildArrayString(array, sqlType) {
+  sqlType = sqlType.split("[")[0];
+  const values = array.map((value) => {
+    if (typeof value === "number" || typeof value === "bigint") {
+      return value.toString();
+    } else if (typeof value === "boolean") {
+      return value ? "true" : "false";
+    } else if (Array.isArray(value)) {
+      return buildArrayString(value, sqlType);
+    } else if (value instanceof Date) {
+      if (sqlType === "date") {
+        return `"${value.toISOString().split("T")[0]}"`;
+      } else if (sqlType === "timestamp") {
+        return `"${value.toISOString().replace("T", " ").slice(0, 23)}"`;
+      } else {
+        return `"${value.toISOString()}"`;
+      }
+    } else if (typeof value === "object") {
+      return `"${JSON.stringify(value).replaceAll('"', '\\"')}"`;
+    }
+    return `"${value}"`;
+  }).join(",");
+  return `{${values}}`;
+}
 var dialect4, indexName, generatePgSnapshot, trimChar, fromDatabase, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
@@ -24651,6 +24689,7 @@ var init_pgSerializer = __esm({
     init_pg_core();
     init_vector3();
     init_outputs();
+    init_utils();
     init_serializer();
     dialect4 = new PgDialect();
     indexName = (tableName, columns) => {
@@ -24757,6 +24796,11 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
                   } else {
                     columnToSet.default = `'${column4.default.toISOString()}'`;
                   }
+                } else if (isPgArrayType(sqlTypeLowered) && Array.isArray(column4.default)) {
+                  columnToSet.default = `'${buildArrayString(
+                    column4.default,
+                    sqlTypeLowered
+                  )}'::${sqlTypeLowered}`;
                 } else {
                   columnToSet.default = column4.default;
                 }
@@ -29036,7 +29080,7 @@ The unique constraint ${source_default.underline.blue(
         primaryKeys.forEach((it) => {
           if (it.columns.length > 1) {
             primaryKeysObject[it.getName()] = {
-              columns: it.columns.map((it2) => it2.name).sort(),
+              columns: it.columns.map((it2) => it2.name),
               name: it.getName()
             };
           } else {
@@ -29161,7 +29205,6 @@ The unique constraint ${source_default.underline.blue(
       }
       for (const [key, value] of Object.entries(tableToPk)) {
         if (value.length > 1) {
-          value.sort();
           result[key].compositePrimaryKeys = {
             [`${key}_${value.join("_")}_pk`]: {
               columns: value,
@@ -33605,7 +33648,7 @@ We have encountered a collision between the index name on columns ${source_defau
           onUpdate = true;
         }
         const newColumn = {
-          default: columnDefault === null ? void 0 : /^-?[\d.]+(?:e-?\d+)?$/.test(columnDefault) && !columnType.startsWith("decimal") ? Number(columnDefault) : isDefaultAnExpression ? clearDefaults(columnDefault, collation) : `'${columnDefault}'`,
+          default: columnDefault === null ? void 0 : /^-?[\d.]+(?:e-?\d+)?$/.test(columnDefault) && !["decimal", "char", "varchar"].some((type) => columnType.startsWith(type)) ? Number(columnDefault) : isDefaultAnExpression ? clearDefaults(columnDefault, collation) : `'${columnDefault}'`,
           autoincrement: isAutoincrement,
           name: columnName,
           type: changedType,
@@ -34808,6 +34851,37 @@ var updateUpToV6 = (json) => {
     enums
   };
 };
+var updateUpToV7 = (json) => {
+  const schema4 = pgSchemaV6.parse(json);
+  const tables = Object.fromEntries(
+    Object.entries(schema4.tables).map((it) => {
+      const table4 = it[1];
+      const mappedIndexes = Object.fromEntries(
+        Object.entries(table4.indexes).map((idx) => {
+          const { columns, ...rest } = idx[1];
+          const mappedColumns = columns.map((it2) => {
+            return {
+              expression: it2,
+              isExpression: false,
+              asc: true,
+              nulls: "last",
+              opClass: void 0
+            };
+          });
+          return [idx[0], { columns: mappedColumns, with: {}, ...rest }];
+        })
+      );
+      return [it[0], { ...table4, indexes: mappedIndexes }];
+    })
+  );
+  return {
+    ...schema4,
+    version: "7",
+    dialect: "postgresql",
+    sequences: {},
+    tables
+  };
+};
 
 // src/cli/commands/sqliteIntrospect.ts
 var import_hanji6 = __toESM(require_hanji());
@@ -35464,7 +35538,13 @@ var pushMySQLSchema = async (imports, drizzleInstance, databaseName) => {
   };
 };
 var upPgSnapshot = (snapshot) => {
-  return updateUpToV6(snapshot);
+  if (snapshot.version === "5") {
+    return updateUpToV7(updateUpToV6(snapshot));
+  }
+  if (snapshot.version === "6") {
+    return updateUpToV7(snapshot);
+  }
+  return snapshot;
 };
 export {
   generateDrizzleJson,

package/bin.cjs

@@ -6561,6 +6561,9 @@ var init_sqliteSchema = __esm({
 });
 
 // src/utils.ts
+function isPgArrayType(sqlType) {
+  return sqlType.match(/.*\[\d*\].*|.*\[\].*/g) !== null;
+}
 var import_fs, import_path, import_url, copy, objectValues, assertV1OutFolder, dryJournal, prepareOutFolder, validatorForDialect, validateWithReport, prepareMigrationFolder, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey, normaliseSQLiteUrl;
 var init_utils = __esm({
   "src/utils.ts"() {
@@ -18107,7 +18110,7 @@ We have encountered a collision between the index name on columns ${source_defau
           onUpdate = true;
         }
         const newColumn = {
-          default: columnDefault === null ? void 0 : /^-?[\d.]+(?:e-?\d+)?$/.test(columnDefault) && !columnType.startsWith("decimal") ? Number(columnDefault) : isDefaultAnExpression ? clearDefaults(columnDefault, collation) : `'${columnDefault}'`,
+          default: columnDefault === null ? void 0 : /^-?[\d.]+(?:e-?\d+)?$/.test(columnDefault) && !["decimal", "char", "varchar"].some((type) => columnType.startsWith(type)) ? Number(columnDefault) : isDefaultAnExpression ? clearDefaults(columnDefault, collation) : `'${columnDefault}'`,
           autoincrement: isAutoincrement,
           name: columnName,
           type: changedType,
@@ -18406,6 +18409,30 @@ function minRangeForIdentityBasedOn(columnType) {
 function stringFromDatabaseIdentityProperty(field) {
   return typeof field === "string" ? field : typeof field === "undefined" ? void 0 : typeof field === "bigint" ? field.toString() : String(field);
 }
+function buildArrayString(array, sqlType) {
+  sqlType = sqlType.split("[")[0];
+  const values = array.map((value) => {
+    if (typeof value === "number" || typeof value === "bigint") {
+      return value.toString();
+    } else if (typeof value === "boolean") {
+      return value ? "true" : "false";
+    } else if (Array.isArray(value)) {
+      return buildArrayString(value, sqlType);
+    } else if (value instanceof Date) {
+      if (sqlType === "date") {
+        return `"${value.toISOString().split("T")[0]}"`;
+      } else if (sqlType === "timestamp") {
+        return `"${value.toISOString().replace("T", " ").slice(0, 23)}"`;
+      } else {
+        return `"${value.toISOString()}"`;
+      }
+    } else if (typeof value === "object") {
+      return `"${JSON.stringify(value).replaceAll('"', '\\"')}"`;
+    }
+    return `"${value}"`;
+  }).join(",");
+  return `{${values}}`;
+}
 var import_drizzle_orm5, import_pg_core2, import_pg_core3, dialect5, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
@@ -18416,6 +18443,7 @@ var init_pgSerializer = __esm({
     import_pg_core3 = require("drizzle-orm/pg-core");
     init_vector();
     init_outputs();
+    init_utils();
     init_serializer();
     dialect5 = new import_pg_core2.PgDialect();
     indexName2 = (tableName, columns) => {
@@ -18524,6 +18552,11 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
                   } else {
                     columnToSet.default = `'${column7.default.toISOString()}'`;
                   }
+                } else if (isPgArrayType(sqlTypeLowered) && Array.isArray(column7.default)) {
+                  columnToSet.default = `'${buildArrayString(
+                    column7.default,
+                    sqlTypeLowered
+                  )}'::${sqlTypeLowered}`;
                 } else {
                   columnToSet.default = column7.default;
                 }
@@ -19570,7 +19603,7 @@ The unique constraint ${source_default.underline.blue(
         primaryKeys.forEach((it) => {
           if (it.columns.length > 1) {
             primaryKeysObject[it.getName()] = {
-              columns: it.columns.map((it2) => it2.name).sort(),
+              columns: it.columns.map((it2) => it2.name),
               name: it.getName()
             };
           } else {
@@ -19696,7 +19729,6 @@ The unique constraint ${source_default.underline.blue(
       }
       for (const [key, value] of Object.entries(tableToPk)) {
         if (value.length > 1) {
-          value.sort();
           result[key].compositePrimaryKeys = {
             [`${key}_${value.join("_")}_pk`]: {
               columns: value,
@@ -75265,6 +75297,7 @@ var init_introspect_mysql = __esm({
             patched = patched.startsWith("datetime(") ? "datetime" : patched;
             patched = patched.startsWith("varbinary(") ? "varbinary" : patched;
             patched = patched.startsWith("int(") ? "int" : patched;
+            patched = patched.startsWith("double(") ? "double" : patched;
             return patched;
           }).filter((type) => {
             return mysqlImportsList.has(type);
@@ -83369,7 +83402,7 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.23.2";
+  const envVersion = "0.24.0";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

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

package/utils.js

@@ -568,6 +568,7 @@ __export(utils_exports, {
   columnRenameKey: () => columnRenameKey,
   copy: () => copy,
   dryJournal: () => dryJournal,
+  isPgArrayType: () => isPgArrayType,
   kloudMeta: () => kloudMeta,
   normaliseSQLiteUrl: () => normaliseSQLiteUrl,
   objectValues: () => objectValues,
@@ -5738,12 +5739,16 @@ var normaliseSQLiteUrl = (it, type) => {
   }
   assertUnreachable(type);
 };
+function isPgArrayType(sqlType) {
+  return sqlType.match(/.*\[\d*\].*|.*\[\].*/g) !== null;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   assertV1OutFolder,
   columnRenameKey,
   copy,
   dryJournal,
+  isPgArrayType,
   kloudMeta,
   normaliseSQLiteUrl,
   objectValues,

package/utils.mjs

@@ -5720,11 +5720,15 @@ var normaliseSQLiteUrl = (it, type) => {
   }
   assertUnreachable(type);
 };
+function isPgArrayType(sqlType) {
+  return sqlType.match(/.*\[\d*\].*|.*\[\].*/g) !== null;
+}
 export {
   assertV1OutFolder,
   columnRenameKey,
   copy,
   dryJournal,
+  isPgArrayType,
   kloudMeta,
   normaliseSQLiteUrl,
   objectValues,