drizzle-kit 0.20.14-95be75d → 0.20.14-a77266f

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/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 "../serializer/mysqlSchema";
-import { Connection } from "mysql2/promise";
-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;
-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/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({
@@ -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 ");
@@ -1639,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;`
@@ -2174,7 +2166,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
@@ -3360,7 +3356,6 @@ 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({
@@ -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 ");
@@ -1648,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;`
@@ -2208,7 +2200,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 +3395,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) => {

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