drizzle-kit 0.20.14-dc3503a → 0.20.14-e8e7ed6

package/cli/commands/migrate.d.ts

@@ -1,4 +1,5 @@
-import { CommonSchema, CommonSquashedSchema, Dialect } from "../../schemaValidator";
+import { Column, ColumnsResolverInput, ColumnsResolverOutput, Enum, ResolverInput, ResolverOutput, ResolverOutputWithMoved, Table } from "../../snapshotsDiffer";
+import { CommonSchema } from "../../schemaValidator";
 import { schema } from "../views";
 import { PgSchema } from "../../serializer/pgSchema";
 import { SQLiteSchema } from "../../serializer/sqliteSchema";
@@ -10,9 +11,77 @@ export type Named = {
 };
 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 preparePgPush: (config: {
+    schema: string | string[];
+}, snapshot: PgSchema, schemaFilter: string[]) => Promise<{
+    sqlStatements: string[];
+    statements: import("../../jsonStatements").JsonStatement[];
+    squashedPrev: {
+        tables: Record<string, {
+            name: string;
+            columns: Record<string, {
+                isUnique?: any;
+                default?: any;
+                typeSchema?: string | undefined;
+                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>;
+        }>;
+        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, {
+                isUnique?: any;
+                default?: any;
+                typeSchema?: string | undefined;
+                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>;
+        }>;
+        version: "6";
+        dialect: "pg";
+        schemas: Record<string, string>;
+        enums: Record<string, {
+            name: string;
+            values: string[];
+            schema: string;
+        }>;
+    };
+}>;
 export declare const prepareMySQLPush: (config: {
     schema: string | string[];
 }, snapshot: MySqlSchema) => Promise<{
@@ -26,12 +95,7 @@ export declare const prepareMySQLPush: (config: {
                 } | undefined>;
             } | undefined>;
         } | undefined;
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "mysql";
         tables: Record<string, {
-            schema?: string | undefined;
             name: string;
             columns: Record<string, {
                 default?: any;
@@ -68,11 +132,13 @@ 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: {
@@ -83,12 +149,7 @@ export declare const prepareMySQLPush: (config: {
                 } | undefined>;
             } | undefined>;
         } | undefined;
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "mysql";
         tables: Record<string, {
-            schema?: string | undefined;
             name: string;
             columns: Record<string, {
                 default?: any;
@@ -125,14 +186,18 @@ 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>;
         };
     };
 }>;
+export declare const prepareAndMigrateMysql: (config: GenerateConfig) => Promise<void>;
+export declare const prepareAndMigrateSqlite: (config: GenerateConfig) => Promise<void>;
 export declare const prepareSQLitePush: (config: {
     schema: string | string[];
 }, snapshot: SQLiteSchema) => Promise<{
@@ -140,8 +205,6 @@ export declare const prepareSQLitePush: (config: {
     statements: import("../../jsonStatements").JsonStatement[];
     squashedPrev: {
         enums?: any;
-        version: "5";
-        dialect: "sqlite";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -157,11 +220,11 @@ export declare const prepareSQLitePush: (config: {
             compositePrimaryKeys: Record<string, string>;
             uniqueConstraints: Record<string, string>;
         }>;
+        version: "5";
+        dialect: "sqlite";
     };
     squashedCur: {
         enums?: any;
-        version: "5";
-        dialect: "sqlite";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -177,6 +240,8 @@ export declare const prepareSQLitePush: (config: {
             compositePrimaryKeys: Record<string, string>;
             uniqueConstraints: Record<string, string>;
         }>;
+        version: "5";
+        dialect: "sqlite";
     };
     meta: {
         schemas: {};
@@ -184,85 +249,44 @@ export declare const prepareSQLitePush: (config: {
         columns: {};
     } | 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>;
-        }>;
-    };
-    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;
-            }>;
-            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>;
-        }>;
-    };
+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 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: {
-        schemas: {};
-        tables: {};
-        columns: {};
-    } | undefined;
+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;
+    name?: string | undefined;
     bundle?: boolean | undefined;
     type?: "none" | "custom" | "introspect" | undefined;
 }) => void;

package/cli/commands/mysqlIntrospect.d.ts

@@ -6,12 +6,7 @@ export declare const connectToMySQL: (config: MySQLConnectionConfig) => Promise<
 }>;
 export declare const mysqlIntrospect: (config: MySQLConfigIntrospect, 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;
@@ -48,11 +43,13 @@ export declare const mysqlIntrospect: (config: MySQLConfigIntrospect, filters: s
                 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>;
         };
     };
     ts: {
@@ -67,12 +64,7 @@ export declare const mysqlPushIntrospect: (connection: {
     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;
@@ -109,11 +101,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/pgIntrospect.d.ts

@@ -5,15 +5,12 @@ export declare const pgPushIntrospect: (connection: {
     client: DrizzleDbClient;
 }, filters: string[], schemaFilters: string[]) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "pg";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
                 isUnique?: any;
                 default?: any;
+                typeSchema?: string | undefined;
                 uniqueName?: string | undefined;
                 nullsNotDistinct?: boolean | undefined;
                 name: string;
@@ -47,6 +44,10 @@ export declare const pgPushIntrospect: (connection: {
                 nullsNotDistinct: boolean;
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "pg";
         schemas: Record<string, string>;
         _meta: {
             columns: Record<string, string>;
@@ -55,21 +56,19 @@ export declare const pgPushIntrospect: (connection: {
         };
         enums: Record<string, {
             name: string;
-            values: Record<string, string>;
+            values: string[];
+            schema: string;
         }>;
     };
 }>;
 export declare const pgIntrospect: (config: PgConfigIntrospect, filters: string[], schemaFilters: string[]) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "pg";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
                 isUnique?: any;
                 default?: any;
+                typeSchema?: string | undefined;
                 uniqueName?: string | undefined;
                 nullsNotDistinct?: boolean | undefined;
                 name: string;
@@ -103,6 +102,10 @@ export declare const pgIntrospect: (config: PgConfigIntrospect, filters: string[
                 nullsNotDistinct: boolean;
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "pg";
         schemas: Record<string, string>;
         _meta: {
             columns: Record<string, string>;
@@ -111,7 +114,8 @@ export declare const pgIntrospect: (config: PgConfigIntrospect, filters: string[
         };
         enums: Record<string, {
             name: string;
-            values: Record<string, string>;
+            values: string[];
+            schema: string;
         }>;
     };
     ts: {
@@ -120,4 +124,7 @@ export declare const pgIntrospect: (config: PgConfigIntrospect, filters: string[
         decalrations: string;
         schemaEntry: string;
     };
+    relationsTs: {
+        file: string;
+    };
 }>;

package/cli/commands/sqliteIntrospect.d.ts

@@ -1,4 +1,4 @@
-import type { SQLiteCliConfig, SQLiteConnectionConfig } from "./sqliteUtils";
+import type { SQLiteCliConfig, SQLiteConnectionConfig } from "../validations/sqlite";
 import type { DrizzleDbClient } from "../../drivers";
 export declare const connectToSQLite: (config: SQLiteConnectionConfig) => Promise<{
     client: import("../../drivers").BetterSqlite;
@@ -7,10 +7,6 @@ export declare const connectToSQLite: (config: SQLiteConnectionConfig) => Promis
 }>;
 export declare const sqliteIntrospect: (config: SQLiteCliConfig, filters: string[]) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "sqlite";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -45,6 +41,10 @@ export declare const sqliteIntrospect: (config: SQLiteCliConfig, filters: string
                 columns: string[];
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "5";
+        dialect: "sqlite";
         _meta: {
             columns: Record<string, string>;
             tables: Record<string, string>;
@@ -60,10 +60,6 @@ export declare const sqliteIntrospect: (config: SQLiteCliConfig, filters: string
 }>;
 export declare const sqlitePushIntrospect: (client: DrizzleDbClient, filters: string[]) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "sqlite";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -98,6 +94,10 @@ export declare const sqlitePushIntrospect: (client: DrizzleDbClient, filters: st
                 columns: string[];
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "5";
+        dialect: "sqlite";
         _meta: {
             columns: Record<string, string>;
             tables: Record<string, string>;