drizzle-kit 0.20.6-88f61dc → 0.20.7-05d4dfb

package/utils.js

@@ -11709,8 +11709,8 @@ We have encountered a collision between the index name on columns ${source_defau
       }
       for (const [key, value] of Object.entries(tableToPk)) {
         result[key].compositePrimaryKeys = {
-          [`${key}_${value.join("_")}_pk`]: {
-            name: `${key}_${value.join("_")}_pk`,
+          [`${key}_${value.join("_")}`]: {
+            name: `${key}_${value.join("_")}`,
             columns: value
           }
         };
@@ -11888,9 +11888,10 @@ var pgSerializer_exports = {};
 __export(pgSerializer_exports, {
   fromDatabase: () => fromDatabase2,
   generatePgSnapshot: () => generatePgSnapshot,
-  indexName: () => indexName2
+  indexName: () => indexName2,
+  toDrizzle: () => toDrizzle
 });
-var import_pg_core2, import_pg_core3, import_drizzle_orm5, dialect4, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
+var import_pg_core2, import_pg_core3, import_drizzle_orm5, dialect4, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn, toDrizzle;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
     import_pg_core2 = require("drizzle-orm/pg-core");
@@ -12501,6 +12502,108 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
         }
       }
     };
+    toDrizzle = (schema4, schemaName) => {
+      const tables = {};
+      Object.values(schema4.tables).forEach((t) => {
+        const columns = {};
+        Object.values(t.columns).forEach((c) => {
+          const columnName = c.name;
+          const type = c.type;
+          let columnBuilder;
+          if (type === "bigint") {
+            columnBuilder = new import_pg_core2.PgBigInt53Builder(columnName);
+          } else if (type === "bigserial") {
+            columnBuilder = new import_pg_core2.PgBigSerial53Builder(columnName);
+          } else if (type === "boolean") {
+            columnBuilder = new import_pg_core2.PgBooleanBuilder(columnName);
+          } else if (type === "cidr") {
+            columnBuilder = new import_pg_core2.PgCidrBuilder(columnName);
+          } else if (type === "date") {
+            columnBuilder = new import_pg_core2.PgDateBuilder(columnName);
+          } else if (type === "double precision") {
+            columnBuilder = new import_pg_core2.PgDoublePrecisionBuilder(columnName);
+          } else if (type === "inet") {
+            columnBuilder = new import_pg_core2.PgInetBuilder(columnName);
+          } else if (type === "integer") {
+            columnBuilder = new import_pg_core2.PgIntegerBuilder(columnName);
+          } else if (type === "interval" || type.startsWith("interval ")) {
+            columnBuilder = new import_pg_core2.PgIntervalBuilder(columnName, {});
+          } else if (type === "json") {
+            columnBuilder = new import_pg_core2.PgJsonBuilder(columnName);
+          } else if (type === "jsonb") {
+            columnBuilder = new import_pg_core2.PgJsonbBuilder(columnName);
+          } else if (type === "macaddr") {
+            columnBuilder = new import_pg_core2.PgMacaddrBuilder(columnName);
+          } else if (type === "macaddr8") {
+            columnBuilder = new import_pg_core2.PgMacaddr8Builder(columnName);
+          } else if (type === "numeric" || type.startsWith("numeric(")) {
+            columnBuilder = new import_pg_core2.PgNumericBuilder(columnName);
+          } else if (type === "real") {
+            columnBuilder = new import_pg_core2.PgRealBuilder(columnName);
+          } else if (type === "serial") {
+            columnBuilder = new import_pg_core2.PgSerialBuilder(columnName);
+          } else if (type === "smallint") {
+            columnBuilder = new import_pg_core2.PgSmallIntBuilder(columnName);
+          } else if (type === "smallserial") {
+            columnBuilder = new import_pg_core2.PgSmallSerialBuilder(columnName);
+          } else if (type === "text") {
+            columnBuilder = new import_pg_core2.PgTextBuilder(columnName, {});
+          } else if (type === "time" || type.startsWith("time(") || type === "time with time zone") {
+            columnBuilder = new import_pg_core2.PgTimeBuilder(columnName, false, void 0);
+          } else if (type === "timestamp" || type.startsWith("timestamp(") || type === "timestamp with time zone") {
+            columnBuilder = new import_pg_core2.PgTimestampBuilder(columnName, false, void 0);
+          } else if (type === "uuid") {
+            columnBuilder = new import_pg_core2.PgUUIDBuilder(columnName);
+          } else if (type === "varchar" || type.startsWith("varchar(")) {
+            columnBuilder = new import_pg_core2.PgVarcharBuilder(columnName, {});
+          } else if (type === "char" || type.startsWith("char(")) {
+            columnBuilder = new import_pg_core2.PgCharBuilder(columnName, {});
+          } else {
+            columnBuilder = (0, import_pg_core2.customType)({
+              dataType() {
+                return type;
+              }
+            })(columnName);
+          }
+          if (c.notNull) {
+            columnBuilder = columnBuilder.notNull();
+          }
+          if (c.default) {
+            columnBuilder = columnBuilder.default(c.default);
+          }
+          if (c.primaryKey) {
+            columnBuilder = columnBuilder.primaryKey();
+          }
+          columns[columnName] = columnBuilder;
+        });
+        if (schemaName === "public") {
+          tables[t.name] = (0, import_pg_core2.pgTable)(t.name, columns, (cb) => {
+            const res = {};
+            Object.values(t.compositePrimaryKeys).forEach((cpk) => {
+              const gh = cpk.columns.map((c) => cb[c]);
+              res[cpk.name] = new import_pg_core2.PrimaryKeyBuilder(
+                gh,
+                cpk.name
+              );
+            });
+            return res;
+          });
+        } else {
+          tables[t.name] = (0, import_pg_core2.pgSchema)(schemaName).table(t.name, columns, (cb) => {
+            const res = {};
+            Object.values(t.compositePrimaryKeys).forEach((cpk) => {
+              const gh = cpk.columns.map((c) => cb[c]);
+              res[cpk.name] = new import_pg_core2.PrimaryKeyBuilder(
+                gh,
+                cpk.name
+              );
+            });
+            return res;
+          });
+        }
+      });
+      return tables;
+    };
   }
 });
 
