drizzle-kit 0.20.14-22fcd3b → 0.20.14-441b049

package/serializer/mysqlImports.d.ts

@@ -1,4 +1,9 @@
 import { AnyMySqlTable, MySqlSchema } from "drizzle-orm/mysql-core";
+export declare const prepareFromExports: (exports: Record<string, unknown>) => {
+    tables: AnyMySqlTable<{}>[];
+    enums: any[];
+    schemas: MySqlSchema<string>[];
+};
 export declare const prepareFromMySqlImports: (imports: string[]) => Promise<{
     tables: AnyMySqlTable<{}>[];
     enums: any[];

package/serializer/mysqlSerializer.d.ts

@@ -1,7 +1,7 @@
 import { AnyMySqlTable, MySqlSchema } from "drizzle-orm/mysql-core";
 import { MySqlSchemaInternal } from "src/serializer/mysqlSchema";
-import { Connection } from "mysql2/promise";
 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;
-export declare const fromDatabase: (db: Connection, inputSchema: string, tablesFilter?: (table: string) => boolean, progressCallback?: ((stage: IntrospectStage, count: number, status: IntrospectStatus) => void) | undefined) => Promise<MySqlSchemaInternal>;
+export declare const fromDatabase: (db: DrizzleDbClient, inputSchema: string, tablesFilter?: (table: string) => boolean, progressCallback?: ((stage: IntrospectStage, count: number, status: IntrospectStatus) => void) | undefined) => Promise<MySqlSchemaInternal>;

package/serializer/sqliteImports.d.ts

@@ -1,4 +1,8 @@
 import { AnySQLiteTable } from "drizzle-orm/sqlite-core";
+export declare const prepareFromExports: (exports: Record<string, unknown>) => {
+    tables: AnySQLiteTable<{}>[];
+    enums: any[];
+};
 export declare const prepareFromSqliteImports: (imports: string[]) => Promise<{
     tables: AnySQLiteTable<{}>[];
     enums: any[];

package/utils-studio.js

@@ -1134,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();
@@ -1552,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();
@@ -1631,7 +1631,7 @@ var init_pgSerializer = __esm({
            END AS data_type, INFORMATION_SCHEMA.COLUMNS.table_name, INFORMATION_SCHEMA.COLUMNS.column_name, INFORMATION_SCHEMA.COLUMNS.column_default, INFORMATION_SCHEMA.COLUMNS.data_type as additional_dt
    FROM  pg_attribute  a
    JOIN INFORMATION_SCHEMA.COLUMNS ON INFORMATION_SCHEMA.COLUMNS.column_name = a.attname
-   WHERE  a.attrelid = '"${tableSchema}"."${tableName}"'::regclass and INFORMATION_SCHEMA.COLUMNS.table_name = '${tableName}'
+   WHERE  a.attrelid = '"${tableSchema}"."${tableName}"'::regclass and INFORMATION_SCHEMA.COLUMNS.table_name = '${tableName}' and INFORMATION_SCHEMA.COLUMNS.table_schema = '${tableSchema}'
    AND    a.attnum > 0
    AND    NOT a.attisdropped
    ORDER  BY a.attnum;`
@@ -1971,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;
@@ -1982,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;
       }
     };
@@ -2015,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) => {
@@ -2142,7 +2143,7 @@ var sqliteSchemaToDrizzle = (schema) => {
         columnBuilder = columnBuilder.notNull();
       }
       if (c.default) {
-        columnBuilder = columnBuilder.default(c.default);
+        columnBuilder = columnBuilder.default(import_drizzle_orm.sql`${c.default}`);
       }
       if (c.primaryKey) {
         columnBuilder = columnBuilder.primaryKey();
@@ -3351,7 +3352,7 @@ 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();
 

package/utils-studio.mjs

@@ -1100,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,
@@ -1563,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"() {
@@ -1640,7 +1640,7 @@ var init_pgSerializer = __esm({
            END AS data_type, INFORMATION_SCHEMA.COLUMNS.table_name, INFORMATION_SCHEMA.COLUMNS.column_name, INFORMATION_SCHEMA.COLUMNS.column_default, INFORMATION_SCHEMA.COLUMNS.data_type as additional_dt
    FROM  pg_attribute  a
    JOIN INFORMATION_SCHEMA.COLUMNS ON INFORMATION_SCHEMA.COLUMNS.column_name = a.attname
-   WHERE  a.attrelid = '"${tableSchema}"."${tableName}"'::regclass and INFORMATION_SCHEMA.COLUMNS.table_name = '${tableName}'
+   WHERE  a.attrelid = '"${tableSchema}"."${tableName}"'::regclass and INFORMATION_SCHEMA.COLUMNS.table_name = '${tableName}' and INFORMATION_SCHEMA.COLUMNS.table_schema = '${tableSchema}'
    AND    a.attnum > 0
    AND    NOT a.attisdropped
    ORDER  BY a.attnum;`
@@ -1980,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"() {
@@ -1991,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;
       }
     };
@@ -2012,6 +2012,7 @@ var init_drivers = __esm({
 });
 
 // src/serializer/schemaToDrizzle.ts
+import { sql } from "drizzle-orm";
 import {
   customType,
   PgBigInt53Builder,
@@ -2176,7 +2177,7 @@ var sqliteSchemaToDrizzle = (schema) => {
         columnBuilder = columnBuilder.notNull();
       }
       if (c.default) {
-        columnBuilder = columnBuilder.default(c.default);
+        columnBuilder = columnBuilder.default(sql`${c.default}`);
       }
       if (c.primaryKey) {
         columnBuilder = columnBuilder.primaryKey();

package/utils.d.ts

@@ -1,8 +1,5 @@
-import { Dialect } from "./schemaValidator";
+import type { Dialect } from "./schemaValidator";
 import { NamedWithSchema } from "./cli/commands/migrate";
-import { PgDatabase } from "drizzle-orm/pg-core";
-import { PgSchema as PgSchemaKit } from "./serializer/pgSchema";
-import { DbConnection } from ".";
 export declare const assertV1OutFolder: (out: string, dialect: Dialect | "{dialect}") => void;
 export type Journal = {
     version: string;
@@ -22,7 +19,6 @@ export declare const prepareOutFolder: (out: string, dialect: Dialect) => {
     snapshots: string[];
     journal: any;
 };
-export declare const mapValues: <IN, OUT>(obj: Record<string, IN>, map: (input: IN) => OUT) => Record<string, OUT>;
 export declare const validateWithReport: (snapshots: string[], dialect: Dialect) => {
     malformed: string[];
     nonLatest: string[];
@@ -201,13 +197,3 @@ export declare const statementsForDiffs: (in1: any, in2: any) => Promise<{
         columns: {};
     } | undefined;
 }>;
-export type DrizzleSnapshotJSON = PgSchemaKit;
-export declare const generateDrizzleJson: (imports: Record<string, unknown>, prevId?: string) => PgSchemaKit;
-export declare const generateMigration: (prev: DrizzleSnapshotJSON, cur: DrizzleSnapshotJSON) => Promise<string[]>;
-export declare const pushSchema: (imports: Record<string, unknown>, db: PgDatabase<any>) => Promise<{
-    hasDataLoss: boolean;
-    warnings: string[];
-    statementsToExecute: string[];
-    apply: () => Promise<void>;
-}>;
-export declare const prepareFrom: (connection: DbConnection) => Promise<Record<string, any>>;