drizzle-kit 1.0.0-beta.1-ec0aae1 → 1.0.0-beta.1-6b935a0

package/api.js

@@ -22282,6 +22282,14 @@ var init_common2 = __esm({
         }
         return value.map((v) => this.baseColumn.mapFromDriverValue(v));
       }
+      // Needed for arrays of custom types
+      mapFromJsonValue(value) {
+        if (typeof value === "string") {
+          value = parsePgArray(value);
+        }
+        const base = this.baseColumn;
+        return "mapFromJsonValue" in base ? value.map((v) => base.mapFromJsonValue(v)) : value.map((v) => base.mapFromDriverValue(v));
+      }
       mapToDriverValue(value, isNestedArray = false) {
         const a = value.map(
           (v) => v === null ? null : is(this.baseColumn, _PgArray) ? this.baseColumn.mapToDriverValue(v, true) : this.baseColumn.mapToDriverValue(v)
@@ -23403,7 +23411,7 @@ function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (valu
     } else {
       decoder = field.getSQL().decoder;
     }
-    row[selectionItem.key] = decoder.mapFromDriverValue(value);
+    row[selectionItem.key] = "mapFromJsonValue" in decoder ? decoder.mapFromJsonValue(value) : decoder.mapFromDriverValue(value);
   }
   return row;
 }
@@ -23945,6 +23953,9 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
       gte,
       ilike,
       inArray,
+      arrayContains,
+      arrayContained,
+      arrayOverlaps,
       isNull,
       isNotNull,
       like,
