drizzle-kit 0.20.14-f5f86f6 → 0.20.14-fa7577a

package/payload.mjs

@@ -2103,7 +2103,7 @@ ${withStyle.errorWarning(
         --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, progressCallback) => {
+    fromDatabase2 = async (db, tablesFilter = (table4) => true, schemaFilters, progressCallback) => {
       const result = {};
       const internals = { tables: {} };
       const where = schemaFilters.map((t) => `table_schema = '${t}'`).join(" or ");
@@ -6178,226 +6178,6 @@ var init_lib = __esm({
   }
 });
 
-// src/cli/validations/common.ts
-var init_common = __esm({
-  "src/cli/validations/common.ts"() {
-    init_outputs();
-  }
-});
-
-// src/cli/validations/mysql.ts
-var mysqlConnectionCli, mysql2credentials, mysqlConnectionConfig, mysqlConfigIntrospectSchema, mysqlCliIntrospectParams, mysqlCliPushParams, mysqlConfigPushParams;
-var init_mysql = __esm({
-  "src/cli/validations/mysql.ts"() {
-    init_lib();
-    init_utils();
-    init_common();
-    init_outputs();
-    mysqlConnectionCli = unionType([
-      objectType({
-        driver: literalType("mysql2"),
-        host: stringType(),
-        port: coerce.number().optional(),
-        user: stringType().default("mysql"),
-        password: stringType().optional(),
-        database: stringType()
-      }),
-      objectType({
-        driver: literalType("mysql2"),
-        uri: stringType()
-        // TODO: change docs
-      })
-    ]);
-    mysql2credentials = unionType([
-      objectType({
-        host: stringType(),
-        port: coerce.number().optional(),
-        user: stringType().default("mysql"),
-        password: stringType().optional(),
-        database: stringType()
-      }),
-      objectType({
-        uri: stringType()
-        // TODO: change docs
-      })
-    ]);
-    mysqlConnectionConfig = objectType({
-      driver: literalType("mysql2"),
-      dbCredentials: mysql2credentials
-    });
-    mysqlConfigIntrospectSchema = intersectionType(
-      configIntrospectSchema,
-      mysqlConnectionConfig
-    );
-    mysqlCliIntrospectParams = intersectionType(
-      configIntrospectCliSchema,
-      mysqlConnectionCli
-    );
-    mysqlCliPushParams = intersectionType(
-      configPushSchema,
-      mysqlConnectionCli
-    );
-    mysqlConfigPushParams = intersectionType(
-      configPushSchema,
-      mysqlConnectionConfig
-    );
-  }
-});
-
-// src/cli/validations/pg.ts
-var pgConnectionCli, pgConnectionConfig, pgConfigIntrospectSchema, pgCliIntrospectParams, pgCliPushParams, pgConfigPushParams;
-var init_pg = __esm({
-  "src/cli/validations/pg.ts"() {
-    init_lib();
-    init_utils();
-    init_common();
-    init_outputs();
-    pgConnectionCli = unionType([
-      objectType({
-        driver: literalType("pg"),
-        host: stringType(),
-        port: coerce.number().optional(),
-        user: stringType().default("postgres"),
-        password: stringType().optional(),
-        database: stringType(),
-        ssl: coerce.boolean().optional(),
-        type: literalType("params").default("params")
-      }),
-      objectType({
-        driver: literalType("pg"),
-        connectionString: stringType(),
-        type: literalType("url").default("url")
-      })
-    ]);
-    pgConnectionConfig = unionType([
-      objectType({
-        driver: literalType("pg"),
-        dbCredentials: objectType({
-          host: stringType(),
-          port: coerce.number().optional(),
-          user: stringType().default("postgres"),
-          password: stringType().optional(),
-          database: stringType(),
-          ssl: coerce.boolean().optional(),
-          type: literalType("params").default("params").optional()
-        })
-      }),
-      objectType({
-        driver: literalType("pg"),
-        dbCredentials: objectType({
-          connectionString: stringType(),
-          type: literalType("url").default("url").optional()
-        })
-      })
-    ]);
-    pgConfigIntrospectSchema = intersectionType(
-      configIntrospectSchema,
-      pgConnectionConfig
-    );
-    pgCliIntrospectParams = intersectionType(
-      configIntrospectCliSchema,
-      pgConnectionCli
-    );
-    pgCliPushParams = intersectionType(
-      configPushSchema,
-      pgConnectionCli
-    );
-    pgConfigPushParams = intersectionType(
-      configPushSchema,
-      pgConnectionConfig
-    );
-  }
-});
-
-// src/cli/commands/sqliteUtils.ts
-var sqliteConnectionSchema, sqliteCliConfigSchema;
-var init_sqliteUtils = __esm({
-  "src/cli/commands/sqliteUtils.ts"() {
-    init_lib();
-    init_utils();
-    sqliteConnectionSchema = unionType([
-      objectType({
-        driver: literalType("turso"),
-        dbCredentials: objectType({
-          url: stringType(),
-          authToken: stringType().optional()
-        })
-      }),
-      objectType({
-        driver: literalType("libsql"),
-        dbCredentials: objectType({
-          url: stringType()
-        })
-      }),
-      objectType({
-        driver: literalType("better-sqlite"),
-        dbCredentials: objectType({
-          url: stringType()
-        })
-      })
-    ]);
-    sqliteCliConfigSchema = intersectionType(
-      configIntrospectSchema,
-      sqliteConnectionSchema
-    );
-  }
-});
-
-// src/cli/validations/sqlite.ts
-var sqliteConnectionCli, sqliteCliIntrospectParams, sqliteCliPushParams, sqliteConfigPushParams;
-var init_sqlite = __esm({
-  "src/cli/validations/sqlite.ts"() {
-    init_lib();
-    init_sqliteUtils();
-    init_utils();
-    init_common();
-    init_outputs();
-    sqliteConnectionCli = unionType([
-      objectType({
-        driver: literalType("turso"),
-        url: stringType(),
-        authToken: stringType()
-      }),
-      objectType({
-        driver: literalType("better-sqlite"),
-        url: stringType()
-      }),
-      objectType({
-        driver: literalType("libsql"),
-        url: stringType()
-      })
-    ]);
-    sqliteCliIntrospectParams = intersectionType(
-      configIntrospectCliSchema,
-      sqliteConnectionCli
-    );
-    sqliteCliPushParams = intersectionType(
-      configPushSchema,
-      sqliteConnectionCli
-    );
-    sqliteConfigPushParams = intersectionType(
-      configPushSchema,
-      sqliteConnectionSchema
-    );
-  }
-});
-
-// src/global.ts
-var originUUID, snapshotVersion, mapValues;
-var init_global = __esm({
-  "src/global.ts"() {
-    originUUID = "00000000-0000-0000-0000-000000000000";
-    snapshotVersion = "5";
-    mapValues = (obj, map) => {
-      const result = Object.keys(obj).reduce(function(result2, key) {
-        result2[key] = map(obj[key]);
-        return result2;
-      }, {});
-      return result;
-    };
-  }
-});
-
 // src/cli/commands/_es5.ts
 var es5_exports = {};
 __export(es5_exports, {
@@ -12025,13 +11805,6 @@ var init_utils = __esm({
     init_source();
     init_views();
     import_hanji2 = __toESM(require_hanji());
-    init_mysql();
-    init_pg();
-    init_sqlite();
-    init_outputs();
-    init_pg();
-    init_sqlite();
-    init_global();
     assertES5 = async (unregister) => {
       try {
         init_es5();
@@ -12202,6 +11975,22 @@ var init_pgImports = __esm({
   }
 });
 
+// src/global.ts
+var originUUID, snapshotVersion, mapValues;
+var init_global = __esm({
+  "src/global.ts"() {
+    originUUID = "00000000-0000-0000-0000-000000000000";
+    snapshotVersion = "5";
+    mapValues = (obj, map) => {
+      const result = Object.keys(obj).reduce(function(result2, key) {
+        result2[key] = map(obj[key]);
+        return result2;
+      }, {});
+      return result;
+    };
+  }
+});
+
 // src/serializer/pgSchema.ts
 var indexV2, columnV2, tableV2, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, schemaHash, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaExternal, kitInternals, pgSchemaInternal, tableSquashed, tableSquashedV4, pgSchemaSquashedV4, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
 var init_pgSchema = __esm({
@@ -12695,12 +12484,9 @@ var init_sqliteSchema = __esm({
           const squashedPKs = mapValues(it[1].compositePrimaryKeys, (pk) => {
             return SQLiteSquasher.squashPK(pk);
           });
-          const squashedUniqueConstraints = mapValues(
-            it[1].uniqueConstraints,
-            (unq) => {
-              return SQLiteSquasher.squashUnique(unq);
-            }
-          );
+          const squashedUniqueConstraints = mapValues(it[1].uniqueConstraints, (unq) => {
+            return SQLiteSquasher.squashUnique(unq);
+          });
           return [
             it[0],
             {
@@ -12734,11 +12520,7 @@ var init_sqliteSchema = __esm({
       }
     });
     sqliteSchema = schema2;
-    backwardCompatibleSqliteSchema = unionType([
-      schemaV3,
-      schemaV4,
-      schema2
-    ]);
+    backwardCompatibleSqliteSchema = unionType([schemaV3, schemaV4, schema2]);
   }
 });
 
@@ -16388,50 +16170,60 @@ var init_migrate = __esm({
         return { sqlStatements, statements, validatedCur, validatedPrev };
       } catch (e) {
         console.error(e);
-        process.exit(1);
       }
     };
     prepareSQLitePush = async (config, snapshot) => {
       const schemaPath = config.schema;
-      const { prev, cur } = await prepareSQLiteDbPushSnapshot(snapshot, schemaPath);
-      const validatedPrev = sqliteSchema.parse(prev);
-      const validatedCur = sqliteSchema.parse(cur);
-      const squashedPrev = squashSqliteScheme(validatedPrev);
-      const squashedCur = squashSqliteScheme(validatedCur);
-      const { sqlStatements, statements, _meta } = await prepareSQL(
-        squashedPrev,
-        squashedCur,
-        "sqlite",
-        validatedPrev,
-        validatedCur
-      );
-      return {
-        sqlStatements,
-        statements,
-        squashedPrev,
-        squashedCur,
-        meta: _meta
-      };
+      try {
+        const { prev, cur } = await prepareSQLiteDbPushSnapshot(
+          snapshot,
+          schemaPath
+        );
+        const validatedPrev = sqliteSchema.parse(prev);
+        const validatedCur = sqliteSchema.parse(cur);
+        const squashedPrev = squashSqliteScheme(validatedPrev);
+        const squashedCur = squashSqliteScheme(validatedCur);
+        const { sqlStatements, statements, _meta } = await prepareSQL(
+          squashedPrev,
+          squashedCur,
+          "sqlite",
+          validatedPrev,
+          validatedCur
+        );
+        return {
+          sqlStatements,
+          statements,
+          squashedPrev,
+          squashedCur,
+          meta: _meta
+        };
+      } catch (e) {
+        console.error(e);
+      }
     };
     preparePgPush = async (config, snapshot, schemaFilter) => {
       const schemaPath = config.schema;
-      const { prev, cur } = await preparePgDbPushSnapshot(
-        snapshot,
-        schemaPath,
-        schemaFilter
-      );
-      const validatedPrev = pgSchema.parse(prev);
-      const validatedCur = pgSchema.parse(cur);
-      const squashedPrev = squashPgScheme(validatedPrev);
-      const squashedCur = squashPgScheme(validatedCur);
-      const { sqlStatements, statements } = await prepareSQL(
-        squashedPrev,
-        squashedCur,
-        "pg",
-        validatedPrev,
-        validatedCur
-      );
-      return { sqlStatements, statements, squashedPrev, squashedCur };
+      try {
+        const { prev, cur } = await preparePgDbPushSnapshot(
+          snapshot,
+          schemaPath,
+          schemaFilter
+        );
+        const validatedPrev = pgSchema.parse(prev);
+        const validatedCur = pgSchema.parse(cur);
+        const squashedPrev = squashPgScheme(validatedPrev);
+        const squashedCur = squashPgScheme(validatedCur);
+        const { sqlStatements, statements } = await prepareSQL(
+          squashedPrev,
+          squashedCur,
+          "pg",
+          validatedPrev,
+          validatedCur
+        );
+        return { sqlStatements, statements, squashedPrev, squashedCur };
+      } catch (e) {
+        console.error(e);
+      }
     };
     prepareAndMigrateMySql = async (config) => {
       const outFolder = config.out;

package/schemaValidator.d.ts

@@ -1,5 +1,5 @@
 import { TypeOf } from "zod";
-export declare const dialect: import("zod").ZodEnum<["pg", "mysql", "sqlite"]>;
+declare const dialect: import("zod").ZodEnum<["pg", "mysql", "sqlite"]>;
 export type Dialect = TypeOf<typeof dialect>;
 declare const commonSquashedSchema: import("zod").ZodUnion<[import("zod").ZodObject<{
     version: import("zod").ZodLiteral<"5">;

package/serializer/mysqlSerializer.d.ts

@@ -1,6 +1,6 @@
 import { AnyMySqlTable, MySqlSchema } from "drizzle-orm/mysql-core";
-import { MySqlSchemaInternal } from "../serializer/mysqlSchema";
-import { IntrospectStage, IntrospectStatus } from "../cli/views";
+import { MySqlSchemaInternal } from "src/serializer/mysqlSchema";
+import { IntrospectStage, IntrospectStatus } from "src/cli/views";
 import { DrizzleDbClient } from "src/drivers";
 export declare const indexName: (tableName: string, columns: string[]) => string;
 export declare const generateMySqlSnapshot: (tables: AnyMySqlTable[], enums: any[], mysqlSchemas: MySqlSchema[]) => MySqlSchemaInternal;

package/serializer/sqliteSerializer.d.ts

@@ -1,6 +1,6 @@
 import type { SQLiteSchemaInternal } from "../serializer/sqliteSchema";
 import { AnySQLiteTable } from "drizzle-orm/sqlite-core";
-import type { IntrospectStage, IntrospectStatus } from "../cli/views";
-import type { DrizzleDbClient } from "../drivers";
+import type { IntrospectStage, IntrospectStatus } from "src/cli/views";
+import type { DrizzleDbClient } from "src/drivers";
 export declare const generateSqliteSnapshot: (tables: AnySQLiteTable[], enums: any[]) => SQLiteSchemaInternal;
 export declare const fromDatabase: (db: DrizzleDbClient, tablesFilter?: (table: string) => boolean, progressCallback?: ((stage: IntrospectStage, count: number, status: IntrospectStatus) => void) | undefined) => Promise<SQLiteSchemaInternal>;

package/utils-studio.js

@@ -1081,14 +1081,6 @@ var init_views = __esm({
   }
 });
 
-// src/global.ts
-var originUUID;
-var init_global = __esm({
-  "src/global.ts"() {
-    originUUID = "00000000-0000-0000-0000-000000000000";
-  }
-});
-
 // src/serializer/index.ts
 var glob;
 var init_serializer = __esm({
@@ -1142,10 +1134,10 @@ function mapSqlToSqliteType(sqlType) {
     return "numeric";
   }
 }
-var import_drizzle_orm, import_sqlite_core2, dialect, fromDatabase;
+var import_drizzle_orm2, import_sqlite_core2, dialect, fromDatabase;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
-    import_drizzle_orm = require("drizzle-orm");
+    import_drizzle_orm2 = require("drizzle-orm");
     import_sqlite_core2 = require("drizzle-orm/sqlite-core");
     init_serializer();
     init_outputs();
@@ -1560,12 +1552,12 @@ var require_brace_expansion = __commonJS({
 });
 
 // src/serializer/pgSerializer.ts
-var import_pg_core2, import_pg_core3, import_drizzle_orm2, dialect2, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
+var import_pg_core2, import_pg_core3, import_drizzle_orm3, dialect2, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
     import_pg_core2 = require("drizzle-orm/pg-core");
     import_pg_core3 = require("drizzle-orm/pg-core");
-    import_drizzle_orm2 = require("drizzle-orm");
+    import_drizzle_orm3 = require("drizzle-orm");
     init_serializer();
     init_source();
     init_outputs();
@@ -1579,7 +1571,7 @@ var init_pgSerializer = __esm({
         --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, progressCallback) => {
+    fromDatabase2 = async (db, tablesFilter = (table) => true, schemaFilters, progressCallback) => {
       const result = {};
       const internals = { tables: {} };
       const where = schemaFilters.map((t) => `table_schema = '${t}'`).join(" or ");
@@ -1979,10 +1971,10 @@ var init_pgSerializer = __esm({
 });
 
 // src/drivers/index.ts
-var import_drizzle_orm4, DrizzleDbClient, DrizzleORMPgClient, TursoSqlite;
+var import_drizzle_orm5, DrizzleDbClient, DrizzleORMPgClient, TursoSqlite;
 var init_drivers = __esm({
   "src/drivers/index.ts"() {
-    import_drizzle_orm4 = require("drizzle-orm");
+    import_drizzle_orm5 = require("drizzle-orm");
     DrizzleDbClient = class {
       constructor(db) {
         this.db = db;
@@ -1990,11 +1982,11 @@ var init_drivers = __esm({
     };
     DrizzleORMPgClient = class extends DrizzleDbClient {
       async query(query, values) {
-        const res = await this.db.execute(import_drizzle_orm4.sql.raw(query));
+        const res = await this.db.execute(import_drizzle_orm5.sql.raw(query));
         return res.rows;
       }
       async run(query) {
-        const res = await this.db.execute(import_drizzle_orm4.sql.raw(query));
+        const res = await this.db.execute(import_drizzle_orm5.sql.raw(query));
         return res.rows;
       }
     };
@@ -2023,6 +2015,7 @@ __export(utils_studio_exports, {
 module.exports = __toCommonJS(utils_studio_exports);
 
 // src/serializer/schemaToDrizzle.ts
+var import_drizzle_orm = require("drizzle-orm");
 var import_pg_core = require("drizzle-orm/pg-core");
 var import_sqlite_core = require("drizzle-orm/sqlite-core");
 var pgSchemaToDrizzle = (schema, schemaName) => {
@@ -2150,7 +2143,7 @@ var sqliteSchemaToDrizzle = (schema) => {
         columnBuilder = columnBuilder.notNull();
       }
       if (c.default) {
-        columnBuilder = columnBuilder.default(c.default);
+        columnBuilder = columnBuilder.default(import_drizzle_orm.sql.raw(`${c.default}`));
       }
       if (c.primaryKey) {
         columnBuilder = columnBuilder.primaryKey();
@@ -2174,7 +2167,11 @@ var sqliteSchemaToDrizzle = (schema) => {
 
 // src/cli/commands/sqliteIntrospect.ts
 init_views();
-init_global();
+
+// src/global.ts
+var originUUID = "00000000-0000-0000-0000-000000000000";
+
+// src/cli/commands/sqliteIntrospect.ts
 init_sqliteSerializer();
 
 // node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js
@@ -3355,12 +3352,11 @@ init_views();
 init_pgSerializer();
 
 // src/introspect-pg.ts
-var import_drizzle_orm3 = require("drizzle-orm");
+var import_drizzle_orm4 = require("drizzle-orm");
 var import_relations = require("drizzle-orm/relations");
 init_pgSerializer();
 
 // src/cli/commands/pgIntrospect.ts
-init_global();
 var pgPushIntrospect = async (connection, filters, schemaFilters) => {
   const { client } = connection;
   const matchers = filters.map((it) => {

package/utils-studio.mjs

@@ -1083,14 +1083,6 @@ var init_views = __esm({
   }
 });
 
-// src/global.ts
-var originUUID;
-var init_global = __esm({
-  "src/global.ts"() {
-    originUUID = "00000000-0000-0000-0000-000000000000";
-  }
-});
-
 // src/serializer/index.ts
 import * as glob from "glob";
 var init_serializer = __esm({
@@ -1108,7 +1100,7 @@ var init_outputs = __esm({
 });
 
 // src/serializer/sqliteSerializer.ts
-import { getTableName, is, SQL } from "drizzle-orm";
+import { getTableName, is, SQL as SQL2 } from "drizzle-orm";
 import {
   getTableConfig,
   SQLiteBaseInteger,
@@ -1571,7 +1563,7 @@ import {
   uniqueKeyName as uniqueKeyName2
 } from "drizzle-orm/pg-core";
 import { getTableConfig as getTableConfig2 } from "drizzle-orm/pg-core";
-import { is as is2, SQL as SQL2, getTableName as getTableName2 } from "drizzle-orm";
+import { is as is2, SQL as SQL3, getTableName as getTableName2 } from "drizzle-orm";
 var dialect2, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
@@ -1588,7 +1580,7 @@ var init_pgSerializer = __esm({
         --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, progressCallback) => {
+    fromDatabase2 = async (db, tablesFilter = (table) => true, schemaFilters, progressCallback) => {
       const result = {};
       const internals = { tables: {} };
       const where = schemaFilters.map((t) => `table_schema = '${t}'`).join(" or ");
@@ -1988,7 +1980,7 @@ var init_pgSerializer = __esm({
 });
 
 // src/drivers/index.ts
-import { sql } from "drizzle-orm";
+import { sql as sql2 } from "drizzle-orm";
 var DrizzleDbClient, DrizzleORMPgClient, TursoSqlite;
 var init_drivers = __esm({
   "src/drivers/index.ts"() {
@@ -1999,11 +1991,11 @@ var init_drivers = __esm({
     };
     DrizzleORMPgClient = class extends DrizzleDbClient {
       async query(query, values) {
-        const res = await this.db.execute(sql.raw(query));
+        const res = await this.db.execute(sql2.raw(query));
         return res.rows;
       }
       async run(query) {
-        const res = await this.db.execute(sql.raw(query));
+        const res = await this.db.execute(sql2.raw(query));
         return res.rows;
       }
     };
@@ -2020,6 +2012,7 @@ var init_drivers = __esm({
 });
 
 // src/serializer/schemaToDrizzle.ts
+import { sql } from "drizzle-orm";
 import {
   customType,
   PgBigInt53Builder,
@@ -2184,7 +2177,7 @@ var sqliteSchemaToDrizzle = (schema) => {
         columnBuilder = columnBuilder.notNull();
       }
       if (c.default) {
-        columnBuilder = columnBuilder.default(c.default);
+        columnBuilder = columnBuilder.default(sql.raw(`${c.default}`));
       }
       if (c.primaryKey) {
         columnBuilder = columnBuilder.primaryKey();
@@ -2208,7 +2201,11 @@ var sqliteSchemaToDrizzle = (schema) => {
 
 // src/cli/commands/sqliteIntrospect.ts
 init_views();
-init_global();
+
+// src/global.ts
+var originUUID = "00000000-0000-0000-0000-000000000000";
+
+// src/cli/commands/sqliteIntrospect.ts
 init_sqliteSerializer();
 
 // node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js
@@ -3399,7 +3396,6 @@ import {
 init_pgSerializer();
 
 // src/cli/commands/pgIntrospect.ts
-init_global();
 var pgPushIntrospect = async (connection, filters, schemaFilters) => {
   const { client } = connection;
   const matchers = filters.map((it) => {