drizzle-kit 0.20.16 → 0.20.17-4e262b7

package/cli/commands/migrate.d.ts

@@ -1,63 +1,115 @@
-import { CommonSchema, CommonSquashedSchema, Dialect } from "../../schemaValidator";
-import { schema } from "../views";
-import { PgSchema } from "src/serializer/pgSchema";
-import { SQLiteSchema } from "src/serializer/sqliteSchema";
-import { MySqlSchema } from "src/serializer/mysqlSchema";
-import { Journal } from "src/utils";
+import { Column, ColumnsResolverInput, ColumnsResolverOutput, Enum, ResolverInput, ResolverOutput, ResolverOutputWithMoved, Table } from "../../snapshotsDiffer";
+import type { CommonSchema } from "../../schemaValidator";
+import { PgSchema } from "../../serializer/pgSchema";
+import { SQLiteSchema } from "../../serializer/sqliteSchema";
+import { MySqlSchema } from "../../serializer/mysqlSchema";
+import { Journal } from "../../utils";
 import { GenerateConfig } from "./utils";
 export type Named = {
     name: string;
 };
 export type NamedWithSchema = {
     name: string;
-    schema?: string;
+    schema: string;
 };
+export declare const schemasResolver: (input: ResolverInput<Table>) => Promise<ResolverOutput<Table>>;
+export declare const tablesResolver: (input: ResolverInput<Table>) => Promise<ResolverOutputWithMoved<Table>>;
+export declare const enumsResolver: (input: ResolverInput<Enum>) => Promise<ResolverOutputWithMoved<Enum>>;
+export declare const columnsResolver: (input: ColumnsResolverInput<Column>) => Promise<ColumnsResolverOutput<Column>>;
 export declare const prepareAndMigratePg: (config: GenerateConfig) => Promise<void>;
