drizzle-kit 1.0.0-beta.4-4605abe → 1.0.0-beta.4-332ec7b

package/api-postgres.js

@@ -21910,10 +21910,9 @@ __export(drizzle_exports2, {
   policyFrom: () => policyFrom,
   prepareFromSchemaFiles: () => prepareFromSchemaFiles,
   transformOnUpdateDelete: () => transformOnUpdateDelete,
-  unwrapArray: () => unwrapArray,
   unwrapColumn: () => unwrapColumn
 });
-var import_drizzle_orm, import_relations, import_pg_core2, policyFrom, unwrapColumn, unwrapArray, transformOnUpdateDelete, defaultFromColumn, fromDrizzleSchema, fromExports, prepareFromSchemaFiles;
+var import_drizzle_orm, import_relations, import_pg_core2, policyFrom, unwrapColumn, transformOnUpdateDelete, defaultFromColumn, fromDrizzleSchema, fromExports, prepareFromSchemaFiles;
 var init_drizzle2 = __esm({
   "src/dialects/postgres/drizzle.ts"() {
     "use strict";
@@ -21949,7 +21948,8 @@ var init_drizzle2 = __esm({
       };
     };
     unwrapColumn = (column7) => {
-      const { baseColumn, dimensions } = (0, import_drizzle_orm.is)(column7, import_pg_core2.PgArray) ? unwrapArray(column7) : { baseColumn: column7, dimensions: 0 };
+      const dimensions = column7.dimensions ?? 0;
+      const baseColumn = column7;
       const isEnum = (0, import_drizzle_orm.is)(baseColumn, import_pg_core2.PgEnumColumn) || (0, import_drizzle_orm.is)(baseColumn, import_pg_core2.PgEnumObjectColumn);
       const typeSchema = isEnum ? baseColumn.enum.schema || "public" : null;
       let sqlBaseType = baseColumn.getSQLType();
@@ -21967,11 +21967,6 @@ var init_drizzle2 = __esm({
         options
       };
     };
-    unwrapArray = (column7, dimensions = 1) => {
-      const baseColumn = column7.baseColumn;
-      if ((0, import_drizzle_orm.is)(baseColumn, import_pg_core2.PgArray)) return unwrapArray(baseColumn, dimensions + 1);
-      return { baseColumn, dimensions };
-    };
     transformOnUpdateDelete = (on) => {
       if (on === "no action") return "NO ACTION";
       if (on === "cascade") return "CASCADE";
@@ -147320,17 +147315,12 @@ import { sql } from "drizzle-orm"
       const opts = inspect(options);
       const comma = dbName && opts ? ", " : "";
       let columnStatement = `${withCasing(name, casing2)}: ${isEnum ? withCasing(paramNameFor(type, typeSchema), casing2) : grammarType.drizzleImport()}${customType ? `({ dataType: () => '${customType}' })` : ""}(${dbName}${comma}${opts})`;
-      columnStatement += ".array()".repeat(dimensions);
+      if (dimensions > 0) {
+        const suffix = "[]".repeat(dimensions);
+        columnStatement += dimensions === 1 ? ".array()" : `.array("${suffix}")`;
+      }
       if (defaultValue) columnStatement += `.default(${defaultValue})`;
       return columnStatement;
-      if (enumTypes.has(`${typeSchema}.${type.replace("[]", "")}`)) {
-        let out = `${withCasing(name, casing2)}: ${withCasing(paramNameFor(type.replace("[]", ""), typeSchema), casing2)}(${dbColumnName({ name, casing: casing2 })})`;
-        return out;
-      }
-      let unknown = `// TODO: failed to parse database type '${type}'
-`;
-      unknown += `	${withCasing(name, casing2)}: unknown("${name}")`;
-      return unknown;
     };
     createViewColumns = (columns, enumTypes, casing2) => {
       let statement = "";
@@ -147346,7 +147336,11 @@ import { sql } from "drizzle-orm"
         );
         statement += "	";
         statement += columnStatement;
-        statement += ".array()".repeat(it.dimensions + it.typeDimensions);
+        if (it.dimensions > 0 || it.typeDimensions > 0) {
+          const c6 = it.dimensions + it.typeDimensions;
+          const suffix = "[]".repeat(it.dimensions + it.typeDimensions);
+          statement += c6 === 1 ? ".array()" : `.array("${suffix}")`;
+        }
         statement += it.notNull ? ".notNull()" : "";
         statement += ",\n";
       });
@@ -147374,7 +147368,10 @@ import { sql } from "drizzle-orm"
         const comma = dbName && opts ? ", " : "";
         const pk = primaryKey && primaryKey.columns.length === 1 && primaryKey.columns[0] === it.name ? primaryKey : null;
         let columnStatement = `${withCasing(name, casing2)}: ${isEnum ? withCasing(paramNameFor(type, typeSchema), casing2) : grammarType.drizzleImport()}${customType ? `({ dataType: () => '${customType}' })` : ""}(${dbName}${comma}${opts})`;
-        columnStatement += ".array()".repeat(dimensions);
+        if (it.dimensions > 0) {
+          const suffix = "[]".repeat(it.dimensions);
+          columnStatement += it.dimensions === 1 ? ".array()" : `.array("${suffix}")`;
+        }
         if (defaultValue) columnStatement += defaultValue.startsWith(".") ? defaultValue : `.default(${defaultValue})`;
         if (pk) columnStatement += ".primaryKey()";
         if (it.notNull && !it.identity && !pk) columnStatement += ".notNull()";

package/api-postgres.mjs

@@ -21922,7 +21922,6 @@ __export(drizzle_exports2, {
   policyFrom: () => policyFrom,
   prepareFromSchemaFiles: () => prepareFromSchemaFiles,
   transformOnUpdateDelete: () => transformOnUpdateDelete,
-  unwrapArray: () => unwrapArray,
   unwrapColumn: () => unwrapColumn
 });
 import { getTableName, is, SQL } from "drizzle-orm";
@@ -21936,7 +21935,6 @@ import {
   isPgMaterializedView,
   isPgSequence,
   isPgView,
-  PgArray,
   PgDialect,
   PgEnumColumn,
   PgEnumObjectColumn,
@@ -21953,7 +21951,7 @@ import {
   PgView,
   uniqueKeyName
 } from "drizzle-orm/pg-core";
-var policyFrom, unwrapColumn, unwrapArray, transformOnUpdateDelete, defaultFromColumn, fromDrizzleSchema, fromExports, prepareFromSchemaFiles;
+var policyFrom, unwrapColumn, transformOnUpdateDelete, defaultFromColumn, fromDrizzleSchema, fromExports, prepareFromSchemaFiles;
 var init_drizzle2 = __esm({
   "src/dialects/postgres/drizzle.ts"() {
     "use strict";
@@ -21986,7 +21984,8 @@ var init_drizzle2 = __esm({
       };
     };
     unwrapColumn = (column7) => {
-      const { baseColumn, dimensions } = is(column7, PgArray) ? unwrapArray(column7) : { baseColumn: column7, dimensions: 0 };
+      const dimensions = column7.dimensions ?? 0;
+      const baseColumn = column7;
       const isEnum = is(baseColumn, PgEnumColumn) || is(baseColumn, PgEnumObjectColumn);
       const typeSchema = isEnum ? baseColumn.enum.schema || "public" : null;
       let sqlBaseType = baseColumn.getSQLType();
@@ -22004,11 +22003,6 @@ var init_drizzle2 = __esm({
         options
       };
     };
-    unwrapArray = (column7, dimensions = 1) => {
-      const baseColumn = column7.baseColumn;
-      if (is(baseColumn, PgArray)) return unwrapArray(baseColumn, dimensions + 1);
-      return { baseColumn, dimensions };
-    };
     transformOnUpdateDelete = (on) => {
       if (on === "no action") return "NO ACTION";
       if (on === "cascade") return "CASCADE";
@@ -147354,17 +147348,12 @@ import { sql } from "drizzle-orm"
       const opts = inspect(options);
       const comma = dbName && opts ? ", " : "";
       let columnStatement = `${withCasing(name, casing2)}: ${isEnum ? withCasing(paramNameFor(type, typeSchema), casing2) : grammarType.drizzleImport()}${customType ? `({ dataType: () => '${customType}' })` : ""}(${dbName}${comma}${opts})`;
-      columnStatement += ".array()".repeat(dimensions);
+      if (dimensions > 0) {
+        const suffix = "[]".repeat(dimensions);
+        columnStatement += dimensions === 1 ? ".array()" : `.array("${suffix}")`;
+      }
       if (defaultValue) columnStatement += `.default(${defaultValue})`;
       return columnStatement;
-      if (enumTypes.has(`${typeSchema}.${type.replace("[]", "")}`)) {
-        let out = `${withCasing(name, casing2)}: ${withCasing(paramNameFor(type.replace("[]", ""), typeSchema), casing2)}(${dbColumnName({ name, casing: casing2 })})`;
-        return out;
-      }
-      let unknown = `// TODO: failed to parse database type '${type}'
-`;
-      unknown += `	${withCasing(name, casing2)}: unknown("${name}")`;
-      return unknown;
     };
     createViewColumns = (columns, enumTypes, casing2) => {
       let statement = "";
@@ -147380,7 +147369,11 @@ import { sql } from "drizzle-orm"
         );
         statement += "	";
         statement += columnStatement;
-        statement += ".array()".repeat(it.dimensions + it.typeDimensions);
+        if (it.dimensions > 0 || it.typeDimensions > 0) {
+          const c6 = it.dimensions + it.typeDimensions;
+          const suffix = "[]".repeat(it.dimensions + it.typeDimensions);
+          statement += c6 === 1 ? ".array()" : `.array("${suffix}")`;
+        }
         statement += it.notNull ? ".notNull()" : "";
         statement += ",\n";
       });
@@ -147408,7 +147401,10 @@ import { sql } from "drizzle-orm"
         const comma = dbName && opts ? ", " : "";
         const pk = primaryKey && primaryKey.columns.length === 1 && primaryKey.columns[0] === it.name ? primaryKey : null;
         let columnStatement = `${withCasing(name, casing2)}: ${isEnum ? withCasing(paramNameFor(type, typeSchema), casing2) : grammarType.drizzleImport()}${customType ? `({ dataType: () => '${customType}' })` : ""}(${dbName}${comma}${opts})`;
-        columnStatement += ".array()".repeat(dimensions);
+        if (it.dimensions > 0) {
+          const suffix = "[]".repeat(it.dimensions);
+          columnStatement += it.dimensions === 1 ? ".array()" : `.array("${suffix}")`;
+        }
         if (defaultValue) columnStatement += defaultValue.startsWith(".") ? defaultValue : `.default(${defaultValue})`;
         if (pk) columnStatement += ".primaryKey()";
         if (it.notNull && !it.identity && !pk) columnStatement += ".notNull()";

package/bin.cjs

@@ -37967,7 +37967,7 @@ var init_drizzle = __esm({
 });
 
 // src/dialects/postgres/drizzle.ts
-var import_drizzle_orm, import_relations, import_pg_core2, policyFrom, unwrapColumn, unwrapArray, transformOnUpdateDelete, defaultFromColumn, fromDrizzleSchema, fromExports, prepareFromSchemaFiles;
+var import_drizzle_orm, import_relations, import_pg_core2, policyFrom, unwrapColumn, transformOnUpdateDelete, defaultFromColumn, fromDrizzleSchema, fromExports, prepareFromSchemaFiles;
 var init_drizzle2 = __esm({
   "src/dialects/postgres/drizzle.ts"() {
     "use strict";
@@ -38004,7 +38004,8 @@ var init_drizzle2 = __esm({
       };
     };
     unwrapColumn = (column11) => {
-      const { baseColumn, dimensions } = (0, import_drizzle_orm.is)(column11, import_pg_core2.PgArray) ? unwrapArray(column11) : { baseColumn: column11, dimensions: 0 };
+      const dimensions = column11.dimensions ?? 0;
+      const baseColumn = column11;
       const isEnum = (0, import_drizzle_orm.is)(baseColumn, import_pg_core2.PgEnumColumn) || (0, import_drizzle_orm.is)(baseColumn, import_pg_core2.PgEnumObjectColumn);
       const typeSchema = isEnum ? baseColumn.enum.schema || "public" : null;
       let sqlBaseType = baseColumn.getSQLType();
@@ -38022,11 +38023,6 @@ var init_drizzle2 = __esm({
         options
       };
     };
-    unwrapArray = (column11, dimensions = 1) => {
-      const baseColumn = column11.baseColumn;
-      if ((0, import_drizzle_orm.is)(baseColumn, import_pg_core2.PgArray)) return unwrapArray(baseColumn, dimensions + 1);
-      return { baseColumn, dimensions };
-    };
     transformOnUpdateDelete = (on2) => {
       if (on2 === "no action") return "NO ACTION";
       if (on2 === "cascade") return "CASCADE";
@@ -44660,7 +44656,7 @@ var init_generate_mssql = __esm({
 });
 
 // src/dialects/cockroach/drizzle.ts
-var import_drizzle_orm6, import_relations6, import_cockroach_core2, policyFrom2, unwrapColumn2, unwrapArray2, transformOnUpdateDelete3, defaultFromColumn6, fromDrizzleSchema6, fromExports3, prepareFromSchemaFiles6;
+var import_drizzle_orm6, import_relations6, import_cockroach_core2, policyFrom2, unwrapColumn2, unwrapArray, transformOnUpdateDelete3, defaultFromColumn6, fromDrizzleSchema6, fromExports3, prepareFromSchemaFiles6;
 var init_drizzle7 = __esm({
   "src/dialects/cockroach/drizzle.ts"() {
     "use strict";
@@ -44696,7 +44692,7 @@ var init_drizzle7 = __esm({
       };
     };
     unwrapColumn2 = (column11) => {
-      const { baseColumn, dimensions } = (0, import_drizzle_orm6.is)(column11, import_cockroach_core2.CockroachArray) ? unwrapArray2(column11) : { baseColumn: column11, dimensions: 0 };
+      const { baseColumn, dimensions } = (0, import_drizzle_orm6.is)(column11, import_cockroach_core2.CockroachArray) ? unwrapArray(column11) : { baseColumn: column11, dimensions: 0 };
       const isEnum = (0, import_drizzle_orm6.is)(baseColumn, import_cockroach_core2.CockroachEnumColumn);
       const typeSchema = isEnum ? baseColumn.enum.schema || "public" : null;
       let sqlBaseType = baseColumn.getSQLType();
@@ -44713,9 +44709,9 @@ var init_drizzle7 = __esm({
         options
       };
     };
-    unwrapArray2 = (column11, dimensions = 1) => {
+    unwrapArray = (column11, dimensions = 1) => {
       const baseColumn = column11.baseColumn;
-      if ((0, import_drizzle_orm6.is)(baseColumn, import_cockroach_core2.CockroachArray)) return unwrapArray2(baseColumn, dimensions + 1);
+      if ((0, import_drizzle_orm6.is)(baseColumn, import_cockroach_core2.CockroachArray)) return unwrapArray(baseColumn, dimensions + 1);
       return { baseColumn, dimensions };
     };
     transformOnUpdateDelete3 = (on2) => {
@@ -168647,17 +168643,12 @@ import { sql } from "drizzle-orm"
       const opts = inspect(options);
       const comma = dbName && opts ? ", " : "";
       let columnStatement = `${withCasing(name, casing2)}: ${isEnum ? withCasing(paramNameFor(type, typeSchema), casing2) : grammarType.drizzleImport()}${customType ? `({ dataType: () => '${customType}' })` : ""}(${dbName}${comma}${opts})`;
-      columnStatement += ".array()".repeat(dimensions);
+      if (dimensions > 0) {
+        const suffix = "[]".repeat(dimensions);
+        columnStatement += dimensions === 1 ? ".array()" : `.array("${suffix}")`;
+      }
       if (defaultValue) columnStatement += `.default(${defaultValue})`;
       return columnStatement;
-      if (enumTypes.has(`${typeSchema}.${type.replace("[]", "")}`)) {
-        let out = `${withCasing(name, casing2)}: ${withCasing(paramNameFor(type.replace("[]", ""), typeSchema), casing2)}(${dbColumnName2({ name, casing: casing2 })})`;
-        return out;
-      }
-      let unknown = `// TODO: failed to parse database type '${type}'
-`;
-      unknown += `	${withCasing(name, casing2)}: unknown("${name}")`;
-      return unknown;
     };
     createViewColumns2 = (columns, enumTypes, casing2) => {
       let statement = "";
@@ -168673,7 +168664,11 @@ import { sql } from "drizzle-orm"
         );
         statement += "	";
         statement += columnStatement;
-        statement += ".array()".repeat(it2.dimensions + it2.typeDimensions);
+        if (it2.dimensions > 0 || it2.typeDimensions > 0) {
+          const c5 = it2.dimensions + it2.typeDimensions;
+          const suffix = "[]".repeat(it2.dimensions + it2.typeDimensions);
+          statement += c5 === 1 ? ".array()" : `.array("${suffix}")`;
+        }
         statement += it2.notNull ? ".notNull()" : "";
         statement += ",\n";
       });
@@ -168701,7 +168696,10 @@ import { sql } from "drizzle-orm"
         const comma = dbName && opts ? ", " : "";
         const pk = primaryKey && primaryKey.columns.length === 1 && primaryKey.columns[0] === it2.name ? primaryKey : null;
         let columnStatement = `${withCasing(name, casing2)}: ${isEnum ? withCasing(paramNameFor(type, typeSchema), casing2) : grammarType.drizzleImport()}${customType ? `({ dataType: () => '${customType}' })` : ""}(${dbName}${comma}${opts})`;
-        columnStatement += ".array()".repeat(dimensions);
+        if (it2.dimensions > 0) {
+          const suffix = "[]".repeat(it2.dimensions);
+          columnStatement += it2.dimensions === 1 ? ".array()" : `.array("${suffix}")`;
+        }
         if (defaultValue) columnStatement += defaultValue.startsWith(".") ? defaultValue : `.default(${defaultValue})`;
         if (pk) columnStatement += ".primaryKey()";
         if (it2.notNull && !it2.identity && !pk) columnStatement += ".notNull()";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "1.0.0-beta.4-4605abe",
+  "version": "1.0.0-beta.4-332ec7b",
   "homepage": "https://orm.drizzle.team",
   "keywords": [
     "drizzle",