@erfanium/drizzle-orm 0.1.0 → 1.0.1

package/mysql-proxy/migrator.cjs

@@ -1,60 +1,50 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var migrator_exports = {};
-__export(migrator_exports, {
-  migrate: () => migrate
-});
-module.exports = __toCommonJS(migrator_exports);
-var import_migrator = require("../migrator.cjs");
-var import_sql = require("../sql/sql.cjs");
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
+let __sql_sql_ts = require("../sql/sql.cjs");
+let __migrator_ts = require("../migrator.cjs");
+let __migrator_utils_ts = require("../migrator.utils.cjs");
+let __up_migrations_mysql_proxy_ts = require("../up-migrations/mysql-proxy.cjs");
+
+//#region src/mysql-proxy/migrator.ts
 async function migrate(db, callback, config) {
-  const migrations = (0, import_migrator.readMigrationFiles)(config);
-  const migrationsTable = config.migrationsTable ?? "__drizzle_migrations";
-  const migrationTableCreate = import_sql.sql`
-		create table if not exists ${import_sql.sql.identifier(migrationsTable)} (
-			id serial primary key,
-			hash text not null,
-			created_at bigint
-		)
-	`;
-  await db.execute(migrationTableCreate);
-  const dbMigrations = await db.select({
-    id: import_sql.sql.raw("id"),
-    hash: import_sql.sql.raw("hash"),
-    created_at: import_sql.sql.raw("created_at")
-  }).from(import_sql.sql.identifier(migrationsTable).getSQL()).orderBy(
-    import_sql.sql.raw("created_at desc")
-  ).limit(1);
-  const lastDbMigration = dbMigrations[0];
-  const queriesToRun = [];
-  for (const migration of migrations) {
-    if (!lastDbMigration || Number(lastDbMigration.created_at) < migration.folderMillis) {
-      queriesToRun.push(
-        ...migration.sql,
-        `insert into ${import_sql.sql.identifier(migrationsTable).value} (\`hash\`, \`created_at\`) values('${migration.hash}', '${migration.folderMillis}')`
-      );
-    }
-  }
-  await callback(queriesToRun);
+	const migrations = (0, __migrator_ts.readMigrationFiles)(config);
+	const migrationsTable = config.migrationsTable ?? "__drizzle_migrations";
+	const { newDb } = await (0, __up_migrations_mysql_proxy_ts.upgradeIfNeeded)(migrationsTable, db, callback, migrations);
+	if (newDb) {
+		const migrationTableCreate = __sql_sql_ts.sql`
+			CREATE TABLE IF NOT EXISTS ${__sql_sql_ts.sql.identifier(migrationsTable)} (
+				id SERIAL PRIMARY KEY,
+				hash TEXT NOT NULL,
+				created_at BIGINT,
+				name TEXT,
+				applied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+			)
+		`;
+		await db.session.execute(migrationTableCreate);
+	}
+	const dbMigrations = await db.select({
+		id: __sql_sql_ts.sql.raw("id"),
+		hash: __sql_sql_ts.sql.raw("hash"),
+		created_at: __sql_sql_ts.sql.raw("created_at"),
+		name: __sql_sql_ts.sql.raw("name")
+	}).from(__sql_sql_ts.sql.identifier(migrationsTable).getSQL());
+	if (typeof config === "object" && config.init) {
+		if (dbMigrations.length) return { exitCode: "databaseMigrations" };
+		if (migrations.length > 1) return { exitCode: "localMigrations" };
+		const [migration] = migrations;
+		if (!migration) return;
+		await callback([db.dialect.sqlToQuery(__sql_sql_ts.sql`insert into ${__sql_sql_ts.sql.identifier(migrationsTable)} (\`hash\`, \`created_at\`, \`name\`) values(${migration.hash}, '${migration.folderMillis}', ${migration.name})`.inlineParams()).sql]);
+		return;
+	}
+	const migrationsToRun = (0, __migrator_utils_ts.getMigrationsToRun)({
+		localMigrations: migrations,
+		dbMigrations
+	});
+	const queriesToRun = [];
+	for (const migration of migrationsToRun) queriesToRun.push(...migration.sql, db.dialect.sqlToQuery(__sql_sql_ts.sql`insert into ${__sql_sql_ts.sql.identifier(migrationsTable)} (\`hash\`, \`created_at\`, \`name\`) values(${migration.hash}, '${migration.folderMillis}', ${migration.name})`.inlineParams()).sql);
+	await callback(queriesToRun);
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  migrate
-});
+
+//#endregion
+exports.migrate = migrate;
 //# sourceMappingURL=migrator.cjs.map