-export declare const prepareMySQLPush: (config: {
-    schema: string | string[];
-}, snapshot: MySqlSchema) => Promise<{
+export declare const preparePgPush: (schemaPath: string | string[], snapshot: PgSchema, schemaFilter: string[]) => Promise<{
     sqlStatements: string[];
     statements: import("../../jsonStatements").JsonStatement[];
-    validatedCur: {
-        internal?: {
-            tables: Record<string, {
-                columns: Record<string, {
-                    isDefaultAnExpression?: boolean | undefined;
-                } | undefined>;
-            } | undefined>;
-        } | undefined;
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "mysql";
+    squashedPrev: {
         tables: Record<string, {
-            schema?: string | undefined;
             name: string;
             columns: Record<string, {
+                name: string;
+                type: string;
+                primaryKey: boolean;
+                notNull: boolean;
+                isUnique?: any;
                 default?: any;
-                onUpdate?: any;
-                autoincrement?: boolean | undefined;
+                typeSchema?: string | undefined;
+                uniqueName?: string | undefined;
+                nullsNotDistinct?: boolean | undefined;
+            }>;
+            indexes: Record<string, string>;
+            foreignKeys: Record<string, string>;
+            schema: string;
+            compositePrimaryKeys: Record<string, string>;
+            uniqueConstraints: Record<string, string>;
+        }>;
+        version: "6";
+        dialect: "pg";
+        schemas: Record<string, string>;
+        enums: Record<string, {
+            name: string;
+            values: string[];
+            schema: string;
+        }>;
+    };
+    squashedCur: {
+        tables: Record<string, {
+            name: string;
+            columns: Record<string, {
+                name: string;
+                type: string;
+                primaryKey: boolean;
+                notNull: boolean;
+                isUnique?: any;
+                default?: any;
+                typeSchema?: string | undefined;
+                uniqueName?: string | undefined;
+                nullsNotDistinct?: boolean | undefined;
+            }>;
+            indexes: Record<string, string>;
+            foreignKeys: Record<string, string>;
+            schema: string;
+            compositePrimaryKeys: Record<string, string>;
+            uniqueConstraints: Record<string, string>;
+        }>;
+        version: "6";
+        dialect: "pg";
+        schemas: Record<string, string>;
+        enums: Record<string, {
+            name: string;
+            values: string[];
+            schema: string;
+        }>;
+    };
+}>;
+export declare const prepareMySQLPush: (schemaPath: string | string[], snapshot: MySqlSchema) => Promise<{
+    sqlStatements: string[];
+    statements: import("../../jsonStatements").JsonStatement[];
+    validatedCur: {
+        tables: Record<string, {
+            name: string;
+            columns: Record<string, {
                 name: string;
                 type: string;
                 primaryKey: boolean;
                 notNull: boolean;
+                default?: any;
+                onUpdate?: any;
+                autoincrement?: boolean | undefined;
             }>;
             indexes: Record<string, {
-                using?: "btree" | "hash" | undefined;
-                algorithm?: "default" | "inplace" | "copy" | undefined;
-                lock?: "default" | "none" | "shared" | "exclusive" | undefined;
                 name: string;
                 columns: string[];
                 isUnique: boolean;
+                using?: "btree" | "hash" | undefined;
+                algorithm?: "default" | "inplace" | "copy" | undefined;
+                lock?: "default" | "none" | "shared" | "exclusive" | undefined;
             }>;
             foreignKeys: Record<string, {
-                onUpdate?: string | undefined;
-                onDelete?: string | undefined;
                 name: string;
                 tableFrom: string;
                 columnsFrom: string[];
                 tableTo: string;
                 columnsTo: string[];
+                onUpdate?: string | undefined;
+                onDelete?: string | undefined;
             }>;
             compositePrimaryKeys: Record<string, {
                 name: string;
@@ -68,14 +120,14 @@ export declare const prepareMySQLPush: (config: {
                 columns: string[];
             }>;
         }>;
-        schemas: Record<string, string>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "mysql";
         _meta: {
             columns: Record<string, string>;
             tables: Record<string, string>;
-            schemas: Record<string, string>;
         };
-    };
-    validatedPrev: {
         internal?: {
             tables: Record<string, {
                 columns: Record<string, {
@@ -83,38 +135,35 @@ export declare const prepareMySQLPush: (config: {
                 } | undefined>;
             } | undefined>;
         } | undefined;
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "mysql";
+    };
+    validatedPrev: {
         tables: Record<string, {
-            schema?: string | undefined;
             name: string;
             columns: Record<string, {
-                default?: any;
-                onUpdate?: any;
-                autoincrement?: boolean | undefined;
                 name: string;
                 type: string;
                 primaryKey: boolean;
                 notNull: boolean;
+                default?: any;
+                onUpdate?: any;
+                autoincrement?: boolean | undefined;
             }>;
             indexes: Record<string, {
-                using?: "btree" | "hash" | undefined;
-                algorithm?: "default" | "inplace" | "copy" | undefined;
-                lock?: "default" | "none" | "shared" | "exclusive" | undefined;
                 name: string;
                 columns: string[];
                 isUnique: boolean;
+                using?: "btree" | "hash" | undefined;
+                algorithm?: "default" | "inplace" | "copy" | undefined;
+                lock?: "default" | "none" | "shared" | "exclusive" | undefined;
             }>;
             foreignKeys: Record<string, {
-                onUpdate?: string | undefined;
-                onDelete?: string | undefined;
                 name: string;
                 tableFrom: string;
                 columnsFrom: string[];
                 tableTo: string;
                 columnsTo: string[];
+                onUpdate?: string | undefined;
+                onDelete?: string | undefined;
             }>;
             compositePrimaryKeys: Record<string, {
                 name: string;
@@ -125,146 +174,114 @@ export declare const prepareMySQLPush: (config: {
                 columns: string[];
             }>;
         }>;
-        schemas: Record<string, string>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "mysql";
         _meta: {
             columns: Record<string, string>;
             tables: Record<string, string>;
-            schemas: Record<string, string>;
         };
+        internal?: {
+            tables: Record<string, {
+                columns: Record<string, {
+                    isDefaultAnExpression?: boolean | undefined;
+                } | undefined>;
+            } | undefined>;
+        } | undefined;
     };
-} | undefined>;
-export declare const prepareSQLitePush: (config: {
-    schema: string | string[];
-}, snapshot: SQLiteSchema) => Promise<{
+}>;
+export declare const prepareAndMigrateMysql: (config: GenerateConfig) => Promise<void>;
+export declare const prepareAndMigrateSqlite: (config: GenerateConfig) => Promise<void>;
+export declare const prepareSQLitePush: (schemaPath: string | string[], snapshot: SQLiteSchema) => Promise<{
     sqlStatements: string[];
     statements: import("../../jsonStatements").JsonStatement[];
     squashedPrev: {
-        enums?: any;
-        version: "5";
-        dialect: "sqlite";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
-                default?: any;
-                autoincrement?: boolean | undefined;
                 name: string;
                 type: string;
                 primaryKey: boolean;
                 notNull: boolean;
-            }>;
-            indexes: Record<string, string>;
-            foreignKeys: Record<string, string>;
-            compositePrimaryKeys: Record<string, string>;
-            uniqueConstraints: Record<string, string>;
-        }>;
-    };
-    squashedCur: {
-        enums?: any;
-        version: "5";
-        dialect: "sqlite";
-        tables: Record<string, {
-            name: string;
-            columns: Record<string, {
                 default?: any;
                 autoincrement?: boolean | undefined;
-                name: string;
-                type: string;
-                primaryKey: boolean;
-                notNull: boolean;
             }>;
             indexes: Record<string, string>;
             foreignKeys: Record<string, string>;
             compositePrimaryKeys: Record<string, string>;
             uniqueConstraints: Record<string, string>;
         }>;
-    };
-    meta: {
-        schemas: {};
-        tables: {};
-        columns: {};
-    } | undefined;
-} | undefined>;
-export declare const preparePgPush: (config: {
-    schema: string | string[];
-}, snapshot: PgSchema, schemaFilter: string[]) => Promise<{
-    sqlStatements: string[];
-    statements: import("../../jsonStatements").JsonStatement[];
-    squashedPrev: {
         version: "5";
-        dialect: "pg";
-        tables: Record<string, {
-            name: string;
-            columns: Record<string, {
-                isUnique?: any;
-                default?: any;
-                uniqueName?: string | undefined;
-                nullsNotDistinct?: boolean | undefined;
-                name: string;
-                type: string;
-                primaryKey: boolean;
-                notNull: boolean;
-            }>;
-            indexes: Record<string, string>;
-            foreignKeys: Record<string, string>;
-            schema: string;
-            compositePrimaryKeys: Record<string, string>;
-            uniqueConstraints: Record<string, string>;
-        }>;
-        schemas: Record<string, string>;
-        enums: Record<string, {
-            name: string;
-            values: Record<string, string>;
-        }>;
+        dialect: "sqlite";
+        enums?: any;
     };
     squashedCur: {
-        version: "5";
-        dialect: "pg";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
-                isUnique?: any;
-                default?: any;
-                uniqueName?: string | undefined;
-                nullsNotDistinct?: boolean | undefined;
                 name: string;
                 type: string;
                 primaryKey: boolean;
                 notNull: boolean;
+                default?: any;
+                autoincrement?: boolean | undefined;
             }>;
             indexes: Record<string, string>;
             foreignKeys: Record<string, string>;
-            schema: string;
             compositePrimaryKeys: Record<string, string>;
             uniqueConstraints: Record<string, string>;
         }>;
-        schemas: Record<string, string>;
-        enums: Record<string, {
-            name: string;
-            values: Record<string, string>;
-        }>;
+        version: "5";
+        dialect: "sqlite";
+        enums?: any;
     };
-} | undefined>;
-export declare const prepareAndMigrateMySql: (config: GenerateConfig) => Promise<void>;
-export declare const prepareAndMigrateSqlite: (config: GenerateConfig) => Promise<void>;
-export declare const prepareSQL: (prev: CommonSquashedSchema, cur: CommonSquashedSchema, dialect: Dialect, prevFull?: any, curFull?: any) => Promise<{
-    statements: import("../../jsonStatements").JsonStatement[];
-    sqlStatements: string[];
-    _meta: {
+    meta: {
         schemas: {};
         tables: {};
         columns: {};
     } | undefined;
 }>;
+export declare const promptColumnsConflicts: <T extends Named>(tableName: string, newColumns: T[], missingColumns: T[]) => Promise<{
+    created: T[];
+    renamed: {
+        from: T;
+        to: T;
+    }[];
+    deleted: T[];
+}>;
+export declare const promptNamedWithSchemasConflict: <T extends NamedWithSchema>(newItems: T[], missingItems: T[], entity: "table" | "enum") => Promise<{
+    created: T[];
+    renamed: {
+        from: T;
+        to: T;
+    }[];
+    moved: {
+        name: string;
+        schemaFrom: string;
+        schemaTo: string;
+    }[];
+    deleted: T[];
+}>;
+export declare const promptSchemasConflict: <T extends Named>(newSchemas: T[], missingSchemas: T[]) => Promise<{
+    created: T[];
+    renamed: {
+        from: T;
+        to: T;
+    }[];
+    deleted: T[];
+}>;
 export declare const BREAKPOINT = "--> statement-breakpoint\n";
-export declare const writeResult: ({ cur, sqlStatements, journal, _meta, outFolder, breakpoints, bundle, type, }: {
+export declare const writeResult: ({ cur, sqlStatements, journal, _meta, outFolder, breakpoints, name, bundle, type, }: {
     cur: CommonSchema;
     sqlStatements: string[];
     journal: Journal;
     _meta?: any;
     outFolder: string;
     breakpoints: boolean;
-    bundle?: boolean | undefined;
-    type?: "none" | "custom" | "introspect" | undefined;
+    name?: string;
+    bundle?: boolean;
+    type?: "introspect" | "custom" | "none";
 }) => void;
 export declare const embeddedMigrations: (journal: Journal) => string;
 export declare const prepareSnapshotFolderName: () => string;

package/cli/commands/mysqlIntrospect.d.ts

@@ -1,104 +1,38 @@
-import { MySQLConfigIntrospect, MySQLConnectionConfig } from "../validations/mysql";
-import { DrizzleDbClient, MySQL2Client } from "src/drivers";
-export declare const connectToMySQL: (config: MySQLConnectionConfig) => Promise<{
-    client: MySQL2Client;
-    databaseName: string;
+import type { MysqlCredentials } from "../validations/mysql";
+import type { DB } from "../../utils";
+export declare const connectToMySQL: (credentials: MysqlCredentials) => Promise<{
+    db: DB;
+    database: string;
 }>;
-export declare const mysqlIntrospect: (config: MySQLConfigIntrospect, filters: string[]) => Promise<{
+export declare const mysqlPushIntrospect: (db: DB, databaseName: string, filters: string[]) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "mysql";
         tables: Record<string, {
-            schema?: string | undefined;
             name: string;
             columns: Record<string, {
-                default?: any;
-                onUpdate?: any;
-                autoincrement?: boolean | undefined;
                 name: string;
                 type: string;
                 primaryKey: boolean;
                 notNull: boolean;
-            }>;
-            indexes: Record<string, {
-                using?: "btree" | "hash" | undefined;
-                algorithm?: "default" | "inplace" | "copy" | undefined;
-                lock?: "default" | "none" | "shared" | "exclusive" | undefined;
-                name: string;
-                columns: string[];
-                isUnique: boolean;
-            }>;
-            foreignKeys: Record<string, {
-                onUpdate?: string | undefined;
-                onDelete?: string | undefined;
-                name: string;
-                tableFrom: string;
-                columnsFrom: string[];
-                tableTo: string;
-                columnsTo: string[];
-            }>;
-            compositePrimaryKeys: Record<string, {
-                name: string;
-                columns: string[];
-            }>;
-            uniqueConstraints: Record<string, {
-                name: string;
-                columns: string[];
-            }>;
-        }>;
-        schemas: Record<string, string>;
-        _meta: {
-            columns: Record<string, string>;
-            tables: Record<string, string>;
-            schemas: Record<string, string>;
-        };
-    };
-    ts: {
-        file: string;
-        imports: string;
-        decalrations: string;
-        schemaEntry: string;
-    };
-}>;
-export declare const mysqlPushIntrospect: (connection: {
-    client: DrizzleDbClient;
-    databaseName: string;
-}, filters: string[]) => Promise<{
-    schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "mysql";
-        tables: Record<string, {
-            schema?: string | undefined;
-            name: string;
-            columns: Record<string, {
                 default?: any;
                 onUpdate?: any;
                 autoincrement?: boolean | undefined;
-                name: string;
-                type: string;
-                primaryKey: boolean;
-                notNull: boolean;
             }>;
             indexes: Record<string, {
-                using?: "btree" | "hash" | undefined;
-                algorithm?: "default" | "inplace" | "copy" | undefined;
-                lock?: "default" | "none" | "shared" | "exclusive" | undefined;
                 name: string;
                 columns: string[];
                 isUnique: boolean;
+                using?: "btree" | "hash" | undefined;
+                algorithm?: "default" | "inplace" | "copy" | undefined;
+                lock?: "default" | "none" | "shared" | "exclusive" | undefined;
             }>;
             foreignKeys: Record<string, {
-                onUpdate?: string | undefined;
-                onDelete?: string | undefined;
                 name: string;
                 tableFrom: string;
                 columnsFrom: string[];
                 tableTo: string;
                 columnsTo: string[];
+                onUpdate?: string | undefined;
+                onDelete?: string | undefined;
             }>;
             compositePrimaryKeys: Record<string, {
                 name: string;
@@ -109,11 +43,13 @@ export declare const mysqlPushIntrospect: (connection: {
                 columns: string[];
             }>;
         }>;
-        schemas: Record<string, string>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "mysql";
         _meta: {
             columns: Record<string, string>;
             tables: Record<string, string>;
-            schemas: Record<string, string>;
         };
     };
 }>;

package/cli/commands/mysqlPushUtils.d.ts

@@ -1,13 +1,9 @@
-import { DrizzleDbClient } from "src/drivers";
-import { JsonStatement } from "src/jsonStatements";
-import { mysqlSchema } from "src/serializer/mysqlSchema";
+import { JsonStatement } from "../../jsonStatements";
+import { mysqlSchema } from "../../serializer/mysqlSchema";
 import { TypeOf } from "zod";
+import type { DB } from "../../utils";
 export declare const filterStatements: (statements: JsonStatement[], currentSchema: TypeOf<typeof mysqlSchema>, prevSchema: TypeOf<typeof mysqlSchema>) => JsonStatement[];
-export declare const logSuggestionsAndReturn: ({ connection, statements, json2, }: {
-    statements: JsonStatement[];
-    connection: DrizzleDbClient;
-    json2: TypeOf<typeof mysqlSchema>;
-}) => Promise<{
+export declare const logSuggestionsAndReturn: (db: DB, statements: JsonStatement[], json2: TypeOf<typeof mysqlSchema>) => Promise<{
     statementsToExecute: string[];
     shouldAskForApprove: boolean;
     infoToPrint: string[];