drizzle-kit 0.21.2-4691a9f → 0.21.2-7202142

package/bin.cjs

@@ -1435,7 +1435,7 @@ var init_global = __esm({
   "src/global.ts"() {
     "use strict";
     originUUID = "00000000-0000-0000-0000-000000000000";
-    snapshotVersion = "7";
+    snapshotVersion = "6";
     mapValues = (obj, map) => {
       const result = Object.keys(obj).reduce(function(result2, key) {
         result2[key] = map(obj[key]);
@@ -5637,7 +5637,7 @@ var init_mysqlSchema = __esm({
 });
 
 // src/serializer/pgSchema.ts
-var indexV2, columnV2, tableV2, enumSchemaV1, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, indexColumn, index2, indexV4, indexV5, indexV6, fk2, column2, tableV32, compositePK2, uniqueConstraint2, tableV42, tableV6, tableV5, table2, schemaHash2, kitInternals2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaInternalV5, pgSchemaInternalV6, pgSchemaExternal, pgSchemaInternal, tableSquashed2, tableSquashedV42, pgSchemaSquashedV4, pgSchemaSquashedV6, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchemaV5, pgSchemaV6, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
+var indexV2, columnV2, tableV2, enumSchemaV1, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, indexColumn, index2, fk2, column2, tableV32, compositePK2, uniqueConstraint2, tableV42, table2, schemaHash2, kitInternals2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaInternalV5, pgSchemaExternal, pgSchemaInternal, tableSquashed2, tableSquashedV42, pgSchemaSquashedV4, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchemaV5, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
 var init_pgSchema = __esm({
   "src/serializer/pgSchema.ts"() {
     "use strict";
@@ -5721,33 +5721,6 @@ var init_pgSchema = __esm({
       where: stringType().optional(),
       concurrently: booleanType().default(false)
     }).strict();
-    indexV4 = objectType({
-      name: stringType(),
-      columns: stringType().array(),
-      isUnique: booleanType(),
-      with: recordType(stringType(), stringType()).optional(),
-      method: stringType().default("btree"),
-      where: stringType().optional(),
-      concurrently: booleanType().default(false)
-    }).strict();
-    indexV5 = objectType({
-      name: stringType(),
-      columns: stringType().array(),
-      isUnique: booleanType(),
-      with: recordType(stringType(), stringType()).optional(),
-      method: stringType().default("btree"),
-      where: stringType().optional(),
-      concurrently: booleanType().default(false)
-    }).strict();
-    indexV6 = objectType({
-      name: stringType(),
-      columns: stringType().array(),
-      isUnique: booleanType(),
-      with: recordType(stringType(), stringType()).optional(),
-      method: stringType().default("btree"),
-      where: stringType().optional(),
-      concurrently: booleanType().default(false)
-    }).strict();
     fk2 = objectType({
       name: stringType(),
       tableFrom: stringType(),
@@ -5788,27 +5761,9 @@ var init_pgSchema = __esm({
       name: stringType(),
       schema: stringType(),
       columns: recordType(stringType(), column2),
-      indexes: recordType(stringType(), indexV4),
+      indexes: recordType(stringType(), index2),
       foreignKeys: recordType(stringType(), fk2)
     }).strict();
-    tableV6 = objectType({
-      name: stringType(),
-      schema: stringType(),
-      columns: recordType(stringType(), column2),
-      indexes: recordType(stringType(), indexV6),
-      foreignKeys: recordType(stringType(), fk2),
-      compositePrimaryKeys: recordType(stringType(), compositePK2),
-      uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({})
-    }).strict();
-    tableV5 = objectType({
-      name: stringType(),
-      schema: stringType(),
-      columns: recordType(stringType(), column2),
-      indexes: recordType(stringType(), indexV5),
-      foreignKeys: recordType(stringType(), fk2),
-      compositePrimaryKeys: recordType(stringType(), compositePK2),
-      uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({})
-    }).strict();
     table2 = objectType({
       name: stringType(),
       schema: stringType(),
@@ -5853,7 +5808,7 @@ var init_pgSchema = __esm({
     pgSchemaInternalV5 = objectType({
       version: literalType("5"),
       dialect: literalType("pg"),
-      tables: recordType(stringType(), tableV5),
+      tables: recordType(stringType(), table2),
       enums: recordType(stringType(), enumSchemaV1),
       schemas: recordType(stringType(), stringType()),
       _meta: objectType({
@@ -5863,19 +5818,6 @@ var init_pgSchema = __esm({
       }),
       internal: kitInternals2
     }).strict();
-    pgSchemaInternalV6 = objectType({
-      version: literalType("6"),
-      dialect: literalType("postgresql"),
-      tables: recordType(stringType(), tableV6),
-      enums: recordType(stringType(), enumSchema),
-      schemas: recordType(stringType(), stringType()),
-      _meta: objectType({
-        schemas: recordType(stringType(), stringType()),
-        tables: recordType(stringType(), stringType()),
-        columns: recordType(stringType(), stringType())
-      }),
-      internal: kitInternals2
-    }).strict();
     pgSchemaExternal = objectType({
       version: literalType("5"),
       dialect: literalType("pg"),
@@ -5889,7 +5831,7 @@ var init_pgSchema = __esm({
       })
     }).strict();
     pgSchemaInternal = objectType({
-      version: literalType("7"),
+      version: literalType("6"),
       dialect: literalType("postgresql"),
       tables: recordType(stringType(), table2),
       enums: recordType(stringType(), enumSchema),
@@ -5924,15 +5866,8 @@ var init_pgSchema = __esm({
       enums: recordType(stringType(), enumSchemaV1),
       schemas: recordType(stringType(), stringType())
     }).strict();
-    pgSchemaSquashedV6 = objectType({
-      version: literalType("6"),
-      dialect: literalType("postgresql"),
-      tables: recordType(stringType(), tableSquashed2),
-      enums: recordType(stringType(), enumSchema),
-      schemas: recordType(stringType(), stringType())
-    }).strict();
     pgSchemaSquashed = objectType({
-      version: literalType("7"),
+      version: literalType("6"),
       dialect: literalType("postgresql"),
       tables: recordType(stringType(), tableSquashed2),
       enums: recordType(stringType(), enumSchema),
@@ -5941,13 +5876,8 @@ var init_pgSchema = __esm({
     pgSchemaV3 = pgSchemaInternalV3.merge(schemaHash2);
     pgSchemaV4 = pgSchemaInternalV4.merge(schemaHash2);
     pgSchemaV5 = pgSchemaInternalV5.merge(schemaHash2);
-    pgSchemaV6 = pgSchemaInternalV6.merge(schemaHash2);
     pgSchema = pgSchemaInternal.merge(schemaHash2);
-    backwardCompatiblePgSchema = unionType([
-      pgSchemaV5,
-      pgSchemaV6,
-      pgSchema
-    ]);
+    backwardCompatiblePgSchema = unionType([pgSchemaV5, pgSchema]);
     PgSquasher = {
       squashIdx: (idx) => {
         index2.parse(idx);
@@ -6093,7 +6023,7 @@ var init_pgSchema = __esm({
         })
       );
       return {
-        version: "7",
+        version: "6",
         dialect: json.dialect,
         tables: mappedTables,
         enums: json.enums,
@@ -6391,7 +6321,7 @@ var init_utils = __esm({
     validatorForDialect = (dialect7) => {
       switch (dialect7) {
         case "postgresql":
-          return { validator: backwardCompatiblePgSchema, version: 7 };
+          return { validator: backwardCompatiblePgSchema, version: 6 };
         case "sqlite":
           return { validator: backwardCompatibleSqliteSchema, version: 6 };
         case "mysql":
@@ -15632,24 +15562,6 @@ var init_pgImports = __esm({
   }
 });
 
-// src/extensions/vector.ts
-var vectorOps;
-var init_vector = __esm({
-  "src/extensions/vector.ts"() {
-    "use strict";
-    vectorOps = [
-      "vector_l2_ops",
-      "vector_ip_ops",
-      "vector_cosine_ops",
-      "vector_l1_ops",
-      "bit_hamming_ops",
-      "bit_jaccard_ops",
-      "halfvec_l2_ops",
-      "sparsevec_l2_ops"
-    ];
-  }
-});
-
 // src/serializer/pgSerializer.ts
 var pgSerializer_exports = {};
 __export(pgSerializer_exports, {
@@ -15667,7 +15579,6 @@ var init_pgSerializer = __esm({
     init_serializer();
     init_source();
     init_outputs();
-    init_vector();
     dialect5 = new import_pg_core2.PgDialect();
     indexName2 = (tableName, columns) => {
       return `${tableName}_${columns.join("_")}_index`;
@@ -15844,31 +15755,6 @@ ${withStyle.errorWarning(
                 process.exit(1);
               }
             }
-            it = it;
-            if (!(0, import_drizzle_orm5.is)(it, import_drizzle_orm5.SQL) && it.type === "PgVector" && typeof it.indexConfig.opClass === "undefined") {
-              console.log(
-                `
-${withStyle.errorWarning(
-                  `You are specifying an index on the ${source_default.blueBright(
-                    it.name
-                  )} column inside the ${source_default.blueBright(
-                    tableName
-                  )} table with the ${source_default.blueBright(
-                    "vector"
-                  )} type without specifying an operator class. Vector extension doesn't have a default operator class, so you need to specify one of the available options. Here is a list of available op classes for the vector extension: [${vectorOps.map((it2) => `${source_default.underline(`${it2}`)}`).join(
-                    ", "
-                  )}].
-
-You can specify it using current syntax: ${source_default.underline(
-                    `index("${value.config.name}").using("${value.config.method}", table.${it.name}.op("${vectorOps[0]}"))`
-                  )}
-
-You can check the "pg_vector" docs for more info: https://github.com/pgvector/pgvector?tab=readme-ov-file#indexing
-`
-                )}`
-              );
-              process.exit(1);
-            }
             indexColumnNames.push(it.name);
           });
           const name = value.config.name ? value.config.name : indexName2(tableName, indexColumnNames);
@@ -15943,7 +15829,7 @@ ${withStyle.errorWarning(
         }).map((it) => [it.schemaName, it.schemaName])
       );
       return {
-        version: "7",
+        version: "6",
         dialect: "postgresql",
         tables: result,
         enums: enumsToReturn,
@@ -16229,7 +16115,7 @@ ${withStyle.errorWarning(
               }
             }
             const dbIndexes = await db2.query(
-              `SELECT  DISTINCT ON (t.relname, ic.relname, k.i) t.relname as table_name, ic.relname AS indexname,
+              `SELECT  t.relname as table_name, ic.relname AS indexname,
         k.i AS index_order,
         i.indisunique as is_unique,
         am.amname as method,
@@ -16361,7 +16247,7 @@ ${withStyle.errorWarning(
       }
       const schemasObject = Object.fromEntries([...schemas].map((it) => [it, it]));
       return {
-        version: "7",
+        version: "6",
         dialect: "postgresql",
         tables: result,
         enums: enumsToReturn,
@@ -22441,8 +22327,7 @@ var init_migrate = __esm({
         tablesResolver,
         columnsResolver,
         validatedPrev,
-        validatedCur,
-        "push"
+        validatedCur
       );
       return { sqlStatements, statements, squashedPrev, squashedCur };
     };
@@ -108941,7 +108826,6 @@ var init_introspect_pg = __esm({
     init_utils3();
     init_pgSerializer();
     init_global();
-    init_vector();
     pgImportsList = /* @__PURE__ */ new Set([
       "pgTable",
       "pgEnum",
@@ -109502,7 +109386,7 @@ var init_introspect_pg = __esm({
           if (it2.isExpression) {
             return `sql\`${it2.expression}\``;
           } else {
-            return `table.${withCasing2(it2.expression, casing2)}${it2.opclass && vectorOps.includes(it2.opclass) ? `.op("${it2.opclass}")` : ""}`;
+            return `table.${withCasing2(it2.expression, casing2)}`;
           }
         }).join(", ")})`;
         statement += it.where ? `.where(sql\`${it.where}\`)` : "";
@@ -113947,11 +113831,7 @@ var upPgHandler = (out) => {
     raw: report.rawMap[it]
   })).forEach((it) => {
     const path5 = it.path;
-    let resultV6 = it.raw;
-    if (it.raw.version === "5") {
-      resultV6 = updateUpToV6(it.raw);
-    }
-    const result = updateUpToV7(resultV6);
+    const result = updateUpToV6(it.raw);
     console.log(`[${source_default.green("\u2713")}] ${path5}`);
     (0, import_fs2.writeFileSync)(path5, JSON.stringify(result, null, 2));
   });
@@ -113987,36 +113867,6 @@ var updateUpToV6 = (json) => {
     enums
   };
 };
-var updateUpToV7 = (json) => {
-  const schema5 = pgSchemaV6.parse(json);
-  const tables = Object.fromEntries(
-    Object.entries(schema5.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, ...rest }];
-        })
-      );
-      return [it[0], { ...table4, indexes: mappedIndexes }];
-    })
-  );
-  return {
-    ...schema5,
-    version: "7",
-    dialect: "postgresql",
-    tables
-  };
-};
 
 // src/cli/commands/sqliteUp.ts
 init_source();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.21.2-4691a9f",
+  "version": "0.21.2-7202142",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -61,7 +61,7 @@
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
     "drizzle-kit": "0.21.2",
-    "drizzle-orm": "0.30.9-b473fa9",
+    "drizzle-orm": "0.30.9-fc4ded5",
     "esbuild-node-externals": "^1.9.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",

package/payload.d.mts

@@ -5,7 +5,7 @@ import { MySql2Database } from 'drizzle-orm/mysql2';
 import { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
 
 declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
-    version: zod.ZodLiteral<"7">;
+    version: zod.ZodLiteral<"6">;
     dialect: zod.ZodLiteral<"postgresql">;
     tables: zod.ZodRecord<zod.ZodString, zod.ZodObject<{
         name: zod.ZodString;
@@ -371,7 +371,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     }>;
     id: string;
     prevId: string;
-    version: "7";
+    version: "6";
     dialect: "postgresql";
     schemas: Record<string, string>;
     _meta: {
@@ -445,7 +445,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     }>;
     id: string;
     prevId: string;
-    version: "7";
+    version: "6";
     dialect: "postgresql";
     schemas: Record<string, string>;
     _meta: {
@@ -1099,11 +1099,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, {

package/payload.d.ts

@@ -5,7 +5,7 @@ import { MySql2Database } from 'drizzle-orm/mysql2';
 import { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
 
 declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
-    version: zod.ZodLiteral<"7">;
+    version: zod.ZodLiteral<"6">;
     dialect: zod.ZodLiteral<"postgresql">;
     tables: zod.ZodRecord<zod.ZodString, zod.ZodObject<{
         name: zod.ZodString;
@@ -371,7 +371,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     }>;
     id: string;
     prevId: string;
-    version: "7";
+    version: "6";
     dialect: "postgresql";
     schemas: Record<string, string>;
     _meta: {
@@ -445,7 +445,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     }>;
     id: string;
     prevId: string;
-    version: "7";
+    version: "6";
     dialect: "postgresql";
     schemas: Record<string, string>;
     _meta: {
@@ -1099,11 +1099,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, {