package/mysql-proxy/migrator.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mysql-proxy/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { sql } from '~/sql/sql.ts';\nimport type { MySqlRemoteDatabase } from './driver.ts';\n\nexport type ProxyMigrator = (migrationQueries: string[]) => Promise<void>;\n\nexport async function migrate<TSchema extends Record<string, unknown>>(\n\tdb: MySqlRemoteDatabase<TSchema>,\n\tcallback: ProxyMigrator,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\n\tconst migrationsTable = config.migrationsTable ?? '__drizzle_migrations';\n\tconst migrationTableCreate = sql`\n\t\tcreate table if not exists ${sql.identifier(migrationsTable)} (\n\t\t\tid serial primary key,\n\t\t\thash text not null,\n\t\t\tcreated_at bigint\n\t\t)\n\t`;\n\tawait db.execute(migrationTableCreate);\n\n\tconst dbMigrations = await db.select({\n\t\tid: sql.raw('id'),\n\t\thash: sql.raw('hash'),\n\t\tcreated_at: sql.raw('created_at'),\n\t}).from(sql.identifier(migrationsTable).getSQL()).orderBy(\n\t\tsql.raw('created_at desc'),\n\t).limit(1);\n\n\tconst lastDbMigration = dbMigrations[0];\n\n\tconst queriesToRun: string[] = [];\n\n\tfor (const migration of migrations) {\n\t\tif (\n\t\t\t!lastDbMigration\n\t\t\t|| Number(lastDbMigration.created_at) < migration.folderMillis\n\t\t) {\n\t\t\tqueriesToRun.push(\n\t\t\t\t...migration.sql,\n\t\t\t\t`insert into ${\n\t\t\t\t\tsql.identifier(migrationsTable).value\n\t\t\t\t} (\\`hash\\`, \\`created_at\\`) values('${migration.hash}', '${migration.folderMillis}')`,\n\t\t\t);\n\t\t}\n\t}\n\n\tawait callback(queriesToRun);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,sBAAmC;AACnC,iBAAoB;AAKpB,eAAsB,QACrB,IACA,UACA,QACC;AACD,QAAM,iBAAa,oCAAmB,MAAM;AAE5C,QAAM,kBAAkB,OAAO,mBAAmB;AAClD,QAAM,uBAAuB;AAAA,+BACC,eAAI,WAAW,eAAe,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAM7D,QAAM,GAAG,QAAQ,oBAAoB;AAErC,QAAM,eAAe,MAAM,GAAG,OAAO;AAAA,IACpC,IAAI,eAAI,IAAI,IAAI;AAAA,IAChB,MAAM,eAAI,IAAI,MAAM;AAAA,IACpB,YAAY,eAAI,IAAI,YAAY;AAAA,EACjC,CAAC,EAAE,KAAK,eAAI,WAAW,eAAe,EAAE,OAAO,CAAC,EAAE;AAAA,IACjD,eAAI,IAAI,iBAAiB;AAAA,EAC1B,EAAE,MAAM,CAAC;AAET,QAAM,kBAAkB,aAAa,CAAC;AAEtC,QAAM,eAAyB,CAAC;AAEhC,aAAW,aAAa,YAAY;AACnC,QACC,CAAC,mBACE,OAAO,gBAAgB,UAAU,IAAI,UAAU,cACjD;AACD,mBAAa;AAAA,QACZ,GAAG,UAAU;AAAA,QACb,eACC,eAAI,WAAW,eAAe,EAAE,KACjC,uCAAuC,UAAU,IAAI,OAAO,UAAU,YAAY;AAAA,MACnF;AAAA,IACD;AAAA,EACD;AAEA,QAAM,SAAS,YAAY;AAC5B;","names":[]}
+{"version":3,"file":"migrator.cjs","names":["sql"],"sources":["../../src/mysql-proxy/migrator.ts"],"sourcesContent":["import type { MigrationConfig, MigratorInitFailResponse } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { getMigrationsToRun } from '~/migrator.utils.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { sql } from '~/sql/sql.ts';\nimport { upgradeIfNeeded } from '~/up-migrations/mysql-proxy.ts';\nimport type { MySqlRemoteDatabase } from './driver.ts';\n\nexport type ProxyMigrator = (migrationQueries: string[]) => Promise<void>;\n\nexport async function migrate<TRelations extends AnyRelations>(\n\tdb: MySqlRemoteDatabase<TRelations>,\n\tcallback: ProxyMigrator,\n\tconfig: MigrationConfig,\n): Promise<void | MigratorInitFailResponse> {\n\tconst migrations = readMigrationFiles(config);\n\n\tconst migrationsTable = config.migrationsTable ?? '__drizzle_migrations';\n\n\t// Detect DB version and upgrade table schema if needed\n\tconst { newDb } = await upgradeIfNeeded(migrationsTable, db, callback, migrations);\n\n\tif (newDb) {\n\t\tconst migrationTableCreate = sql`\n\t\t\tCREATE TABLE IF NOT EXISTS ${sql.identifier(migrationsTable)} (\n\t\t\t\tid SERIAL PRIMARY KEY,\n\t\t\t\thash TEXT NOT NULL,\n\t\t\t\tcreated_at BIGINT,\n\t\t\t\tname TEXT,\n\t\t\t\tapplied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP\n\t\t\t)\n\t\t`;\n\t\tawait db.session.execute(migrationTableCreate);\n\t}\n\n\tconst dbMigrations = await db.select({\n\t\tid: sql.raw('id'),\n\t\thash: sql.raw('hash'),\n\t\tcreated_at: sql.raw('created_at'),\n\t\tname: sql.raw('name'),\n\t}).from(sql.identifier(migrationsTable).getSQL()) as {\n\t\tid: number;\n\t\thash: string;\n\t\tcreated_at: string;\n\t\tname: string | null;\n\t}[];\n\n\tif (typeof config === 'object' && config.init) {\n\t\tif (dbMigrations.length) {\n\t\t\treturn { exitCode: 'databaseMigrations' as const };\n\t\t}\n\n\t\tif (migrations.length > 1) {\n\t\t\treturn { exitCode: 'localMigrations' as const };\n\t\t}\n\n\t\tconst [migration] = migrations;\n\n\t\tif (!migration) return;\n\n\t\tawait callback([\n\t\t\tdb.dialect.sqlToQuery(\n\t\t\t\tsql`insert into ${\n\t\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t\t} (\\`hash\\`, \\`created_at\\`, \\`name\\`) values(${migration.hash}, '${migration.folderMillis}', ${migration.name})`\n\t\t\t\t\t.inlineParams(),\n\t\t\t).sql,\n\t\t]);\n\n\t\treturn;\n\t}\n\n\tconst migrationsToRun = getMigrationsToRun({ localMigrations: migrations, dbMigrations });\n\tconst queriesToRun: string[] = [];\n\tfor (const migration of migrationsToRun) {\n\t\tqueriesToRun.push(\n\t\t\t...migration.sql,\n\t\t\tdb.dialect.sqlToQuery(\n\t\t\t\tsql`insert into ${\n\t\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t\t} (\\`hash\\`, \\`created_at\\`, \\`name\\`) values(${migration.hash}, '${migration.folderMillis}', ${migration.name})`\n\t\t\t\t\t.inlineParams(),\n\t\t\t).sql,\n\t\t);\n\t}\n\n\tawait callback(queriesToRun);\n}\n"],"mappings":";;;;;;;;AAUA,eAAsB,QACrB,IACA,UACA,QAC2C;CAC3C,MAAM,mDAAgC,OAAO;CAE7C,MAAM,kBAAkB,OAAO,mBAAmB;CAGlD,MAAM,EAAE,UAAU,0DAAsB,iBAAiB,IAAI,UAAU,WAAW;AAElF,KAAI,OAAO;EACV,MAAM,uBAAuB,gBAAG;gCACFA,iBAAI,WAAW,gBAAgB,CAAC;;;;;;;;AAQ9D,QAAM,GAAG,QAAQ,QAAQ,qBAAqB;;CAG/C,MAAM,eAAe,MAAM,GAAG,OAAO;EACpC,IAAIA,iBAAI,IAAI,KAAK;EACjB,MAAMA,iBAAI,IAAI,OAAO;EACrB,YAAYA,iBAAI,IAAI,aAAa;EACjC,MAAMA,iBAAI,IAAI,OAAO;EACrB,CAAC,CAAC,KAAKA,iBAAI,WAAW,gBAAgB,CAAC,QAAQ,CAAC;AAOjD,KAAI,OAAO,WAAW,YAAY,OAAO,MAAM;AAC9C,MAAI,aAAa,OAChB,QAAO,EAAE,UAAU,sBAA+B;AAGnD,MAAI,WAAW,SAAS,EACvB,QAAO,EAAE,UAAU,mBAA4B;EAGhD,MAAM,CAAC,aAAa;AAEpB,MAAI,CAAC,UAAW;AAEhB,QAAM,SAAS,CACd,GAAG,QAAQ,WACV,gBAAG,eACFA,iBAAI,WAAW,gBAAgB,CAC/B,+CAA+C,UAAU,KAAK,KAAK,UAAU,aAAa,KAAK,UAAU,KAAK,GAC7G,cAAc,CAChB,CAAC,IACF,CAAC;AAEF;;CAGD,MAAM,8DAAqC;EAAE,iBAAiB;EAAY;EAAc,CAAC;CACzF,MAAM,eAAyB,EAAE;AACjC,MAAK,MAAM,aAAa,gBACvB,cAAa,KACZ,GAAG,UAAU,KACb,GAAG,QAAQ,WACV,gBAAG,eACFA,iBAAI,WAAW,gBAAgB,CAC/B,+CAA+C,UAAU,KAAK,KAAK,UAAU,aAAa,KAAK,UAAU,KAAK,GAC7G,cAAc,CAChB,CAAC,IACF;AAGF,OAAM,SAAS,aAAa"}

package/mysql-proxy/migrator.d.cts

@@ -1,4 +1,5 @@
-import type { MigrationConfig } from "../migrator.cjs";
-import type { MySqlRemoteDatabase } from "./driver.cjs";
+import type { MigrationConfig, MigratorInitFailResponse } from '../migrator.cjs';
+import type { AnyRelations } from '../relations.cjs';
+import type { MySqlRemoteDatabase } from './driver.cjs';
 export type ProxyMigrator = (migrationQueries: string[]) => Promise<void>;
-export declare function migrate<TSchema extends Record<string, unknown>>(db: MySqlRemoteDatabase<TSchema>, callback: ProxyMigrator, config: MigrationConfig): Promise<void>;
+export declare function migrate<TRelations extends AnyRelations>(db: MySqlRemoteDatabase<TRelations>, callback: ProxyMigrator, config: MigrationConfig): Promise<void | MigratorInitFailResponse>;

package/mysql-proxy/migrator.d.ts

@@ -1,4 +1,5 @@
-import type { MigrationConfig } from "../migrator.js";
-import type { MySqlRemoteDatabase } from "./driver.js";
+import type { MigrationConfig, MigratorInitFailResponse } from '../migrator.js';
+import type { AnyRelations } from '../relations.js';
+import type { MySqlRemoteDatabase } from './driver.js';
 export type ProxyMigrator = (migrationQueries: string[]) => Promise<void>;
-export declare function migrate<TSchema extends Record<string, unknown>>(db: MySqlRemoteDatabase<TSchema>, callback: ProxyMigrator, config: MigrationConfig): Promise<void>;
+export declare function migrate<TRelations extends AnyRelations>(db: MySqlRemoteDatabase<TRelations>, callback: ProxyMigrator, config: MigrationConfig): Promise<void | MigratorInitFailResponse>;

package/mysql-proxy/migrator.js

@@ -1,36 +1,48 @@
-import { readMigrationFiles } from "../migrator.js";
 import { sql } from "../sql/sql.js";
+import { readMigrationFiles } from "../migrator.js";
+import { getMigrationsToRun } from "../migrator.utils.js";
+import { upgradeIfNeeded } from "../up-migrations/mysql-proxy.js";
+
+//#region src/mysql-proxy/migrator.ts
 async function migrate(db, callback, config) {
-  const migrations = readMigrationFiles(config);
-  const migrationsTable = config.migrationsTable ?? "__drizzle_migrations";
-  const migrationTableCreate = sql`
-		create table if not exists ${sql.identifier(migrationsTable)} (
-			id serial primary key,
-			hash text not null,
-			created_at bigint
-		)
-	`;
-  await db.execute(migrationTableCreate);
-  const dbMigrations = await db.select({
-    id: sql.raw("id"),
-    hash: sql.raw("hash"),
-    created_at: sql.raw("created_at")
-  }).from(sql.identifier(migrationsTable).getSQL()).orderBy(
-    sql.raw("created_at desc")
-  ).limit(1);
-  const lastDbMigration = dbMigrations[0];
-  const queriesToRun = [];
-  for (const migration of migrations) {
-    if (!lastDbMigration || Number(lastDbMigration.created_at) < migration.folderMillis) {
-      queriesToRun.push(
-        ...migration.sql,
-        `insert into ${sql.identifier(migrationsTable).value} (\`hash\`, \`created_at\`) values('${migration.hash}', '${migration.folderMillis}')`
-      );
-    }
-  }
-  await callback(queriesToRun);
+	const migrations = readMigrationFiles(config);
+	const migrationsTable = config.migrationsTable ?? "__drizzle_migrations";
+	const { newDb } = await upgradeIfNeeded(migrationsTable, db, callback, migrations);
+	if (newDb) {
+		const migrationTableCreate = sql`
+			CREATE TABLE IF NOT EXISTS ${sql.identifier(migrationsTable)} (
+				id SERIAL PRIMARY KEY,
+				hash TEXT NOT NULL,
+				created_at BIGINT,
+				name TEXT,
+				applied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+			)
+		`;
+		await db.session.execute(migrationTableCreate);
+	}
+	const dbMigrations = await db.select({
+		id: sql.raw("id"),
+		hash: sql.raw("hash"),
+		created_at: sql.raw("created_at"),
+		name: sql.raw("name")
+	}).from(sql.identifier(migrationsTable).getSQL());
+	if (typeof config === "object" && config.init) {
+		if (dbMigrations.length) return { exitCode: "databaseMigrations" };
+		if (migrations.length > 1) return { exitCode: "localMigrations" };
+		const [migration] = migrations;
+		if (!migration) return;
+		await callback([db.dialect.sqlToQuery(sql`insert into ${sql.identifier(migrationsTable)} (\`hash\`, \`created_at\`, \`name\`) values(${migration.hash}, '${migration.folderMillis}', ${migration.name})`.inlineParams()).sql]);
+		return;
+	}
+	const migrationsToRun = getMigrationsToRun({
+		localMigrations: migrations,
+		dbMigrations
+	});
+	const queriesToRun = [];
+	for (const migration of migrationsToRun) queriesToRun.push(...migration.sql, db.dialect.sqlToQuery(sql`insert into ${sql.identifier(migrationsTable)} (\`hash\`, \`created_at\`, \`name\`) values(${migration.hash}, '${migration.folderMillis}', ${migration.name})`.inlineParams()).sql);
+	await callback(queriesToRun);
 }
-export {
-  migrate
-};
+
+//#endregion
+export { migrate };
 //# sourceMappingURL=migrator.js.map

package/mysql-proxy/migrator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mysql-proxy/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { sql } from '~/sql/sql.ts';\nimport type { MySqlRemoteDatabase } from './driver.ts';\n\nexport type ProxyMigrator = (migrationQueries: string[]) => Promise<void>;\n\nexport async function migrate<TSchema extends Record<string, unknown>>(\n\tdb: MySqlRemoteDatabase<TSchema>,\n\tcallback: ProxyMigrator,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\n\tconst migrationsTable = config.migrationsTable ?? '__drizzle_migrations';\n\tconst migrationTableCreate = sql`\n\t\tcreate table if not exists ${sql.identifier(migrationsTable)} (\n\t\t\tid serial primary key,\n\t\t\thash text not null,\n\t\t\tcreated_at bigint\n\t\t)\n\t`;\n\tawait db.execute(migrationTableCreate);\n\n\tconst dbMigrations = await db.select({\n\t\tid: sql.raw('id'),\n\t\thash: sql.raw('hash'),\n\t\tcreated_at: sql.raw('created_at'),\n\t}).from(sql.identifier(migrationsTable).getSQL()).orderBy(\n\t\tsql.raw('created_at desc'),\n\t).limit(1);\n\n\tconst lastDbMigration = dbMigrations[0];\n\n\tconst queriesToRun: string[] = [];\n\n\tfor (const migration of migrations) {\n\t\tif (\n\t\t\t!lastDbMigration\n\t\t\t|| Number(lastDbMigration.created_at) < migration.folderMillis\n\t\t) {\n\t\t\tqueriesToRun.push(\n\t\t\t\t...migration.sql,\n\t\t\t\t`insert into ${\n\t\t\t\t\tsql.identifier(migrationsTable).value\n\t\t\t\t} (\\`hash\\`, \\`created_at\\`) values('${migration.hash}', '${migration.folderMillis}')`,\n\t\t\t);\n\t\t}\n\t}\n\n\tawait callback(queriesToRun);\n}\n"],"mappings":"AACA,SAAS,0BAA0B;AACnC,SAAS,WAAW;AAKpB,eAAsB,QACrB,IACA,UACA,QACC;AACD,QAAM,aAAa,mBAAmB,MAAM;AAE5C,QAAM,kBAAkB,OAAO,mBAAmB;AAClD,QAAM,uBAAuB;AAAA,+BACC,IAAI,WAAW,eAAe,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAM7D,QAAM,GAAG,QAAQ,oBAAoB;AAErC,QAAM,eAAe,MAAM,GAAG,OAAO;AAAA,IACpC,IAAI,IAAI,IAAI,IAAI;AAAA,IAChB,MAAM,IAAI,IAAI,MAAM;AAAA,IACpB,YAAY,IAAI,IAAI,YAAY;AAAA,EACjC,CAAC,EAAE,KAAK,IAAI,WAAW,eAAe,EAAE,OAAO,CAAC,EAAE;AAAA,IACjD,IAAI,IAAI,iBAAiB;AAAA,EAC1B,EAAE,MAAM,CAAC;AAET,QAAM,kBAAkB,aAAa,CAAC;AAEtC,QAAM,eAAyB,CAAC;AAEhC,aAAW,aAAa,YAAY;AACnC,QACC,CAAC,mBACE,OAAO,gBAAgB,UAAU,IAAI,UAAU,cACjD;AACD,mBAAa;AAAA,QACZ,GAAG,UAAU;AAAA,QACb,eACC,IAAI,WAAW,eAAe,EAAE,KACjC,uCAAuC,UAAU,IAAI,OAAO,UAAU,YAAY;AAAA,MACnF;AAAA,IACD;AAAA,EACD;AAEA,QAAM,SAAS,YAAY;AAC5B;","names":[]}
+{"version":3,"file":"migrator.js","names":[],"sources":["../../src/mysql-proxy/migrator.ts"],"sourcesContent":["import type { MigrationConfig, MigratorInitFailResponse } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { getMigrationsToRun } from '~/migrator.utils.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { sql } from '~/sql/sql.ts';\nimport { upgradeIfNeeded } from '~/up-migrations/mysql-proxy.ts';\nimport type { MySqlRemoteDatabase } from './driver.ts';\n\nexport type ProxyMigrator = (migrationQueries: string[]) => Promise<void>;\n\nexport async function migrate<TRelations extends AnyRelations>(\n\tdb: MySqlRemoteDatabase<TRelations>,\n\tcallback: ProxyMigrator,\n\tconfig: MigrationConfig,\n): Promise<void | MigratorInitFailResponse> {\n\tconst migrations = readMigrationFiles(config);\n\n\tconst migrationsTable = config.migrationsTable ?? '__drizzle_migrations';\n\n\t// Detect DB version and upgrade table schema if needed\n\tconst { newDb } = await upgradeIfNeeded(migrationsTable, db, callback, migrations);\n\n\tif (newDb) {\n\t\tconst migrationTableCreate = sql`\n\t\t\tCREATE TABLE IF NOT EXISTS ${sql.identifier(migrationsTable)} (\n\t\t\t\tid SERIAL PRIMARY KEY,\n\t\t\t\thash TEXT NOT NULL,\n\t\t\t\tcreated_at BIGINT,\n\t\t\t\tname TEXT,\n\t\t\t\tapplied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP\n\t\t\t)\n\t\t`;\n\t\tawait db.session.execute(migrationTableCreate);\n\t}\n\n\tconst dbMigrations = await db.select({\n\t\tid: sql.raw('id'),\n\t\thash: sql.raw('hash'),\n\t\tcreated_at: sql.raw('created_at'),\n\t\tname: sql.raw('name'),\n\t}).from(sql.identifier(migrationsTable).getSQL()) as {\n\t\tid: number;\n\t\thash: string;\n\t\tcreated_at: string;\n\t\tname: string | null;\n\t}[];\n\n\tif (typeof config === 'object' && config.init) {\n\t\tif (dbMigrations.length) {\n\t\t\treturn { exitCode: 'databaseMigrations' as const };\n\t\t}\n\n\t\tif (migrations.length > 1) {\n\t\t\treturn { exitCode: 'localMigrations' as const };\n\t\t}\n\n\t\tconst [migration] = migrations;\n\n\t\tif (!migration) return;\n\n\t\tawait callback([\n\t\t\tdb.dialect.sqlToQuery(\n\t\t\t\tsql`insert into ${\n\t\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t\t} (\\`hash\\`, \\`created_at\\`, \\`name\\`) values(${migration.hash}, '${migration.folderMillis}', ${migration.name})`\n\t\t\t\t\t.inlineParams(),\n\t\t\t).sql,\n\t\t]);\n\n\t\treturn;\n\t}\n\n\tconst migrationsToRun = getMigrationsToRun({ localMigrations: migrations, dbMigrations });\n\tconst queriesToRun: string[] = [];\n\tfor (const migration of migrationsToRun) {\n\t\tqueriesToRun.push(\n\t\t\t...migration.sql,\n\t\t\tdb.dialect.sqlToQuery(\n\t\t\t\tsql`insert into ${\n\t\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t\t} (\\`hash\\`, \\`created_at\\`, \\`name\\`) values(${migration.hash}, '${migration.folderMillis}', ${migration.name})`\n\t\t\t\t\t.inlineParams(),\n\t\t\t).sql,\n\t\t);\n\t}\n\n\tawait callback(queriesToRun);\n}\n"],"mappings":";;;;;;AAUA,eAAsB,QACrB,IACA,UACA,QAC2C;CAC3C,MAAM,aAAa,mBAAmB,OAAO;CAE7C,MAAM,kBAAkB,OAAO,mBAAmB;CAGlD,MAAM,EAAE,UAAU,MAAM,gBAAgB,iBAAiB,IAAI,UAAU,WAAW;AAElF,KAAI,OAAO;EACV,MAAM,uBAAuB,GAAG;gCACF,IAAI,WAAW,gBAAgB,CAAC;;;;;;;;AAQ9D,QAAM,GAAG,QAAQ,QAAQ,qBAAqB;;CAG/C,MAAM,eAAe,MAAM,GAAG,OAAO;EACpC,IAAI,IAAI,IAAI,KAAK;EACjB,MAAM,IAAI,IAAI,OAAO;EACrB,YAAY,IAAI,IAAI,aAAa;EACjC,MAAM,IAAI,IAAI,OAAO;EACrB,CAAC,CAAC,KAAK,IAAI,WAAW,gBAAgB,CAAC,QAAQ,CAAC;AAOjD,KAAI,OAAO,WAAW,YAAY,OAAO,MAAM;AAC9C,MAAI,aAAa,OAChB,QAAO,EAAE,UAAU,sBAA+B;AAGnD,MAAI,WAAW,SAAS,EACvB,QAAO,EAAE,UAAU,mBAA4B;EAGhD,MAAM,CAAC,aAAa;AAEpB,MAAI,CAAC,UAAW;AAEhB,QAAM,SAAS,CACd,GAAG,QAAQ,WACV,GAAG,eACF,IAAI,WAAW,gBAAgB,CAC/B,+CAA+C,UAAU,KAAK,KAAK,UAAU,aAAa,KAAK,UAAU,KAAK,GAC7G,cAAc,CAChB,CAAC,IACF,CAAC;AAEF;;CAGD,MAAM,kBAAkB,mBAAmB;EAAE,iBAAiB;EAAY;EAAc,CAAC;CACzF,MAAM,eAAyB,EAAE;AACjC,MAAK,MAAM,aAAa,gBACvB,cAAa,KACZ,GAAG,UAAU,KACb,GAAG,QAAQ,WACV,GAAG,eACF,IAAI,WAAW,gBAAgB,CAC/B,+CAA+C,UAAU,KAAK,KAAK,UAAU,aAAa,KAAK,UAAU,KAAK,GAC7G,cAAc,CAChB,CAAC,IACF;AAGF,OAAM,SAAS,aAAa"}

package/mysql-proxy/session.cjs

@@ -1,137 +1,40 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
+let __entity_ts = require("../entity.cjs");
+let __cache_core_index_ts = require("../cache/core/index.cjs");
+let __logger_ts = require("../logger.cjs");
+let __mysql_core_async_session_ts = require("../mysql-core/async/session.cjs");
+
+//#region src/mysql-proxy/session.ts
+var MySqlRemoteSession = class extends __mysql_core_async_session_ts.MySqlAsyncSession {
+	static [__entity_ts.entityKind] = "MySqlRemoteSession";
+	logger;
+	cache;
+	constructor(client, dialect, relations, options) {
+		super(dialect);
+		this.client = client;
+		this.relations = relations;
+		this.options = options;
+		this.logger = options.logger ?? new __logger_ts.NoopLogger();
+		this.cache = options.cache ?? new __cache_core_index_ts.NoopCache();
+	}
+	prepareQuery(query, mode, mapper, queryMetadata, cacheConfig) {
+		const executor = async (params = []) => {
+			const raw = this.client(query.sql, params, mode === "arrays" ? "all" : "execute");
+			if (mode === "objects") return raw.then(({ rows }) => rows[0]);
+			if (mode === "arrays" || !mapper) return raw.then(({ rows }) => rows);
+			return raw.then(({ rows, insertId, affectedRows }) => ({
+				insertId: insertId ?? rows[0]?.insertId,
+				affectedRows: affectedRows ?? rows[0]?.affectedRows
+			}));
+		};
+		return new __mysql_core_async_session_ts.MySqlAsyncPreparedQuery(executor, void 0, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
+	}
+	async transaction(_transaction, _config) {
+		throw new Error("Transactions are not supported by the MySql Proxy driver");
+	}
 };
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var session_exports = {};
-__export(session_exports, {
-  MySqlProxyTransaction: () => MySqlProxyTransaction,
-  MySqlRemoteSession: () => MySqlRemoteSession,
-  PreparedQuery: () => PreparedQuery
-});
-module.exports = __toCommonJS(session_exports);
-var import_core = require("../cache/core/index.cjs");
-var import_column = require("../column.cjs");
-var import_entity = require("../entity.cjs");
-var import_logger = require("../logger.cjs");
-var import_mysql_core = require("../mysql-core/index.cjs");
-var import_session = require("../mysql-core/session.cjs");
-var import_sql = require("../sql/sql.cjs");
-var import_utils = require("../utils.cjs");
-class MySqlRemoteSession extends import_session.MySqlSession {
-  constructor(client, dialect, schema, options) {
-    super(dialect);
-    this.client = client;
-    this.schema = schema;
-    this.logger = options.logger ?? new import_logger.NoopLogger();
-    this.cache = options.cache ?? new import_core.NoopCache();
-  }
-  static [import_entity.entityKind] = "MySqlRemoteSession";
-  logger;
-  cache;
-  prepareQuery(query, fields, customResultMapper, generatedIds, returningIds, queryMetadata, cacheConfig) {
-    return new PreparedQuery(
-      this.client,
-      query.sql,
-      query.params,
-      this.logger,
-      this.cache,
-      queryMetadata,
-      cacheConfig,
-      fields,
-      customResultMapper,
-      generatedIds,
-      returningIds
-    );
-  }
-  all(query) {
-    const querySql = this.dialect.sqlToQuery(query);
-    this.logger.logQuery(querySql.sql, querySql.params);
-    return this.client(querySql.sql, querySql.params, "all").then(({ rows }) => rows);
-  }
-  async transaction(_transaction, _config) {
-    throw new Error("Transactions are not supported by the MySql Proxy driver");
-  }
-}
-class MySqlProxyTransaction extends import_mysql_core.MySqlTransaction {
-  static [import_entity.entityKind] = "MySqlProxyTransaction";
-  async transaction(_transaction) {
-    throw new Error("Transactions are not supported by the MySql Proxy driver");
-  }
-}
-class PreparedQuery extends import_session.MySqlPreparedQuery {
-  constructor(client, queryString, params, logger, cache, queryMetadata, cacheConfig, fields, customResultMapper, generatedIds, returningIds) {
-    super(cache, queryMetadata, cacheConfig);
-    this.client = client;
-    this.queryString = queryString;
-    this.params = params;
-    this.logger = logger;
-    this.fields = fields;
-    this.customResultMapper = customResultMapper;
-    this.generatedIds = generatedIds;
-    this.returningIds = returningIds;
-  }
-  static [import_entity.entityKind] = "MySqlProxyPreparedQuery";
-  async execute(placeholderValues = {}) {
-    const params = (0, import_sql.fillPlaceholders)(this.params, placeholderValues);
-    const { fields, client, queryString, logger, joinsNotNullableMap, customResultMapper, returningIds, generatedIds } = this;
-    logger.logQuery(queryString, params);
-    if (!fields && !customResultMapper) {
-      const { rows: data } = await this.queryWithCache(queryString, params, async () => {
-        return await client(queryString, params, "execute");
-      });
-      const insertId = data[0].insertId;
-      const affectedRows = data[0].affectedRows;
-      if (returningIds) {
-        const returningResponse = [];
-        let j = 0;
-        for (let i = insertId; i < insertId + affectedRows; i++) {
-          for (const column of returningIds) {
-            const key = returningIds[0].path[0];
-            if ((0, import_entity.is)(column.field, import_column.Column)) {
-              if (column.field.primary && column.field.autoIncrement) {
-                returningResponse.push({ [key]: i });
-              }
-              if (column.field.defaultFn && generatedIds) {
-                returningResponse.push({ [key]: generatedIds[j][key] });
-              }
-            }
-          }
-          j++;
-        }
-        return returningResponse;
-      }
-      return data;
-    }
-    const { rows } = await this.queryWithCache(queryString, params, async () => {
-      return await client(queryString, params, "all");
-    });
-    if (customResultMapper) {
-      return customResultMapper(rows);
-    }
-    return rows.map((row) => (0, import_utils.mapResultRow)(fields, row, joinsNotNullableMap));
-  }
-  iterator(_placeholderValues = {}) {
-    throw new Error("Streaming is not supported by the MySql Proxy driver");
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  MySqlProxyTransaction,
-  MySqlRemoteSession,
-  PreparedQuery
-});
+
+//#endregion
+exports.MySqlRemoteSession = MySqlRemoteSession;
 //# sourceMappingURL=session.cjs.map

package/mysql-proxy/session.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mysql-proxy/session.ts"],"sourcesContent":["import type { FieldPacket, ResultSetHeader } from 'mysql2/promise';\nimport { type Cache, NoopCache } from '~/cache/core/index.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { Column } from '~/column.ts';\nimport { entityKind, is } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport type { MySqlDialect } from '~/mysql-core/dialect.ts';\nimport { MySqlTransaction } from '~/mysql-core/index.ts';\nimport type { SelectedFieldsOrdered } from '~/mysql-core/query-builders/select.types.ts';\nimport type {\n\tMySqlPreparedQueryConfig,\n\tMySqlPreparedQueryHKT,\n\tMySqlQueryResultHKT,\n\tMySqlTransactionConfig,\n\tPreparedQueryKind,\n} from '~/mysql-core/session.ts';\nimport { MySqlPreparedQuery as PreparedQueryBase, MySqlSession } from '~/mysql-core/session.ts';\nimport type { RelationalSchemaConfig, TablesRelationalConfig } from '~/relations.ts';\nimport { fillPlaceholders } from '~/sql/sql.ts';\nimport type { Query, SQL } from '~/sql/sql.ts';\nimport { type Assume, mapResultRow } from '~/utils.ts';\nimport type { RemoteCallback } from './driver.ts';\n\nexport type MySqlRawQueryResult = [ResultSetHeader, FieldPacket[]];\n\nexport interface MySqlRemoteSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class MySqlRemoteSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTSchema extends TablesRelationalConfig,\n> extends MySqlSession<MySqlRemoteQueryResultHKT, MySqlRemotePreparedQueryHKT, TFullSchema, TSchema> {\n\tstatic override readonly [entityKind]: string = 'MySqlRemoteSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tdialect: MySqlDialect,\n\t\tprivate schema: RelationalSchemaConfig<TSchema> | undefined,\n\t\toptions: MySqlRemoteSessionOptions,\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends MySqlPreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tgeneratedIds?: Record<string, unknown>[],\n\t\treturningIds?: SelectedFieldsOrdered,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PreparedQueryKind<MySqlRemotePreparedQueryHKT, T> {\n\t\treturn new PreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery.sql,\n\t\t\tquery.params,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t\tfields,\n\t\t\tcustomResultMapper,\n\t\t\tgeneratedIds,\n\t\t\treturningIds,\n\t\t) as PreparedQueryKind<MySqlRemotePreparedQueryHKT, T>;\n\t}\n\n\toverride all<T = unknown>(query: SQL): Promise<T[]> {\n\t\tconst querySql = this.dialect.sqlToQuery(query);\n\t\tthis.logger.logQuery(querySql.sql, querySql.params);\n\t\treturn this.client(querySql.sql, querySql.params, 'all').then(({ rows }) => rows) as Promise<T[]>;\n\t}\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: MySqlProxyTransaction<TFullSchema, TSchema>) => Promise<T>,\n\t\t_config?: MySqlTransactionConfig,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the MySql Proxy driver');\n\t}\n}\n\nexport class MySqlProxyTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTSchema extends TablesRelationalConfig,\n> extends MySqlTransaction<MySqlRemoteQueryResultHKT, MySqlRemotePreparedQueryHKT, TFullSchema, TSchema> {\n\tstatic override readonly [entityKind]: string = 'MySqlProxyTransaction';\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: MySqlProxyTransaction<TFullSchema, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the MySql Proxy driver');\n\t}\n}\n\nexport class PreparedQuery<T extends MySqlPreparedQueryConfig> extends PreparedQueryBase<T> {\n\tstatic override readonly [entityKind]: string = 'MySqlProxyPreparedQuery';\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tprivate queryString: string,\n\t\tprivate params: unknown[],\n\t\tprivate logger: Logger,\n\t\tcache: Cache,\n\t\tqueryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\tcacheConfig: WithCacheConfig | undefined,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\tprivate customResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\t// Keys that were used in $default and the value that was generated for them\n\t\tprivate generatedIds?: Record<string, unknown>[],\n\t\t// Keys that should be returned, it has the column with all properries + key from object\n\t\tprivate returningIds?: SelectedFieldsOrdered,\n\t) {\n\t\tsuper(cache, queryMetadata, cacheConfig);\n\t}\n\n\tasync execute(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tconst params = fillPlaceholders(this.params, placeholderValues);\n\n\t\tconst { fields, client, queryString, logger, joinsNotNullableMap, customResultMapper, returningIds, generatedIds } =\n\t\t\tthis;\n\n\t\tlogger.logQuery(queryString, params);\n\n\t\tif (!fields && !customResultMapper) {\n\t\t\tconst { rows: data } = await this.queryWithCache(queryString, params, async () => {\n\t\t\t\treturn await client(queryString, params, 'execute');\n\t\t\t});\n\n\t\t\tconst insertId = data[0].insertId as number;\n\t\t\tconst affectedRows = data[0].affectedRows;\n\n\t\t\tif (returningIds) {\n\t\t\t\tconst returningResponse = [];\n\t\t\t\tlet j = 0;\n\t\t\t\tfor (let i = insertId; i < insertId + affectedRows; i++) {\n\t\t\t\t\tfor (const column of returningIds) {\n\t\t\t\t\t\tconst key = returningIds[0]!.path[0]!;\n\t\t\t\t\t\tif (is(column.field, Column)) {\n\t\t\t\t\t\t\t// @ts-ignore\n\t\t\t\t\t\t\tif (column.field.primary && column.field.autoIncrement) {\n\t\t\t\t\t\t\t\treturningResponse.push({ [key]: i });\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif (column.field.defaultFn && generatedIds) {\n\t\t\t\t\t\t\t\t// generatedIds[rowIdx][key]\n\t\t\t\t\t\t\t\treturningResponse.push({ [key]: generatedIds[j]![key] });\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\tj++;\n\t\t\t\t}\n\n\t\t\t\treturn returningResponse;\n\t\t\t}\n\n\t\t\treturn data;\n\t\t}\n\n\t\tconst { rows } = await this.queryWithCache(queryString, params, async () => {\n\t\t\treturn await client(queryString, params, 'all');\n\t\t});\n\n\t\tif (customResultMapper) {\n\t\t\treturn customResultMapper(rows);\n\t\t}\n\n\t\treturn rows.map((row) => mapResultRow<T['execute']>(fields!, row, joinsNotNullableMap));\n\t}\n\n\toverride iterator(\n\t\t_placeholderValues: Record<string, unknown> = {},\n\t): AsyncGenerator<T['iterator']> {\n\t\tthrow new Error('Streaming is not supported by the MySql Proxy driver');\n\t}\n}\n\nexport interface MySqlRemoteQueryResultHKT extends MySqlQueryResultHKT {\n\ttype: MySqlRawQueryResult;\n}\n\nexport interface MySqlRemotePreparedQueryHKT extends MySqlPreparedQueryHKT {\n\ttype: PreparedQuery<Assume<this['config'], MySqlPreparedQueryConfig>>;\n}\n"],"mappings":"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","names":["PreparedQueryBase"]}
+{"version":3,"file":"session.cjs","names":["MySqlAsyncSession","entityKind","NoopLogger","NoopCache","MySqlAsyncPreparedQuery"],"sources":["../../src/mysql-proxy/session.ts"],"sourcesContent":["import type { FieldPacket, ResultSetHeader } from 'mysql2/promise';\nimport { type Cache, NoopCache } from '~/cache/core/index.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { MySqlAsyncPreparedQuery, MySqlAsyncSession, type MySqlAsyncTransaction } from '~/mysql-core/async/session.ts';\nimport type { MySqlDialect } from '~/mysql-core/dialect.ts';\nimport type {\n\tAnyMySqlMapper,\n\tMySqlPreparedQueryConfig,\n\tMySqlQueryResultHKT,\n\tMySqlTransactionConfig,\n} from '~/mysql-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query } from '~/sql/sql.ts';\nimport type { RemoteCallback } from './driver.ts';\n\nexport type MySqlRawQueryResult = [ResultSetHeader, FieldPacket[]];\n\nexport interface MySqlRemoteSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class MySqlRemoteSession<\n\tTRelations extends AnyRelations,\n> extends MySqlAsyncSession<\n\tMySqlRemoteQueryResultHKT,\n\tTRelations\n> {\n\tstatic override readonly [entityKind]: string = 'MySqlRemoteSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tdialect: MySqlDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate options: MySqlRemoteSessionOptions,\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends MySqlPreparedQueryConfig>(\n\t\tquery: Query,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\tmapper?: AnyMySqlMapper,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): MySqlAsyncPreparedQuery<T> {\n\t\tconst executor = async (params: any[] = []) => {\n\t\t\tconst raw = this.client(query.sql, params, mode === 'arrays' ? 'all' : 'execute');\n\n\t\t\tif (mode === 'objects') return raw.then(({ rows }) => rows[0]);\n\t\t\tif (mode === 'arrays' || !mapper) return raw.then(({ rows }) => rows);\n\t\t\treturn raw.then(({ rows, insertId, affectedRows }) => ({\n\t\t\t\t// Backwards compat with old implementation (types remain unaffected)\n\t\t\t\tinsertId: insertId ?? rows[0]?.insertId,\n\t\t\t\taffectedRows: affectedRows ?? rows[0]?.affectedRows,\n\t\t\t}));\n\t\t};\n\n\t\treturn new MySqlAsyncPreparedQuery(\n\t\t\texecutor,\n\t\t\tundefined,\n\t\t\tquery,\n\t\t\tmapper,\n\t\t\tmode,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t);\n\t}\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: MySqlAsyncTransaction<MySqlRemoteQueryResultHKT, TRelations>) => Promise<T>,\n\t\t_config?: MySqlTransactionConfig,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the MySql Proxy driver');\n\t}\n}\n\nexport interface MySqlRemoteQueryResultHKT extends MySqlQueryResultHKT {\n\ttype: MySqlRawQueryResult;\n}\n"],"mappings":";;;;;;;;AAyBA,IAAa,qBAAb,cAEUA,gDAGR;CACD,QAA0BC,0BAAsB;CAEhD,AAAQ;CACR,AAAQ;CAER,YACC,AAAQ,QACR,SACA,AAAQ,WACR,AAAQ,SACP;AACD,QAAM,QAAQ;EALN;EAEA;EACA;AAGR,OAAK,SAAS,QAAQ,UAAU,IAAIC,wBAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAIC,iCAAW;;CAG9C,aACC,OACA,MACA,QACA,eAIA,aAC6B;EAC7B,MAAM,WAAW,OAAO,SAAgB,EAAE,KAAK;GAC9C,MAAM,MAAM,KAAK,OAAO,MAAM,KAAK,QAAQ,SAAS,WAAW,QAAQ,UAAU;AAEjF,OAAI,SAAS,UAAW,QAAO,IAAI,MAAM,EAAE,WAAW,KAAK,GAAG;AAC9D,OAAI,SAAS,YAAY,CAAC,OAAQ,QAAO,IAAI,MAAM,EAAE,WAAW,KAAK;AACrE,UAAO,IAAI,MAAM,EAAE,MAAM,UAAU,oBAAoB;IAEtD,UAAU,YAAY,KAAK,IAAI;IAC/B,cAAc,gBAAgB,KAAK,IAAI;IACvC,EAAE;;AAGJ,SAAO,IAAIC,sDACV,UACA,QACA,OACA,QACA,MACA,KAAK,QACL,KAAK,OACL,eACA,YACA;;CAGF,MAAe,YACd,cACA,SACa;AACb,QAAM,IAAI,MAAM,2DAA2D"}

package/mysql-proxy/session.d.cts

@@ -1,60 +1,33 @@
 import type { FieldPacket, ResultSetHeader } from 'mysql2/promise';
-import { type Cache } from "../cache/core/index.cjs";
-import type { WithCacheConfig } from "../cache/core/types.cjs";
-import { entityKind } from "../entity.cjs";
-import type { Logger } from "../logger.cjs";
-import type { MySqlDialect } from "../mysql-core/dialect.cjs";
-import { MySqlTransaction } from "../mysql-core/index.cjs";
-import type { SelectedFieldsOrdered } from "../mysql-core/query-builders/select.types.cjs";
-import type { MySqlPreparedQueryConfig, MySqlPreparedQueryHKT, MySqlQueryResultHKT, MySqlTransactionConfig, PreparedQueryKind } from "../mysql-core/session.cjs";
-import { MySqlPreparedQuery as PreparedQueryBase, MySqlSession } from "../mysql-core/session.cjs";
-import type { RelationalSchemaConfig, TablesRelationalConfig } from "../relations.cjs";
-import type { Query, SQL } from "../sql/sql.cjs";
-import { type Assume } from "../utils.cjs";
-import type { RemoteCallback } from "./driver.cjs";
+import { type Cache } from '../cache/core/index.cjs';
+import type { WithCacheConfig } from '../cache/core/types.cjs';
+import { entityKind } from '../entity.cjs';
+import type { Logger } from '../logger.cjs';
+import { MySqlAsyncPreparedQuery, MySqlAsyncSession, type MySqlAsyncTransaction } from '../mysql-core/async/session.cjs';
+import type { MySqlDialect } from '../mysql-core/dialect.cjs';
+import type { AnyMySqlMapper, MySqlPreparedQueryConfig, MySqlQueryResultHKT, MySqlTransactionConfig } from '../mysql-core/session.cjs';
+import type { AnyRelations } from '../relations.cjs';
+import type { Query } from '../sql/sql.cjs';
+import type { RemoteCallback } from './driver.cjs';
 export type MySqlRawQueryResult = [ResultSetHeader, FieldPacket[]];
 export interface MySqlRemoteSessionOptions {
     logger?: Logger;
     cache?: Cache;
 }
-export declare class MySqlRemoteSession<TFullSchema extends Record<string, unknown>, TSchema extends TablesRelationalConfig> extends MySqlSession<MySqlRemoteQueryResultHKT, MySqlRemotePreparedQueryHKT, TFullSchema, TSchema> {
+export declare class MySqlRemoteSession<TRelations extends AnyRelations> extends MySqlAsyncSession<MySqlRemoteQueryResultHKT, TRelations> {
     private client;
-    private schema;
+    private relations;
+    private options;
     static readonly [entityKind]: string;
     private logger;
     private cache;
-    constructor(client: RemoteCallback, dialect: MySqlDialect, schema: RelationalSchemaConfig<TSchema> | undefined, options: MySqlRemoteSessionOptions);
-    prepareQuery<T extends MySqlPreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, customResultMapper?: (rows: unknown[][]) => T['execute'], generatedIds?: Record<string, unknown>[], returningIds?: SelectedFieldsOrdered, queryMetadata?: {
+    constructor(client: RemoteCallback, dialect: MySqlDialect, relations: TRelations, options: MySqlRemoteSessionOptions);
+    prepareQuery<T extends MySqlPreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', mapper?: AnyMySqlMapper, queryMetadata?: {
         type: 'select' | 'update' | 'delete' | 'insert';
         tables: string[];
-    }, cacheConfig?: WithCacheConfig): PreparedQueryKind<MySqlRemotePreparedQueryHKT, T>;
-    all<T = unknown>(query: SQL): Promise<T[]>;
-    transaction<T>(_transaction: (tx: MySqlProxyTransaction<TFullSchema, TSchema>) => Promise<T>, _config?: MySqlTransactionConfig): Promise<T>;
-}
-export declare class MySqlProxyTransaction<TFullSchema extends Record<string, unknown>, TSchema extends TablesRelationalConfig> extends MySqlTransaction<MySqlRemoteQueryResultHKT, MySqlRemotePreparedQueryHKT, TFullSchema, TSchema> {
-    static readonly [entityKind]: string;
-    transaction<T>(_transaction: (tx: MySqlProxyTransaction<TFullSchema, TSchema>) => Promise<T>): Promise<T>;
-}
-export declare class PreparedQuery<T extends MySqlPreparedQueryConfig> extends PreparedQueryBase<T> {
-    private client;
-    private queryString;
-    private params;
-    private logger;
-    private fields;
-    private customResultMapper?;
-    private generatedIds?;
-    private returningIds?;
-    static readonly [entityKind]: string;
-    constructor(client: RemoteCallback, queryString: string, params: unknown[], logger: Logger, cache: Cache, queryMetadata: {
-        type: 'select' | 'update' | 'delete' | 'insert';
-        tables: string[];
-    } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, customResultMapper?: ((rows: unknown[][]) => T["execute"]) | undefined, generatedIds?: Record<string, unknown>[] | undefined, returningIds?: SelectedFieldsOrdered | undefined);
-    execute(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
-    iterator(_placeholderValues?: Record<string, unknown>): AsyncGenerator<T['iterator']>;
+    }, cacheConfig?: WithCacheConfig): MySqlAsyncPreparedQuery<T>;
+    transaction<T>(_transaction: (tx: MySqlAsyncTransaction<MySqlRemoteQueryResultHKT, TRelations>) => Promise<T>, _config?: MySqlTransactionConfig): Promise<T>;
 }
 export interface MySqlRemoteQueryResultHKT extends MySqlQueryResultHKT {
     type: MySqlRawQueryResult;
 }
-export interface MySqlRemotePreparedQueryHKT extends MySqlPreparedQueryHKT {
-    type: PreparedQuery<Assume<this['config'], MySqlPreparedQueryConfig>>;
-}