drizzle-kit 0.20.5-1f065b5 → 0.20.5-c7dc2fe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.5-1f065b5",
+  "version": "0.20.5-c7dc2fe",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -10,7 +10,7 @@
   "scripts": {
     "test:pg:push": "drizzle-kit push:pg",
     "payload": "tsx ./dev/payload.ts",
-    "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
+    "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema2.ts",
     "push": "node -r esbuild-register ./src/cli/index.ts push:mysql",
     "push:sqlite": "node -r ./src/loader.mjs ./src/cli/index.ts push:sqlite",
     "try1": "tsx ./src/t.ts",
@@ -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",
@@ -61,6 +61,7 @@
     "camelcase": "^7.0.1",
     "chalk": "^5.2.0",
     "commander": "^9.4.1",
+    "drizzle-kit": "0.19.13",
     "esbuild": "^0.18.6",
     "esbuild-register": "^3.4.2",
     "glob": "^8.1.0",
@@ -85,7 +86,7 @@
     "better-sqlite3": "^8.4.0",
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
-    "drizzle-orm": "0.29.0-d3b1c58",
+    "drizzle-orm": "0.29.0",
     "esbuild-node-externals": "^1.9.0",
     "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
@@ -124,18 +125,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 "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: 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/serializer/studioUtils.d.ts

@@ -0,0 +1,53 @@
+import type { Setup } from "@drizzle-team/studio";
+import { Relations } from "drizzle-orm";
+import { AnyMySqlTable } from "drizzle-orm/mysql-core";
+import { AnyPgTable } from "drizzle-orm/pg-core";
+import { AnySQLiteTable } from "drizzle-orm/sqlite-core";
+import { MySQLConnectionConfig } from "src/cli/validations/mysql";
+import { PgConnectionConfig } from "src/cli/validations/pg";
+import { StudioConfigConnections, StudioSqliteConnectionConfig as StudioSQLiteConnectionConfig } from "src/cli/validations/studio";
+export declare const preparePgSchema: (path: string | string[]) => Promise<{
+    schema: Record<string, Record<string, AnyPgTable<{}>>>;
+    relations: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>>>;
+}>;
+export declare const prepareMySqlSchema: (path: string | string[]) => Promise<{
+    schema: Record<string, Record<string, AnyMySqlTable<{}>>>;
+    relations: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>>>;
+}>;
+export declare const prepareSQLiteSchema: (path: string | string[]) => Promise<{
+    schema: Record<string, Record<string, AnySQLiteTable<{}>>>;
+    relations: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>>>;
+}>;
+export declare const prepareModels: (path: string | string[]) => Promise<{
+    pgSchema: Record<string, AnyPgTable<{}> | Relations<string, Record<string, import("drizzle-orm").Relation<string>>>>;
+    mysqlSchema: Record<string, AnyMySqlTable<{}> | Relations<string, Record<string, import("drizzle-orm").Relation<string>>>>;
+    sqliteSchema: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>> | AnySQLiteTable<{}>>;
+}>;
+export declare const drizzleForPostgres: (connectionConfig: PgConnectionConfig, pgSchema: Record<string, Record<string, AnyPgTable>>, relations: Record<string, Relations>, verbose: boolean) => Promise<Setup>;
+export declare const drizzleForMySQL: (config: MySQLConnectionConfig, mysqlSchema: Record<string, Record<string, AnyMySqlTable>>, relations: Record<string, Relations>, verbose: boolean) => Promise<Setup>;
+export declare const drizzleForSQLite: (config: StudioSQLiteConnectionConfig, sqliteSchema: Record<string, Record<string, AnySQLiteTable>>, relations: Record<string, Relations>, verbose: boolean) => Promise<Setup>;
+export declare const drizzleDb: (drizzleConfig: StudioConfigConnections, models: {
+    pgSchema?: Record<string, AnyPgTable | Relations>;
+    mysqlSchema?: Record<string, AnyMySqlTable | Relations>;
+    sqliteSchema?: Record<string, AnySQLiteTable | Relations>;
+}, logger: boolean) => Promise<{
+    db: import("drizzle-orm/node-postgres").NodePgDatabase<Record<string, never>>;
+    type: "pg";
+    schema: Record<string, AnyPgTable<{}> | Relations<string, Record<string, import("drizzle-orm").Relation<string>>>> | undefined;
+} | {
+    db: import("drizzle-orm/mysql2").MySql2Database<Record<string, never>>;
+    type: "mysql";
+    schema: Record<string, AnyMySqlTable<{}> | Relations<string, Record<string, import("drizzle-orm").Relation<string>>>> | undefined;
+} | {
+    db: import("../orm-extenstions/d1-driver/driver").DrizzleD1WranglerDatabase<Record<string, never>>;
+    type: "sqlite";
+    schema: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>> | AnySQLiteTable<{}>> | undefined;
+} | {
+    db: import("drizzle-orm/better-sqlite3").BetterSQLite3Database<Record<string, never>>;
+    type: "sqlite";
+    schema: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>> | AnySQLiteTable<{}>> | undefined;
+} | {
+    db: import("drizzle-orm/libsql").LibSQLDatabase<Record<string, never>>;
+    type: "sqlite";
+    schema: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>> | AnySQLiteTable<{}>> | undefined;
+}>;

package/utils-studio.js

@@ -739,12 +739,13 @@ var init_pgSerializer = __esm({
               if (cprimaryKey.length > 1) {
                 const tableCompositePkName = await db.query(
                   `SELECT conname AS primary_key
-                FROM   pg_constraint 
-                WHERE  contype = 'p' 
-                AND    connamespace = '${tableSchema}'::regnamespace  
-                AND    (conrelid::regclass::text = '"${tableName}"' OR conrelid::regclass::text = '${tableName}');`
+            FROM   pg_constraint join pg_class on (pg_class.oid = conrelid)
+            WHERE  contype = 'p' 
+            AND    connamespace = $1::regnamespace  
+            AND    pg_class.relname = $2;`,
+                  [tableSchema, tableName]
                 );
-                primaryKeys[`${tableName}_${cprimaryKey.map((pk) => pk.column_name).join("_")}`] = {
+                primaryKeys[tableCompositePkName[0].primary_key] = {
                   name: tableCompositePkName[0].primary_key,
                   columns: cprimaryKey.map((c) => c.column_name)
                 };

package/utils-studio.mjs

@@ -771,12 +771,13 @@ var init_pgSerializer = __esm({
               if (cprimaryKey.length > 1) {
                 const tableCompositePkName = await db.query(
                   `SELECT conname AS primary_key
-                FROM   pg_constraint 
-                WHERE  contype = 'p' 
-                AND    connamespace = '${tableSchema}'::regnamespace  
-                AND    (conrelid::regclass::text = '"${tableName}"' OR conrelid::regclass::text = '${tableName}');`
+            FROM   pg_constraint join pg_class on (pg_class.oid = conrelid)
+            WHERE  contype = 'p' 
+            AND    connamespace = $1::regnamespace  
+            AND    pg_class.relname = $2;`,
+                  [tableSchema, tableName]
                 );
-                primaryKeys[`${tableName}_${cprimaryKey.map((pk) => pk.column_name).join("_")}`] = {
+                primaryKeys[tableCompositePkName[0].primary_key] = {
                   name: tableCompositePkName[0].primary_key,
                   columns: cprimaryKey.map((c) => c.column_name)
                 };

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[];
@@ -195,3 +199,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>>;