@@ -12539,7 +12642,8 @@ var init_sqliteImports = __esm({
 var sqliteSerializer_exports = {};
 __export(sqliteSerializer_exports, {
   fromDatabase: () => fromDatabase3,
-  generateSqliteSnapshot: () => generateSqliteSnapshot
+  generateSqliteSnapshot: () => generateSqliteSnapshot,
+  toDrizzle: () => toDrizzle2
 });
 function mapSqlToSqliteType(sqlType) {
   if ([
@@ -12576,7 +12680,7 @@ function mapSqlToSqliteType(sqlType) {
     return "numeric";
   }
 }
-var import_drizzle_orm7, import_sqlite_core2, dialect5, generateSqliteSnapshot, fromDatabase3;
+var import_drizzle_orm7, import_sqlite_core2, dialect5, generateSqliteSnapshot, fromDatabase3, toDrizzle2;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
     import_drizzle_orm7 = require("drizzle-orm");
@@ -12944,6 +13048,50 @@ WHERE
         }
       };
     };
+    toDrizzle2 = (schema4) => {
+      const tables = {};
+      Object.values(schema4.tables).forEach((t) => {
+        const columns = {};
+        Object.values(t.columns).forEach((c) => {
+          const columnName = c.name;
+          const type = c.type;
+          let columnBuilder;
+          if (type === "integer") {
+            columnBuilder = new import_sqlite_core2.SQLiteIntegerBuilder(columnName);
+          } else if (type === "text") {
+            columnBuilder = new import_sqlite_core2.SQLiteTextBuilder(columnName, {});
+          } else if (type === "blob") {
+            columnBuilder = new import_sqlite_core2.SQLiteBlobBufferBuilder(columnName);
+          } else if (type === "real") {
+            columnBuilder = new import_sqlite_core2.SQLiteRealBuilder(columnName);
+          } else {
+            columnBuilder = new import_sqlite_core2.SQLiteNumericBuilder(columnName);
+          }
+          if (c.notNull) {
+            columnBuilder = columnBuilder.notNull();
+          }
+          if (c.default) {
+            columnBuilder = columnBuilder.default(c.default);
+          }
+          if (c.primaryKey) {
+            columnBuilder = columnBuilder.primaryKey();
+          }
+          columns[columnName] = columnBuilder;
+        });
+        tables[t.name] = (0, import_sqlite_core2.sqliteTable)(t.name, columns, (cb) => {
+          const res = {};
+          Object.values(t.compositePrimaryKeys).forEach((cpk) => {
+            const gh = cpk.columns.map((c) => cb[c]);
+            res[cpk.name] = new import_sqlite_core2.PrimaryKeyBuilder(
+              gh,
+              cpk.name
+            );
+          });
+          return res;
+        });
+      });
+      return tables;
+    };
   }
 });
 
