drizzle-kit 0.20.14-22fcd3b → 0.20.14-3ab22ec

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

@@ -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;`

package/utils-studio.mjs

@@ -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;`

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>>;