@@ -24733,6 +24744,15 @@ var init_bytea = __esm({
     };
     __publicField(PgByteaBuilder, _a58, "PgByteaBuilder");
     PgBytea = class extends (_b29 = PgColumn, _a59 = entityKind, _b29) {
+      mapFromDriverValue(value) {
+        if (Buffer.isBuffer(value))
+          return value;
+        if (typeof value === "string") {
+          const trimmed = value.slice(2, value.length);
+          return Buffer.from(trimmed, "hex");
+        }
+        return Buffer.from(value);
+      }
       getSQLType() {
         return "bytea";
       }
@@ -24846,9 +24866,13 @@ var init_custom = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
+        __publicField(this, "mapJson");
+        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
+        this.mapJson = config.customTypeParams.fromJson;
+        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -24856,6 +24880,29 @@ var init_custom = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
+      mapFromJsonValue(value) {
+        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
+      }
+      jsonWrapName(name2, sql2, arrayDimensions) {
+        if (typeof this.wrapName === "function")
+          return this.wrapName(name2, sql2, arrayDimensions);
+        const rawType = this.getSQLType().toLowerCase();
+        const parenPos = rawType.indexOf("(");
+        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
+        switch (type) {
+          case "bytea":
+          case "geometry":
+          case "timestamp":
+          case "numeric":
+          case "bigint": {
+            const arrVal = "[]".repeat(arrayDimensions ?? 0);
+            return sql2`${name2}::text${sql2.raw(arrVal).if(arrayDimensions)}`;
+          }
+          default: {
+            return name2;
+          }
+        }
+      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -27538,11 +27585,11 @@ var init_dialect = __esm({
           const name2 = sql`${table6}.${sql.identifier(this.casing.getColumnCasing(column6))}`;
           let targetType = column6.columnType;
           let col = column6;
-          let arrVal = "";
+          let dimensionCnt = 0;
           while (is(col, PgArray)) {
-            col = column6.baseColumn;
+            col = col.baseColumn;
             targetType = col.columnType;
-            arrVal = arrVal + "[]";
+            ++dimensionCnt;
           }
           switch (targetType) {
             case "PgNumeric":
@@ -27552,9 +27599,14 @@ var init_dialect = __esm({
             case "PgBigSerial64":
             case "PgTimestampString":
             case "PgGeometry":
-            case "PgGeometryObject": {
+            case "PgGeometryObject":
+            case "PgBytea": {
+              const arrVal = "[]".repeat(dimensionCnt);
               return sql`${name2}::text${sql.raw(arrVal).if(arrVal)} as ${sql.identifier(key)}`;
             }
+            case "PgCustomColumn": {
+              return sql`${col.jsonWrapName(name2, sql, dimensionCnt > 0 ? dimensionCnt : void 0)} as ${sql.identifier(key)}`;
+            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -32518,9 +32570,13 @@ var init_custom2 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
+        __publicField(this, "mapJson");
+        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
+        this.mapJson = config.customTypeParams.fromJson;
+        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -32528,6 +32584,29 @@ var init_custom2 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
+      mapFromJsonValue(value) {
+        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
+      }
+      jsonWrapName(name2, sql2) {
+        if (typeof this.wrapName === "function")
+          return this.wrapName(name2, sql2);
+        const rawType = this.getSQLType().toLowerCase();
+        const parenPos = rawType.indexOf("(");
+        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
+        switch (type) {
+          case "numeric":
+          case "decimal":
+          case "bigint": {
+            return sql2`cast(${name2} as text)`;
+          }
+          case "blob": {
+            return sql2`hex(${name2})`;
+          }
+          default: {
+            return name2;
+          }
+        }
+      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -33721,6 +33800,9 @@ var init_dialect2 = __esm({
             case "SQLiteNumericBigInt": {
               return sql`cast(${name2} as text) as ${sql.identifier(key)}`;
             }
+            case "SQLiteCustomColumn": {
+              return sql`${column6.jsonWrapName(name2, sql)} as ${sql.identifier(key)}`;
+            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -37330,9 +37412,13 @@ var init_custom3 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
+        __publicField(this, "mapJson");
+        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
+        this.mapJson = config.customTypeParams.fromJson;
+        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -37340,6 +37426,30 @@ var init_custom3 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
+      mapFromJsonValue(value) {
+        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
+      }
+      jsonWrapName(name2, sql2) {
+        if (typeof this.wrapName === "function")
+          return this.wrapName(name2, sql2);
+        const rawType = this.getSQLType().toLowerCase();
+        const parenPos = rawType.indexOf("(");
+        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
+        switch (type) {
+          case "binary":
+          case "varbinary":
+          case "time":
+          case "datetime":
+          case "decimal":
+          case "float":
+          case "bigint": {
+            return sql2`cast(${name2} as char)`;
+          }
+          default: {
+            return name2;
+          }
+        }
+      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -39698,6 +39808,9 @@ var init_dialect3 = __esm({
             case "MySqlBigInt64": {
               return sql`cast(${name2} as char) as ${sql.identifier(key)}`;
             }
+            case "MySqlCustomColumn": {
+              return sql`${column6.jsonWrapName(name2, sql)} as ${sql.identifier(key)}`;
+            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -43300,9 +43413,13 @@ var init_custom4 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
+        __publicField(this, "mapJson");
+        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
+        this.mapJson = config.customTypeParams.fromJson;
+        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -43310,6 +43427,30 @@ var init_custom4 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
+      mapFromJsonValue(value) {
+        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
+      }
+      jsonWrapName(name2, sql2) {
+        if (typeof this.wrapName === "function")
+          return this.wrapName(name2, sql2);
+        const rawType = this.getSQLType().toLowerCase();
+        const parenPos = rawType.indexOf("(");
+        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
+        switch (type) {
+          case "binary":
+          case "varbinary":
+          case "time":
+          case "datetime":
+          case "decimal":
+          case "float":
+          case "bigint": {
+            return sql2`cast(${name2} as char)`;
+          }
+          default: {
+            return name2;
+          }
+        }
+      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }

package/api.mjs

@@ -22287,6 +22287,14 @@ var init_common2 = __esm({
         }
         return value.map((v) => this.baseColumn.mapFromDriverValue(v));
       }
+      // Needed for arrays of custom types
+      mapFromJsonValue(value) {
+        if (typeof value === "string") {
+          value = parsePgArray(value);
+        }
+        const base = this.baseColumn;
+        return "mapFromJsonValue" in base ? value.map((v) => base.mapFromJsonValue(v)) : value.map((v) => base.mapFromDriverValue(v));
+      }
       mapToDriverValue(value, isNestedArray = false) {
         const a = value.map(
           (v) => v === null ? null : is(this.baseColumn, _PgArray) ? this.baseColumn.mapToDriverValue(v, true) : this.baseColumn.mapToDriverValue(v)
@@ -23408,7 +23416,7 @@ function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (valu
     } else {
       decoder = field.getSQL().decoder;
     }
-    row[selectionItem.key] = decoder.mapFromDriverValue(value);
+    row[selectionItem.key] = "mapFromJsonValue" in decoder ? decoder.mapFromJsonValue(value) : decoder.mapFromDriverValue(value);
   }
   return row;
 }
@@ -23950,6 +23958,9 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
       gte,
       ilike,
       inArray,
+      arrayContains,
+      arrayContained,
+      arrayOverlaps,
       isNull,
       isNotNull,
       like,
@@ -24738,6 +24749,15 @@ var init_bytea = __esm({
     };
     __publicField(PgByteaBuilder, _a58, "PgByteaBuilder");
     PgBytea = class extends (_b29 = PgColumn, _a59 = entityKind, _b29) {
+      mapFromDriverValue(value) {
+        if (Buffer.isBuffer(value))
+          return value;
+        if (typeof value === "string") {
+          const trimmed = value.slice(2, value.length);
+          return Buffer.from(trimmed, "hex");
+        }
+        return Buffer.from(value);
+      }
       getSQLType() {
         return "bytea";
       }
@@ -24851,9 +24871,13 @@ var init_custom = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
+        __publicField(this, "mapJson");
+        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
+        this.mapJson = config.customTypeParams.fromJson;
+        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -24861,6 +24885,29 @@ var init_custom = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
+      mapFromJsonValue(value) {
+        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
+      }
+      jsonWrapName(name2, sql2, arrayDimensions) {
+        if (typeof this.wrapName === "function")
+          return this.wrapName(name2, sql2, arrayDimensions);
+        const rawType = this.getSQLType().toLowerCase();
+        const parenPos = rawType.indexOf("(");
+        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
+        switch (type) {
+          case "bytea":
+          case "geometry":
+          case "timestamp":
+          case "numeric":
+          case "bigint": {
+            const arrVal = "[]".repeat(arrayDimensions ?? 0);
+            return sql2`${name2}::text${sql2.raw(arrVal).if(arrayDimensions)}`;
+          }
+          default: {
+            return name2;
+          }
+        }
+      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -27543,11 +27590,11 @@ var init_dialect = __esm({
           const name2 = sql`${table6}.${sql.identifier(this.casing.getColumnCasing(column6))}`;
           let targetType = column6.columnType;
           let col = column6;
-          let arrVal = "";
+          let dimensionCnt = 0;
           while (is(col, PgArray)) {
-            col = column6.baseColumn;
+            col = col.baseColumn;
             targetType = col.columnType;
-            arrVal = arrVal + "[]";
+            ++dimensionCnt;
           }
           switch (targetType) {
             case "PgNumeric":
@@ -27557,9 +27604,14 @@ var init_dialect = __esm({
             case "PgBigSerial64":
             case "PgTimestampString":
             case "PgGeometry":
-            case "PgGeometryObject": {
+            case "PgGeometryObject":
+            case "PgBytea": {
+              const arrVal = "[]".repeat(dimensionCnt);
               return sql`${name2}::text${sql.raw(arrVal).if(arrVal)} as ${sql.identifier(key)}`;
             }
+            case "PgCustomColumn": {
+              return sql`${col.jsonWrapName(name2, sql, dimensionCnt > 0 ? dimensionCnt : void 0)} as ${sql.identifier(key)}`;
+            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -32523,9 +32575,13 @@ var init_custom2 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
+        __publicField(this, "mapJson");
+        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
+        this.mapJson = config.customTypeParams.fromJson;
+        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -32533,6 +32589,29 @@ var init_custom2 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
+      mapFromJsonValue(value) {
+        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
+      }
+      jsonWrapName(name2, sql2) {
+        if (typeof this.wrapName === "function")
+          return this.wrapName(name2, sql2);
+        const rawType = this.getSQLType().toLowerCase();
+        const parenPos = rawType.indexOf("(");
+        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
+        switch (type) {
+          case "numeric":
+          case "decimal":
+          case "bigint": {
+            return sql2`cast(${name2} as text)`;
+          }
+          case "blob": {
+            return sql2`hex(${name2})`;
+          }
+          default: {
+            return name2;
+          }
+        }
+      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -33726,6 +33805,9 @@ var init_dialect2 = __esm({
             case "SQLiteNumericBigInt": {
               return sql`cast(${name2} as text) as ${sql.identifier(key)}`;
             }
+            case "SQLiteCustomColumn": {
+              return sql`${column6.jsonWrapName(name2, sql)} as ${sql.identifier(key)}`;
+            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -37335,9 +37417,13 @@ var init_custom3 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
+        __publicField(this, "mapJson");
+        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
+        this.mapJson = config.customTypeParams.fromJson;
+        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -37345,6 +37431,30 @@ var init_custom3 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
+      mapFromJsonValue(value) {
+        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
+      }
+      jsonWrapName(name2, sql2) {
+        if (typeof this.wrapName === "function")
+          return this.wrapName(name2, sql2);
+        const rawType = this.getSQLType().toLowerCase();
+        const parenPos = rawType.indexOf("(");
+        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
+        switch (type) {
+          case "binary":
+          case "varbinary":
+          case "time":
+          case "datetime":
+          case "decimal":
+          case "float":
+          case "bigint": {
+            return sql2`cast(${name2} as char)`;
+          }
+          default: {
+            return name2;
+          }
+        }
+      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -39703,6 +39813,9 @@ var init_dialect3 = __esm({
             case "MySqlBigInt64": {
               return sql`cast(${name2} as char) as ${sql.identifier(key)}`;
             }
+            case "MySqlCustomColumn": {
+              return sql`${column6.jsonWrapName(name2, sql)} as ${sql.identifier(key)}`;
+            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -43305,9 +43418,13 @@ var init_custom4 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
+        __publicField(this, "mapJson");
+        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
+        this.mapJson = config.customTypeParams.fromJson;
+        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -43315,6 +43432,30 @@ var init_custom4 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
+      mapFromJsonValue(value) {
+        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
+      }
+      jsonWrapName(name2, sql2) {
+        if (typeof this.wrapName === "function")
+          return this.wrapName(name2, sql2);
+        const rawType = this.getSQLType().toLowerCase();
+        const parenPos = rawType.indexOf("(");
+        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
+        switch (type) {
+          case "binary":
+          case "varbinary":
+          case "time":
+          case "datetime":
+          case "decimal":
+          case "float":
+          case "bigint": {
+            return sql2`cast(${name2} as char)`;
+          }
+          default: {
+            return name2;
+          }
+        }
+      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }

package/bin.cjs

@@ -92729,7 +92729,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "1.0.0-beta.1-ec0aae1";
+  const envVersion = "1.0.0-beta.1-6b935a0";
   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-ec0aae1",
+	"version": "1.0.0-beta.1-6b935a0",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",