@@ -17420,13 +17568,14 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonRenameTables);
       jsonStatements.push(...jsonRenameColumnsStatements);
-      jsonStatements.push(...jsonDeletedCompositePKs);
       if (dialect6 !== "mysql") {
         jsonStatements.push(...jsonDeletedUniqueConstraints);
       }
       jsonStatements.push(...jsonDroppedReferencesForAlteredTables);
       jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
+      jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonTableAlternations.alterColumns);
+      jsonStatements.push(...jsonDeletedCompositePKs);
       if (dialect6 === "mysql") {
         jsonStatements.push(...jsonAddedUniqueConstraints);
         jsonStatements.push(...jsonDeletedUniqueConstraints);
@@ -17438,7 +17587,6 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonTableAlternations.dropColumns);
       if (dialect6 !== "sqlite")
         jsonStatements.push(...jsonCreateReferences);
-      jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAlteredCompositePKs);
       if (dialect6 !== "mysql") {
         jsonStatements.push(...jsonAddedUniqueConstraints);
@@ -24710,161 +24858,6 @@ var init_sqliteIntrospect = __esm({
   }
 });
 
-// src/serializer/schemaToDrizzle.ts
-var import_pg_core4, import_sqlite_core3, pgSchemaToDrizzle, sqliteSchemaToDrizzle;
-var init_schemaToDrizzle = __esm({
-  "src/serializer/schemaToDrizzle.ts"() {
-    import_pg_core4 = require("drizzle-orm/pg-core");
-    import_sqlite_core3 = require("drizzle-orm/sqlite-core");
-    pgSchemaToDrizzle = (schema4, schemaName) => {
-      const tables = {};
-      Object.values(schema4.tables).forEach((t) => {
-        const columns = {};
-        Object.values(t.columns).forEach((c) => {
-          const columnName = c.name;
-          const type = c.type;
-          let columnBuilder;
-          if (type === "bigint") {
-            columnBuilder = new import_pg_core4.PgBigInt53Builder(columnName);
-          } else if (type === "bigserial") {
-            columnBuilder = new import_pg_core4.PgBigSerial53Builder(columnName);
-          } else if (type === "boolean") {
-            columnBuilder = new import_pg_core4.PgBooleanBuilder(columnName);
-          } else if (type === "cidr") {
-            columnBuilder = new import_pg_core4.PgCidrBuilder(columnName);
-          } else if (type === "date") {
-            columnBuilder = new import_pg_core4.PgDateBuilder(columnName);
-          } else if (type === "double precision") {
-            columnBuilder = new import_pg_core4.PgDoublePrecisionBuilder(columnName);
-          } else if (type === "inet") {
-            columnBuilder = new import_pg_core4.PgInetBuilder(columnName);
-          } else if (type === "integer") {
-            columnBuilder = new import_pg_core4.PgIntegerBuilder(columnName);
-          } else if (type === "interval" || type.startsWith("interval ")) {
-            columnBuilder = new import_pg_core4.PgIntervalBuilder(columnName, {});
-          } else if (type === "json") {
-            columnBuilder = new import_pg_core4.PgJsonBuilder(columnName);
-          } else if (type === "jsonb") {
-            columnBuilder = new import_pg_core4.PgJsonbBuilder(columnName);
-          } else if (type === "macaddr") {
-            columnBuilder = new import_pg_core4.PgMacaddrBuilder(columnName);
-          } else if (type === "macaddr8") {
-            columnBuilder = new import_pg_core4.PgMacaddr8Builder(columnName);
-          } else if (type === "numeric" || type.startsWith("numeric(")) {
-            columnBuilder = new import_pg_core4.PgNumericBuilder(columnName);
-          } else if (type === "real") {
-            columnBuilder = new import_pg_core4.PgRealBuilder(columnName);
-          } else if (type === "serial") {
-            columnBuilder = new import_pg_core4.PgSerialBuilder(columnName);
-          } else if (type === "smallint") {
-            columnBuilder = new import_pg_core4.PgSmallIntBuilder(columnName);
-          } else if (type === "smallserial") {
-            columnBuilder = new import_pg_core4.PgSmallSerialBuilder(columnName);
-          } else if (type === "text") {
-            columnBuilder = new import_pg_core4.PgTextBuilder(columnName, {});
-          } else if (type === "time" || type.startsWith("time(") || type === "time with time zone") {
-            columnBuilder = new import_pg_core4.PgTimeBuilder(columnName, false, void 0);
-          } else if (type === "timestamp" || type.startsWith("timestamp(") || type === "timestamp with time zone") {
-            columnBuilder = new import_pg_core4.PgTimestampBuilder(columnName, false, void 0);
-          } else if (type === "uuid") {
-            columnBuilder = new import_pg_core4.PgUUIDBuilder(columnName);
-          } else if (type === "varchar" || type.startsWith("varchar(")) {
-            columnBuilder = new import_pg_core4.PgVarcharBuilder(columnName, {});
-          } else if (type === "char" || type.startsWith("char(")) {
-            columnBuilder = new import_pg_core4.PgCharBuilder(columnName, {});
-          } else {
-            columnBuilder = (0, import_pg_core4.customType)({
-              dataType() {
-                return type;
-              }
-            })(columnName);
-          }
-          if (c.notNull) {
-            columnBuilder = columnBuilder.notNull();
-          }
-          if (c.default) {
-            columnBuilder = columnBuilder.default(c.default);
-          }
-          if (c.primaryKey) {
-            columnBuilder = columnBuilder.primaryKey();
-          }
-          columns[columnName] = columnBuilder;
-        });
-        if (schemaName === "public") {
-          tables[t.name] = (0, import_pg_core4.pgTable)(t.name, columns, (cb) => {
-            const res = {};
-            Object.values(t.compositePrimaryKeys).forEach((cpk) => {
-              const gh = cpk.columns.map((c) => cb[c]);
-              res[cpk.name] = new import_pg_core4.PrimaryKeyBuilder(
-                gh,
-                cpk.name
-              );
-            });
-            return res;
-          });
-        } else {
-          tables[t.name] = (0, import_pg_core4.pgSchema)(schemaName).table(t.name, columns, (cb) => {
-            const res = {};
-            Object.values(t.compositePrimaryKeys).forEach((cpk) => {
-              const gh = cpk.columns.map((c) => cb[c]);
-              res[cpk.name] = new import_pg_core4.PrimaryKeyBuilder(
-                gh,
-                cpk.name
-              );
-            });
-            return res;
-          });
-        }
-      });
-      return tables;
-    };
-    sqliteSchemaToDrizzle = (schema4) => {
-      const tables = {};
-      Object.values(schema4.tables).forEach((t) => {
-        const columns = {};
-        Object.values(t.columns).forEach((c) => {
-          const columnName = c.name;
-          const type = c.type;
-          let columnBuilder;
-          if (type === "integer") {
-            columnBuilder = new import_sqlite_core3.SQLiteIntegerBuilder(columnName);
-          } else if (type === "text") {
-            columnBuilder = new import_sqlite_core3.SQLiteTextBuilder(columnName, {});
-          } else if (type === "blob") {
-            columnBuilder = new import_sqlite_core3.SQLiteBlobBufferBuilder(columnName);
-          } else if (type === "real") {
-            columnBuilder = new import_sqlite_core3.SQLiteRealBuilder(columnName);
-          } else {
-            columnBuilder = new import_sqlite_core3.SQLiteNumericBuilder(columnName);
-          }
-          if (c.notNull) {
-            columnBuilder = columnBuilder.notNull();
-          }
-          if (c.default) {
-            columnBuilder = columnBuilder.default(c.default);
-          }
-          if (c.primaryKey) {
-            columnBuilder = columnBuilder.primaryKey();
-          }
-          columns[columnName] = columnBuilder;
-        });
-        tables[t.name] = (0, import_sqlite_core3.sqliteTable)(t.name, columns, (cb) => {
-          const res = {};
-          Object.values(t.compositePrimaryKeys).forEach((cpk) => {
-            const gh = cpk.columns.map((c) => cb[c]);
-            res[cpk.name] = new import_sqlite_core3.PrimaryKeyBuilder(
-              gh,
-              cpk.name
-            );
-          });
-          return res;
-        });
-      });
-      return tables;
-    };
-  }
-});
-
 // node_modules/.pnpm/semver@7.5.4/node_modules/semver/internal/constants.js
 var require_constants = __commonJS({
   "node_modules/.pnpm/semver@7.5.4/node_modules/semver/internal/constants.js"(exports, module2) {
@@ -43208,15 +43201,15 @@ var require_promise = __commonJS({
 });
 
 // src/orm-extenstions/d1-driver/session.ts
-var import_drizzle_orm10, import_drizzle_orm11, import_drizzle_orm12, import_sqlite_core4, import_drizzle_orm13, _a, SQLiteWranglerD1Session, _a2, PreparedQuery;
+var import_drizzle_orm10, import_drizzle_orm11, import_drizzle_orm12, import_sqlite_core3, import_drizzle_orm13, _a, SQLiteWranglerD1Session, _a2, PreparedQuery;
 var init_session = __esm({
   "src/orm-extenstions/d1-driver/session.ts"() {
     import_drizzle_orm10 = require("drizzle-orm");
     import_drizzle_orm11 = require("drizzle-orm");
     import_drizzle_orm12 = require("drizzle-orm");
-    import_sqlite_core4 = require("drizzle-orm/sqlite-core");
+    import_sqlite_core3 = require("drizzle-orm/sqlite-core");
     import_drizzle_orm13 = require("drizzle-orm");
-    SQLiteWranglerD1Session = class extends import_sqlite_core4.SQLiteSession {
+    SQLiteWranglerD1Session = class extends import_sqlite_core3.SQLiteSession {
       constructor(client, configPath, dbName, dialect6, schema4, options = {}) {
         super(dialect6);
         this.client = client;
@@ -43245,7 +43238,7 @@ var init_session = __esm({
     };
     _a = import_drizzle_orm10.entityKind;
     SQLiteWranglerD1Session[_a] = "SQLiteD1Session";
-    PreparedQuery = class extends import_sqlite_core4.SQLitePreparedQuery {
+    PreparedQuery = class extends import_sqlite_core3.SQLitePreparedQuery {
       constructor(stmt, configPath, dbName, queryString, params, logger, fields, executeMethod, customResultMapper) {
         super("async", executeMethod, {
           sql: queryString,
@@ -43370,20 +43363,20 @@ function drizzle(client, configPath, dbName, config = {}) {
   const session = new SQLiteWranglerD1Session(client, configPath, dbName, dialect6, schema4, {
     logger
   });
-  return new import_sqlite_core5.BaseSQLiteDatabase(
+  return new import_sqlite_core4.BaseSQLiteDatabase(
     "async",
     dialect6,
     session,
     schema4
   );
 }
-var import_drizzle_orm14, import_sqlite_core5, WranglerDialect;
+var import_drizzle_orm14, import_sqlite_core4, WranglerDialect;
 var init_driver = __esm({
   "src/orm-extenstions/d1-driver/driver.ts"() {
     import_drizzle_orm14 = require("drizzle-orm");
-    import_sqlite_core5 = require("drizzle-orm/sqlite-core");
+    import_sqlite_core4 = require("drizzle-orm/sqlite-core");
     init_session();
-    WranglerDialect = class extends import_sqlite_core5.SQLiteAsyncDialect {
+    WranglerDialect = class extends import_sqlite_core4.SQLiteAsyncDialect {
       sqlToQuery(sql2) {
         return sql2.toQuery({
           escapeName: this.escapeName,
@@ -58699,13 +58692,13 @@ var init_wrangler_client = __esm({
 });
 
 // src/serializer/studioUtils.ts
-var import_drizzle_orm15, import_mysql_core4, import_pg_core5, import_sqlite_core6, drizzleDb;
+var import_drizzle_orm15, import_mysql_core4, import_pg_core4, import_sqlite_core5, drizzleDb;
 var init_studioUtils = __esm({
   "src/serializer/studioUtils.ts"() {
     import_drizzle_orm15 = require("drizzle-orm");
     import_mysql_core4 = require("drizzle-orm/mysql-core");
-    import_pg_core5 = require("drizzle-orm/pg-core");
-    import_sqlite_core6 = require("drizzle-orm/sqlite-core");
+    import_pg_core4 = require("drizzle-orm/pg-core");
+    import_sqlite_core5 = require("drizzle-orm/sqlite-core");
     init_utils();
     init_utils3();
     init_global();
@@ -58814,7 +58807,8 @@ var init_utils5 = __esm({
     init_pgIntrospect();
     init_pgPushUtils();
     init_sqliteIntrospect();
-    init_schemaToDrizzle();
+    init_sqliteSerializer();
+    init_pgSerializer();
     init_studioUtils();
     init_pgConnect();
     assertV1OutFolder = (out, dialect6) => {
@@ -59133,7 +59127,7 @@ var init_utils5 = __esm({
           preparedConnection.client,
           []
         );
-        const models = sqliteSchemaToDrizzle(schema4);
+        const models = toDrizzle2(schema4);
         const drizzleDbInstance = await drizzleDb(
           connection,
           { sqliteSchema: models },
@@ -59158,7 +59152,7 @@ var init_utils5 = __esm({
             [],
             [schemaName]
           );
-          const models = pgSchemaToDrizzle(schema4, schemaName);
+          const models = toDrizzle(schema4, schemaName);
           response[schemaName] = await drizzleDb(
             // @ts-ignore I don't know how to fix it yet. But will find a way
             connection,

package/serializer/schemaToDrizzle.d.ts

@@ -1,7 +0,0 @@
-import { Relations } from "drizzle-orm";
-import { AnyPgTable } from "drizzle-orm/pg-core";
-import { AnySQLiteTable } from "drizzle-orm/sqlite-core";
-import type { PgSchemaInternal } from "./pgSchema";
-import type { SQLiteSchemaInternal } from "./sqliteSchema";
-export declare const pgSchemaToDrizzle: (schema: PgSchemaInternal, schemaName: string) => Record<string, AnyPgTable | Relations>;
-export declare const sqliteSchemaToDrizzle: (schema: SQLiteSchemaInternal) => Record<string, AnySQLiteTable | Relations>;