drizzle-kit 0.20.14-6ce9d1f → 0.20.14-95be75d

package/cli/commands/mysqlIntrospect.d.ts

@@ -1,7 +1,7 @@
+import { Connection } from "mysql2/promise";
 import { MySQLConfigIntrospect, MySQLConnectionConfig } from "../validations/mysql";
-import { DrizzleDbClient, MySQL2Client } from "src/drivers";
 export declare const connectToMySQL: (config: MySQLConnectionConfig) => Promise<{
-    client: MySQL2Client;
+    client: Connection;
     databaseName: string;
 }>;
 export declare const mysqlIntrospect: (config: MySQLConfigIntrospect, filters: string[]) => Promise<{
@@ -63,7 +63,7 @@ export declare const mysqlIntrospect: (config: MySQLConfigIntrospect, filters: s
     };
 }>;
 export declare const mysqlPushIntrospect: (connection: {
-    client: DrizzleDbClient;
+    client: Connection;
     databaseName: string;
 }, filters: string[]) => Promise<{
     schema: {

package/cli/commands/mysqlPushUtils.d.ts

@@ -1,11 +1,11 @@
-import { DrizzleDbClient } from "src/drivers";
+import { Connection } from "mysql2/promise";
 import { JsonStatement } from "../../jsonStatements";
 import { mysqlSchema } from "../../serializer/mysqlSchema";
 import { TypeOf } from "zod";
 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;
+    connection: Connection;
     json2: TypeOf<typeof mysqlSchema>;
 }) => Promise<{
     statementsToExecute: string[];

package/cli/commands/utils.d.ts

@@ -40,14 +40,14 @@ export declare const configCommonSchema: import("zod").ZodObject<{
     schemaFilter: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
 }, "strip", import("zod").ZodTypeAny, {
     out?: string | undefined;
-    driver?: "pg" | "turso" | "better-sqlite" | "libsql" | "d1" | "mysql2" | "expo" | undefined;
+    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
     tablesFilter?: string | string[] | undefined;
     schema: string | string[];
     breakpoints: boolean;
     schemaFilter: string | string[];
 }, {
     out?: string | undefined;
-    driver?: "pg" | "turso" | "better-sqlite" | "libsql" | "d1" | "mysql2" | "expo" | undefined;
+    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
     breakpoints?: boolean | undefined;
     tablesFilter?: string | string[] | undefined;
     schemaFilter?: string | string[] | undefined;
@@ -183,14 +183,14 @@ export declare const mySqlCliConfigSchema: import("zod").ZodIntersection<import(
     schemaFilter: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
 }, "strip", import("zod").ZodTypeAny, {
     out?: string | undefined;
-    driver?: "pg" | "turso" | "better-sqlite" | "libsql" | "d1" | "mysql2" | "expo" | undefined;
+    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
     tablesFilter?: string | string[] | undefined;
     schema: string | string[];
     breakpoints: boolean;
     schemaFilter: string | string[];
 }, {
     out?: string | undefined;
-    driver?: "pg" | "turso" | "better-sqlite" | "libsql" | "d1" | "mysql2" | "expo" | undefined;
+    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
     breakpoints?: boolean | undefined;
     tablesFilter?: string | string[] | undefined;
     schemaFilter?: string | string[] | undefined;

package/cli/index.d.ts

@@ -32,7 +32,7 @@ declare const cliParamsPush: import("zod").ZodObject<{
     connectionString?: string | undefined;
     uri?: string | undefined;
     strict: boolean;
-    dialect: "mysql" | "pg" | "sqlite";
+    dialect: "pg" | "mysql" | "sqlite";
     driver: string;
     verbose: boolean;
 }, {
@@ -50,7 +50,7 @@ declare const cliParamsPush: import("zod").ZodObject<{
     ssl?: string | undefined;
     connectionString?: string | undefined;
     uri?: string | undefined;
-    dialect: "mysql" | "pg" | "sqlite";
+    dialect: "pg" | "mysql" | "sqlite";
     driver: string;
 }>;
 export type CliParamsPush = TypeOf<typeof cliParamsPush>;

package/drivers/index.d.ts

@@ -1,6 +1,4 @@
 import type { Client } from "@libsql/client";
-import { BetterSQLite3Database } from "drizzle-orm/better-sqlite3";
-import { MySql2Database } from "drizzle-orm/mysql2";
 import type { PgDatabase } from "drizzle-orm/pg-core";
 import type { Client as PgClient } from "pg";
 export declare abstract class DrizzleDbClient<T = any> {
@@ -13,22 +11,10 @@ export declare class DrizzleORMPgClient extends DrizzleDbClient<PgDatabase<any>>
     query<K = any>(query: string, values?: any[] | undefined): Promise<K[]>;
     run(query: string): Promise<void>;
 }
-export declare class DrizzleORMMySQLClient extends DrizzleDbClient<MySql2Database<any>> {
-    query<K = any>(query: string, values?: any[] | undefined): Promise<K[]>;
-    run(query: string): Promise<void>;
-}
-export declare class DrizzleORMSQLiteClient extends DrizzleDbClient<BetterSQLite3Database<any>> {
-    query<K = any>(query: string, values?: any[] | undefined): Promise<K[]>;
-    run(query: string): Promise<void>;
-}
 export declare class BetterSqlite extends DrizzleDbClient {
     run(query: string): Promise<void>;
     query(query: string): Promise<any[]>;
 }
-export declare class MySQL2Client extends DrizzleDbClient {
-    run(query: string): Promise<void>;
-    query(query: string): Promise<any>;
-}
 export declare class TursoSqlite extends DrizzleDbClient<Client> {
     run(query: string): Promise<void>;
     query(query: string): Promise<any[]>;

package/global.d.ts

@@ -1,4 +1,3 @@
 export declare const originUUID = "00000000-0000-0000-0000-000000000000";
 export declare const snapshotVersion = "5";
 export declare function assertUnreachable(x: never): never;
-export declare const mapValues: <IN, OUT>(obj: Record<string, IN>, map: (input: IN) => OUT) => Record<string, OUT>;

package/index.d.mts

@@ -1,4 +1,3 @@
-import { Dialect } from "./schemaValidator";
 export type DbConnection = {
     driver: "turso";
     dbCredentials: {
@@ -46,14 +45,13 @@ export type DbConnection = {
     };
 };
 export type Config = {
-    dialect?: Dialect;
-    out?: string;
-    breakpoints?: boolean;
-    tablesFilter?: string | string[];
-    schemaFilter?: string | string[];
+    out?: string | undefined;
+    breakpoints?: boolean | undefined;
+    tablesFilter?: string | string[] | undefined;
+    schemaFilter?: string | string[] | undefined;
     schema?: string | string[];
-    verbose?: boolean;
-    strict?: boolean;
+    verbose?: boolean | undefined;
+    strict?: boolean | undefined;
 } & {
     introspect?: {
         casing: "camel" | "preserve";

package/index.d.ts

@@ -1,4 +1,3 @@
-import { Dialect } from "./schemaValidator";
 export type DbConnection = {
     driver: "turso";
     dbCredentials: {
@@ -46,14 +45,13 @@ export type DbConnection = {
     };
 };
 export type Config = {
-    dialect?: Dialect;
-    out?: string;
-    breakpoints?: boolean;
-    tablesFilter?: string | string[];
-    schemaFilter?: string | string[];
+    out?: string | undefined;
+    breakpoints?: boolean | undefined;
+    tablesFilter?: string | string[] | undefined;
+    schemaFilter?: string | string[] | undefined;
     schema?: string | string[];
-    verbose?: boolean;
-    strict?: boolean;
+    verbose?: boolean | undefined;
+    strict?: boolean | undefined;
 } & {
     introspect?: {
         casing: "camel" | "preserve";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.14-6ce9d1f",
+  "version": "0.20.14-95be75d",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "sim:sqlite": "node -r esbuild-register ./dev/sqlite/index.ts",
     "test": "ava test --timeout=60s",
     "build": "rm -rf ./dist && tsc -p tsconfig.cli-types.json && pnpm mts && tsx build.ts",
-    "mts": "cp dist/index.d.ts dist/index.d.mts && cp dist/utils-studio.d.ts dist/utils-studio.d.mts && cp dist/payload.d.ts dist/payload.d.mts",
+    "mts": "cp dist/index.d.ts dist/index.d.mts && cp dist/utils-studio.d.ts dist/utils-studio.d.mts",
     "build:dev": "rm -rf ./dist && tsx build.dev.ts && tsc -p tsconfig.cli-types.json && chmod +x ./dist/index.cjs",
     "packit": "pnpm build && cp package.json dist/ && cd dist && pnpm pack",
     "tsc": "tsc -p tsconfig.build.json",
@@ -73,7 +73,7 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",
-    "@libsql/client": "^0.4.2",
+    "@libsql/client": "^0.1.6",
     "@types/better-sqlite3": "^7.6.4",
     "@types/dockerode": "^3.3.14",
     "@types/glob": "^8.1.0",
@@ -128,18 +128,6 @@
       },
       "types": "./utils-studio.d.mts",
       "default": "./utils-studio.mjs"
-    },
-    "./payload": {
-      "import": {
-        "types": "./payload.d.mts",
-        "default": "./payload.mjs"
-      },
-      "require": {
-        "types": "./payload.d.ts",
-        "default": "./payload.js"
-      },
-      "types": "./payload.d.mts",
-      "default": "./payload.mjs"
     }
   }
 }

package/serializer/mysqlImports.d.ts

@@ -1,9 +1,4 @@
 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 { 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: DrizzleDbClient, inputSchema: string, tablesFilter?: (table: string) => boolean, progressCallback?: ((stage: IntrospectStage, count: number, status: IntrospectStatus) => void) | undefined) => Promise<MySqlSchemaInternal>;
+export declare const fromDatabase: (db: Connection, inputSchema: string, tablesFilter?: (table: string) => boolean, progressCallback?: ((stage: IntrospectStage, count: number, status: IntrospectStatus) => void) | undefined) => Promise<MySqlSchemaInternal>;

package/serializer/sqliteImports.d.ts

@@ -1,8 +1,4 @@
 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

@@ -1639,7 +1639,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}' and INFORMATION_SCHEMA.COLUMNS.table_schema = '${tableSchema}'
+   WHERE  a.attrelid = '"${tableSchema}"."${tableName}"'::regclass and INFORMATION_SCHEMA.COLUMNS.table_name = '${tableName}'
    AND    a.attnum > 0
    AND    NOT a.attisdropped
    ORDER  BY a.attnum;`

package/utils-studio.mjs

@@ -1648,7 +1648,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}' and INFORMATION_SCHEMA.COLUMNS.table_schema = '${tableSchema}'
+   WHERE  a.attrelid = '"${tableSchema}"."${tableName}"'::regclass and INFORMATION_SCHEMA.COLUMNS.table_name = '${tableName}'
    AND    a.attnum > 0
    AND    NOT a.attisdropped
    ORDER  BY a.attnum;`

package/utils.d.ts

@@ -1,5 +1,8 @@
-import type { Dialect } from "./schemaValidator";
+import { 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;
@@ -19,6 +22,7 @@ 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[];
@@ -197,3 +201,13 @@ 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>>;