drizzle-orm 1.0.0-beta.20-afec359 → 1.0.0-beta.21

package/node-postgres/driver.js.map

@@ -1 +1 @@
-{"version":3,"file":"driver.js","names":[],"sources":["../../src/node-postgres/driver.ts"],"sourcesContent":["import pg, { type Pool, type PoolConfig } from 'pg';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { DefaultLogger } from '~/logger.ts';\nimport { PgAsyncDatabase } from '~/pg-core/async/db.ts';\nimport { refineGenericPgCodecs } from '~/pg-core/codecs.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport type { DrizzlePgConfig } from '~/pg-core/utils.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { NodePgClient, NodePgQueryResultHKT } from './session.ts';\nimport { NodePgSession } from './session.ts';\n\nexport interface PgDriverOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class NodePgDatabase<\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgAsyncDatabase<NodePgQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'NodePgDatabase';\n}\n\nexport const nodePgCodecs = refineGenericPgCodecs();\n\nfunction construct<\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NodePgClient = NodePgClient,\n>(\n\tclient: TClient,\n\tconfig: DrizzlePgConfig<TRelations> = {},\n): NodePgDatabase<TRelations> & {\n\t$client: NodePgClient extends TClient ? Pool : TClient;\n} {\n\tconst dialect = new PgDialect({\n\t\tcasing: config.casing,\n\t\tuseJitMappers: config.useJitMappers,\n\t\tcodecs: config.codecs ?? nodePgCodecs,\n\t});\n\tlet logger;\n\tif (config.logger === true) {\n\t\tlogger = new DefaultLogger();\n\t} else if (config.logger !== false) {\n\t\tlogger = config.logger;\n\t}\n\n\tconst relations = config.relations ?? {};\n\tconst session = new NodePgSession(client, dialect, relations, {\n\t\tlogger,\n\t\tcache: config.cache,\n\t\tuseJitMapper: config.useJitMappers,\n\t});\n\n\tconst db = new NodePgDatabase(\n\t\tdialect,\n\t\tsession,\n\t\trelations,\n\t) as NodePgDatabase<TRelations>;\n\t(<any> db).$client = client;\n\t(<any> db).$cache = config.cache;\n\tif ((<any> db).$cache) {\n\t\t(<any> db).$cache['invalidate'] = config.cache?.onMutate;\n\t}\n\n\treturn db as any;\n}\n\nexport function drizzle<\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NodePgClient = Pool,\n>(\n\t...params:\n\t\t| [\n\t\t\tstring,\n\t\t]\n\t\t| [\n\t\t\tstring,\n\t\t\tDrizzlePgConfig<TRelations>,\n\t\t]\n\t\t| [\n\t\t\t& DrizzlePgConfig<TRelations>\n\t\t\t& ({\n\t\t\t\tclient: TClient;\n\t\t\t} | {\n\t\t\t\tconnection: string | PoolConfig;\n\t\t\t}),\n\t\t]\n): NodePgDatabase<TRelations> & {\n\t$client: NodePgClient extends TClient ? Pool : TClient;\n} {\n\tif (typeof params[0] === 'string') {\n\t\tconst instance = new pg.Pool({\n\t\t\tconnectionString: params[0],\n\t\t});\n\n\t\treturn construct(\n\t\t\tinstance,\n\t\t\tparams[1] as DrizzlePgConfig<TRelations> | undefined,\n\t\t) as any;\n\t}\n\n\tconst { connection, client, ...drizzlePgCDrizzlePgConfig } = params[0] as (\n\t\t& ({ connection?: PoolConfig | string; client?: TClient })\n\t\t& DrizzlePgConfig<TRelations>\n\t);\n\n\tif (client) return construct(client, drizzlePgCDrizzlePgConfig);\n\n\tconst instance = typeof connection === 'string'\n\t\t? new pg.Pool({\n\t\t\tconnectionString: connection,\n\t\t})\n\t\t: new pg.Pool(connection!);\n\n\treturn construct(instance, drizzlePgCDrizzlePgConfig) as any;\n}\n\nexport namespace drizzle {\n\texport function mock<\n\t\tTRelations extends AnyRelations = EmptyRelations,\n\t>(\n\t\tconfig?: DrizzlePgConfig<TRelations>,\n\t): NodePgDatabase<TRelations> & {\n\t\t$client: '$client is not available on drizzle.mock()';\n\t} {\n\t\treturn construct({} as any, config) as any;\n\t}\n}\n"],"mappings":";;;;;;;;;AAmBA,IAAa,iBAAb,cAEU,gBAAkD;CAC3D,QAA0B,cAAsB;;AAGjD,MAAa,eAAe,uBAAuB;AAEnD,SAAS,UAIR,QACA,SAAsC,EAAE,EAGvC;CACD,MAAM,UAAU,IAAI,UAAU;EAC7B,QAAQ,OAAO;EACf,eAAe,OAAO;EACtB,QAAQ,OAAO,UAAU;EACzB,CAAC;CACF,IAAI;AACJ,KAAI,OAAO,WAAW,KACrB,UAAS,IAAI,eAAe;UAClB,OAAO,WAAW,MAC5B,UAAS,OAAO;CAGjB,MAAM,YAAY,OAAO,aAAa,EAAE;CAOxC,MAAM,KAAK,IAAI,eACd,SAPe,IAAI,cAAc,QAAQ,SAAS,WAAW;EAC7D;EACA,OAAO,OAAO;EACd,cAAc,OAAO;EACrB,CAAC,EAKD,UACA;AACD,CAAO,GAAI,UAAU;AACrB,CAAO,GAAI,SAAS,OAAO;AAC3B,KAAW,GAAI,OACd,CAAO,GAAI,OAAO,gBAAgB,OAAO,OAAO;AAGjD,QAAO;;AAGR,SAAgB,QAIf,GAAG,QAkBF;AACD,KAAI,OAAO,OAAO,OAAO,SAKxB,QAAO,UAJU,IAAI,GAAG,KAAK,EAC5B,kBAAkB,OAAO,IACzB,CAAC,EAID,OAAO,GACP;CAGF,MAAM,EAAE,YAAY,QAAQ,GAAG,8BAA8B,OAAO;AAKpE,KAAI,OAAQ,QAAO,UAAU,QAAQ,0BAA0B;AAQ/D,QAAO,UANU,OAAO,eAAe,WACpC,IAAI,GAAG,KAAK,EACb,kBAAkB,YAClB,CAAC,GACA,IAAI,GAAG,KAAK,WAAY,EAEA,0BAA0B;;;CAI9C,SAAS,KAGf,QAGC;AACD,SAAO,UAAU,EAAE,EAAS,OAAO"}
+{"version":3,"file":"driver.js","names":[],"sources":["../../src/node-postgres/driver.ts"],"sourcesContent":["import pg, { type Pool, type PoolConfig } from 'pg';\nimport * as V1 from '~/_relations.ts';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { DefaultLogger } from '~/logger.ts';\nimport { PgAsyncDatabase } from '~/pg-core/async/db.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { DrizzleConfig } from '~/utils.ts';\nimport type { NodePgClient, NodePgQueryResultHKT } from './session.ts';\nimport { NodePgSession } from './session.ts';\n\nexport interface PgDriverOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class NodePgDatabase<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgAsyncDatabase<NodePgQueryResultHKT, TSchema, TRelations> {\n\tstatic override readonly [entityKind]: string = 'NodePgDatabase';\n}\n\nfunction construct<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NodePgClient = NodePgClient,\n>(\n\tclient: TClient,\n\tconfig: DrizzleConfig<TSchema, TRelations> = {},\n): NodePgDatabase<TSchema, TRelations> & {\n\t$client: NodePgClient extends TClient ? Pool : TClient;\n} {\n\tconst dialect = new PgDialect({ casing: config.casing });\n\tlet logger;\n\tif (config.logger === true) {\n\t\tlogger = new DefaultLogger();\n\t} else if (config.logger !== false) {\n\t\tlogger = config.logger;\n\t}\n\n\tlet schema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined;\n\tif (config.schema) {\n\t\tconst tablesConfig = V1.extractTablesRelationalConfig(\n\t\t\tconfig.schema,\n\t\t\tV1.createTableRelationsHelpers,\n\t\t);\n\t\tschema = {\n\t\t\tfullSchema: config.schema,\n\t\t\tschema: tablesConfig.tables,\n\t\t\ttableNamesMap: tablesConfig.tableNamesMap,\n\t\t};\n\t}\n\n\tconst relations = config.relations ?? {};\n\tconst session = new NodePgSession(client, dialect, relations, schema, {\n\t\tlogger,\n\t\tcache: config.cache,\n\t});\n\n\tconst db = new NodePgDatabase(\n\t\tdialect,\n\t\tsession,\n\t\trelations,\n\t\tschema as V1.RelationalSchemaConfig<any>,\n\t) as NodePgDatabase<TSchema>;\n\t(<any> db).$client = client;\n\t(<any> db).$cache = config.cache;\n\tif ((<any> db).$cache) {\n\t\t(<any> db).$cache['invalidate'] = config.cache?.onMutate;\n\t}\n\n\treturn db as any;\n}\n\nexport function drizzle<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NodePgClient = Pool,\n>(\n\t...params:\n\t\t| [\n\t\t\tstring,\n\t\t]\n\t\t| [\n\t\t\tstring,\n\t\t\tDrizzleConfig<TSchema, TRelations>,\n\t\t]\n\t\t| [\n\t\t\t& DrizzleConfig<TSchema, TRelations>\n\t\t\t& ({\n\t\t\t\tclient: TClient;\n\t\t\t} | {\n\t\t\t\tconnection: string | PoolConfig;\n\t\t\t}),\n\t\t]\n): NodePgDatabase<TSchema, TRelations> & {\n\t$client: NodePgClient extends TClient ? Pool : TClient;\n} {\n\tif (typeof params[0] === 'string') {\n\t\tconst instance = new pg.Pool({\n\t\t\tconnectionString: params[0],\n\t\t});\n\n\t\treturn construct(instance, params[1] as DrizzleConfig<TSchema, TRelations> | undefined) as any;\n\t}\n\n\tconst { connection, client, ...drizzleConfig } = params[0] as (\n\t\t& ({ connection?: PoolConfig | string; client?: TClient })\n\t\t& DrizzleConfig<TSchema, TRelations>\n\t);\n\n\tif (client) return construct(client, drizzleConfig);\n\n\tconst instance = typeof connection === 'string'\n\t\t? new pg.Pool({\n\t\t\tconnectionString: connection,\n\t\t})\n\t\t: new pg.Pool(connection!);\n\n\treturn construct(instance, drizzleConfig) as any;\n}\n\nexport namespace drizzle {\n\texport function mock<\n\t\tTSchema extends Record<string, unknown> = Record<string, never>,\n\t\tTRelations extends AnyRelations = EmptyRelations,\n\t>(\n\t\tconfig?: DrizzleConfig<TSchema, TRelations>,\n\t): NodePgDatabase<TSchema, TRelations> & {\n\t\t$client: '$client is not available on drizzle.mock()';\n\t} {\n\t\treturn construct({} as any, config) as any;\n\t}\n}\n"],"mappings":";;;;;;;;;AAkBA,IAAa,iBAAb,cAGU,gBAA2D;CACpE,QAA0B,cAAsB;;AAGjD,SAAS,UAKR,QACA,SAA6C,EAAE,EAG9C;CACD,MAAM,UAAU,IAAI,UAAU,EAAE,QAAQ,OAAO,QAAQ,CAAC;CACxD,IAAI;AACJ,KAAI,OAAO,WAAW,KACrB,UAAS,IAAI,eAAe;UAClB,OAAO,WAAW,MAC5B,UAAS,OAAO;CAGjB,IAAI;AACJ,KAAI,OAAO,QAAQ;EAClB,MAAM,eAAe,GAAG,8BACvB,OAAO,QACP,GAAG,4BACH;AACD,WAAS;GACR,YAAY,OAAO;GACnB,QAAQ,aAAa;GACrB,eAAe,aAAa;GAC5B;;CAGF,MAAM,YAAY,OAAO,aAAa,EAAE;CAMxC,MAAM,KAAK,IAAI,eACd,SANe,IAAI,cAAc,QAAQ,SAAS,WAAW,QAAQ;EACrE;EACA,OAAO,OAAO;EACd,CAAC,EAKD,WACA,OACA;AACD,CAAO,GAAI,UAAU;AACrB,CAAO,GAAI,SAAS,OAAO;AAC3B,KAAW,GAAI,OACd,CAAO,GAAI,OAAO,gBAAgB,OAAO,OAAO;AAGjD,QAAO;;AAGR,SAAgB,QAKf,GAAG,QAkBF;AACD,KAAI,OAAO,OAAO,OAAO,SAKxB,QAAO,UAJU,IAAI,GAAG,KAAK,EAC5B,kBAAkB,OAAO,IACzB,CAAC,EAEyB,OAAO,GAAqD;CAGxF,MAAM,EAAE,YAAY,QAAQ,GAAG,kBAAkB,OAAO;AAKxD,KAAI,OAAQ,QAAO,UAAU,QAAQ,cAAc;AAQnD,QAAO,UANU,OAAO,eAAe,WACpC,IAAI,GAAG,KAAK,EACb,kBAAkB,YAClB,CAAC,GACA,IAAI,GAAG,KAAK,WAAY,EAEA,cAAc;;;CAIlC,SAAS,KAIf,QAGC;AACD,SAAO,UAAU,EAAE,EAAS,OAAO"}

package/node-postgres/index.cjs

@@ -3,6 +3,7 @@ const require_node_postgres_session = require('./session.cjs');
 const require_node_postgres_driver = require('./driver.cjs');
 
 exports.NodePgDatabase = require_node_postgres_driver.NodePgDatabase;
+exports.NodePgPreparedQuery = require_node_postgres_session.NodePgPreparedQuery;
 exports.NodePgSession = require_node_postgres_session.NodePgSession;
 exports.NodePgTransaction = require_node_postgres_session.NodePgTransaction;
 Object.defineProperty(exports, 'drizzle', {
@@ -10,5 +11,4 @@ Object.defineProperty(exports, 'drizzle', {
   get: function () {
     return require_node_postgres_driver.drizzle;
   }
-});
-exports.nodePgCodecs = require_node_postgres_driver.nodePgCodecs;
+});

package/node-postgres/index.d.cts

@@ -1,3 +1,3 @@
-import { NodePgClient, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction } from "./session.cjs";
-import { NodePgDatabase, PgDriverOptions, drizzle, nodePgCodecs } from "./driver.cjs";
-export { NodePgClient, NodePgDatabase, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction, PgDriverOptions, drizzle, nodePgCodecs };
+import { NodePgClient, NodePgPreparedQuery, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction } from "./session.cjs";
+import { NodePgDatabase, PgDriverOptions, drizzle } from "./driver.cjs";
+export { NodePgClient, NodePgDatabase, NodePgPreparedQuery, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction, PgDriverOptions, drizzle };

package/node-postgres/index.d.ts

@@ -1,3 +1,3 @@
-import { NodePgClient, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction } from "./session.js";
-import { NodePgDatabase, PgDriverOptions, drizzle, nodePgCodecs } from "./driver.js";
-export { NodePgClient, NodePgDatabase, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction, PgDriverOptions, drizzle, nodePgCodecs };
+import { NodePgClient, NodePgPreparedQuery, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction } from "./session.js";
+import { NodePgDatabase, PgDriverOptions, drizzle } from "./driver.js";
+export { NodePgClient, NodePgDatabase, NodePgPreparedQuery, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction, PgDriverOptions, drizzle };

package/node-postgres/index.js

@@ -1,4 +1,4 @@
-import { NodePgSession, NodePgTransaction } from "./session.js";
-import { NodePgDatabase, drizzle, nodePgCodecs } from "./driver.js";
+import { NodePgPreparedQuery, NodePgSession, NodePgTransaction } from "./session.js";
+import { NodePgDatabase, drizzle } from "./driver.js";
 
-export { NodePgDatabase, NodePgSession, NodePgTransaction, drizzle, nodePgCodecs };
+export { NodePgDatabase, NodePgPreparedQuery, NodePgSession, NodePgTransaction, drizzle };

package/node-postgres/migrator.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.cjs","names":[],"sources":["../../src/node-postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/async/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { NodePgDatabase } from './driver.ts';\n\nexport async function migrate<TRelations extends AnyRelations>(\n\tdb: NodePgDatabase<TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn await coreMigrate(migrations, db, config);\n}\n"],"mappings":";;;;;;AAMA,eAAsB,QACrB,IACA,QACC;AAED,QAAO,oFAD+B,OAAO,EACR,IAAI,OAAO"}
+{"version":3,"file":"migrator.cjs","names":[],"sources":["../../src/node-postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/async/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { NodePgDatabase } from './driver.ts';\n\nexport async function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(\n\tdb: NodePgDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn await coreMigrate(migrations, db, config);\n}\n"],"mappings":";;;;;;AAMA,eAAsB,QACrB,IACA,QACC;AAED,QAAO,oFAD+B,OAAO,EACR,IAAI,OAAO"}

package/node-postgres/migrator.d.cts

@@ -4,7 +4,7 @@ import { MigrationConfig } from "../migrator.cjs";
 import { AnyRelations } from "../relations.cjs";
 
 //#region src/node-postgres/migrator.d.ts
-declare function migrate<TRelations extends AnyRelations>(db: NodePgDatabase<TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: NodePgDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.cts.map

package/node-postgres/migrator.d.ts

@@ -4,7 +4,7 @@ import { MigrationConfig } from "../migrator.js";
 import { AnyRelations } from "../relations.js";
 
 //#region src/node-postgres/migrator.d.ts
-declare function migrate<TRelations extends AnyRelations>(db: NodePgDatabase<TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: NodePgDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.ts.map

package/node-postgres/migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.js","names":["coreMigrate"],"sources":["../../src/node-postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/async/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { NodePgDatabase } from './driver.ts';\n\nexport async function migrate<TRelations extends AnyRelations>(\n\tdb: NodePgDatabase<TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn await coreMigrate(migrations, db, config);\n}\n"],"mappings":";;;;AAMA,eAAsB,QACrB,IACA,QACC;AAED,QAAO,MAAMA,UADM,mBAAmB,OAAO,EACR,IAAI,OAAO"}
+{"version":3,"file":"migrator.js","names":["coreMigrate"],"sources":["../../src/node-postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/async/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { NodePgDatabase } from './driver.ts';\n\nexport async function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(\n\tdb: NodePgDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn await coreMigrate(migrations, db, config);\n}\n"],"mappings":";;;;AAMA,eAAsB,QACrB,IACA,QACC;AAED,QAAO,MAAMA,UADM,mBAAmB,OAAO,EACR,IAAI,OAAO"}

package/node-postgres/session.cjs

@@ -1,59 +1,151 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
 let __entity_ts = require("../entity.cjs");
+let __tracing_ts = require("../tracing.cjs");
+let __utils_ts = require("../utils.cjs");
 let __sql_sql_ts = require("../sql/sql.cjs");
-let __cache_core_index_ts = require("../cache/core/index.cjs");
 let __logger_ts = require("../logger.cjs");
+let __cache_core_index_ts = require("../cache/core/index.cjs");
 let __pg_core_async_session_ts = require("../pg-core/async/session.cjs");
-let __query_name_generator_ts = require("../query-name-generator.cjs");
 let pg = require("pg");
 pg = require_runtime.__toESM(pg);
 
 //#region src/node-postgres/session.ts
 const { Pool, types } = pg.default;
-const noop = (val) => val;
-const typeConfig = { getTypeParser: ((typeId, format) => {
-	switch (typeId) {
-		case types.builtins.TIMESTAMPTZ: return noop;
-		case types.builtins.TIMESTAMP: return noop;
-		case types.builtins.DATE: return noop;
-		case types.builtins.INTERVAL: return noop;
-		case 1231: return noop;
-		case 1115: return noop;
-		case 1185: return noop;
-		case 1187: return noop;
-		case 1182: return noop;
-		default: return types.getTypeParser(typeId, format);
+const parsers = { getTypeParser: (typeId, format) => {
+	if (typeId === types.builtins.TIMESTAMPTZ) return (val) => val;
+	if (typeId === types.builtins.TIMESTAMP) return (val) => val;
+	if (typeId === types.builtins.DATE) return (val) => val;
+	if (typeId === types.builtins.INTERVAL) return (val) => val;
+	if (typeId === 1231) return (val) => val;
+	if (typeId === 1115) return (val) => val;
+	if (typeId === 1185) return (val) => val;
+	if (typeId === 1187) return (val) => val;
+	if (typeId === 1182) return (val) => val;
+	return types.getTypeParser(typeId, format);
+} };
+var NodePgPreparedQuery = class extends __pg_core_async_session_ts.PgAsyncPreparedQuery {
+	static [__entity_ts.entityKind] = "NodePgPreparedQuery";
+	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
+		super(query, cache, queryMetadata, cacheConfig);
+		this.client = client;
+		this.logger = logger;
+		this.fields = fields;
+		this.name = name;
+		this._isResponseInArrayMode = _isResponseInArrayMode;
+		this.customResultMapper = customResultMapper;
+		this.isRqbV2Query = isRqbV2Query;
+	}
+	async execute(placeholderValues = {}) {
+		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);
+		return __tracing_ts.tracer.startActiveSpan("drizzle.execute", async () => {
+			const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+			this.logger.logQuery(this.query.sql, params);
+			const { query, client, joinsNotNullableMap, customResultMapper, name, fields } = this;
+			if (!fields && !customResultMapper) return __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", async (span) => {
+				span?.setAttributes({
+					"drizzle.query.name": name,
+					"drizzle.query.text": query.sql,
+					"drizzle.query.params": JSON.stringify(params)
+				});
+				return this.queryWithCache(query.sql, params, async () => {
+					return await client.query({
+						name,
+						text: query.sql,
+						types: parsers
+					}, params);
+				});
+			});
+			const result = await __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", (span) => {
+				span?.setAttributes({
+					"drizzle.query.name": name,
+					"drizzle.query.text": query.sql,
+					"drizzle.query.params": JSON.stringify(params)
+				});
+				return this.queryWithCache(query.sql, params, async () => {
+					return await client.query({
+						text: query.sql,
+						name,
+						types: parsers,
+						rowMode: "array"
+					}, params);
+				});
+			});
+			return __tracing_ts.tracer.startActiveSpan("drizzle.mapResponse", () => {
+				return customResultMapper ? customResultMapper(result.rows) : result.rows.map((row) => (0, __utils_ts.mapResultRow)(fields, row, joinsNotNullableMap));
+			});
+		});
+	}
+	async executeRqbV2(placeholderValues = {}) {
+		return __tracing_ts.tracer.startActiveSpan("drizzle.execute", async () => {
+			const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+			this.logger.logQuery(this.query.sql, params);
+			const { client, customResultMapper, query, name } = this;
+			const result = await __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", (span) => {
+				span?.setAttributes({
+					"drizzle.query.name": name,
+					"drizzle.query.text": query.sql,
+					"drizzle.query.params": JSON.stringify(params)
+				});
+				return client.query({
+					name,
+					text: query.sql,
+					types: parsers
+				}, params);
+			});
+			return __tracing_ts.tracer.startActiveSpan("drizzle.mapResponse", () => {
+				return customResultMapper(result.rows);
+			});
+		});
 	}
-}) };
+	all(placeholderValues = {}) {
+		return __tracing_ts.tracer.startActiveSpan("drizzle.execute", () => {
+			const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+			this.logger.logQuery(this.query.sql, params);
+			return __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", (span) => {
+				span?.setAttributes({
+					"drizzle.query.name": this.name,
+					"drizzle.query.text": this.query.sql,
+					"drizzle.query.params": JSON.stringify(params)
+				});
+				return this.queryWithCache(this.query.sql, params, async () => {
+					return this.client.query({
+						name: this.name,
+						text: this.query.sql,
+						types: parsers
+					}, params);
+				}).then((result) => result.rows);
+			});
+		});
+	}
+	/** @internal */
+	isResponseInArrayMode() {
+		return this._isResponseInArrayMode;
+	}
+};
 var NodePgSession = class NodePgSession extends __pg_core_async_session_ts.PgAsyncSession {
 	static [__entity_ts.entityKind] = "NodePgSession";
 	logger;
 	cache;
-	constructor(client, dialect, relations, options = {}) {
+	constructor(client, dialect, relations, schema, options = {}) {
 		super(dialect);
 		this.client = client;
 		this.relations = relations;
+		this.schema = schema;
 		this.options = options;
 		this.logger = options.logger ?? new __logger_ts.NoopLogger();
 		this.cache = options.cache ?? new __cache_core_index_ts.NoopCache();
 	}
-	prepareQuery(query, mode, name, mapper, queryMetadata, cacheConfig) {
-		const queryName = typeof name === "string" ? name : name === true ? (0, __query_name_generator_ts.preparedStatementName)(query.sql, query.params) : void 0;
-		const executor = async (params) => {
-			return this.client.query({
-				name: queryName,
-				rowMode: mode === "arrays" ? "array" : void 0,
-				text: query.sql,
-				types: typeConfig
-			}, params).then((r) => mode === "raw" ? r : r.rows);
-		};
-		return new __pg_core_async_session_ts.PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
+	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
+		return new NodePgPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, name, isResponseInArrayMode, customResultMapper);
+	}
+	prepareRelationalQuery(query, fields, name, customResultMapper) {
+		return new NodePgPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, name, false, customResultMapper, true);
 	}
 	async transaction(transaction, config) {
 		const isPool = this.client instanceof Pool || Object.getPrototypeOf(this.client).constructor.name.includes("Pool");
-		const session = isPool ? new NodePgSession(await this.client.connect(), this.dialect, this.relations, this.options) : this;
-		const tx = new NodePgTransaction(this.dialect, session, this.relations, void 0, false);
+		const session = isPool ? new NodePgSession(await this.client.connect(), this.dialect, this.relations, this.schema, this.options) : this;
+		const tx = new NodePgTransaction(this.dialect, session, this.relations, this.schema);
 		await tx.execute(__sql_sql_ts.sql`begin${config ? __sql_sql_ts.sql` ${tx.getTransactionConfigSQL(config)}` : void 0}`);
 		try {
 			const result = await transaction(tx);
@@ -69,9 +161,9 @@ var NodePgSession = class NodePgSession extends __pg_core_async_session_ts.PgAsy
 };
 var NodePgTransaction = class NodePgTransaction extends __pg_core_async_session_ts.PgAsyncTransaction {
 	static [__entity_ts.entityKind] = "NodePgTransaction";
-	transaction = async (transaction) => {
+	async transaction(transaction) {
 		const savepointName = `sp${this.nestedIndex + 1}`;
-		const tx = new NodePgTransaction(this.dialect, this.session, this._.relations, this.nestedIndex + 1, false);
+		const tx = new NodePgTransaction(this.dialect, this.session, this.relations, this.schema, this.nestedIndex + 1);
 		await tx.execute(__sql_sql_ts.sql.raw(`savepoint ${savepointName}`));
 		try {
 			const result = await transaction(tx);
@@ -81,10 +173,11 @@ var NodePgTransaction = class NodePgTransaction extends __pg_core_async_session_
 			await tx.execute(__sql_sql_ts.sql.raw(`rollback to savepoint ${savepointName}`));
 			throw err;
 		}
-	};
+	}
 };
 
 //#endregion
+exports.NodePgPreparedQuery = NodePgPreparedQuery;
 exports.NodePgSession = NodePgSession;
 exports.NodePgTransaction = NodePgTransaction;
 //# sourceMappingURL=session.cjs.map

package/node-postgres/session.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["PgAsyncSession","entityKind","NoopLogger","NoopCache","PgAsyncPreparedQuery","PgAsyncTransaction","sql"],"sources":["../../src/node-postgres/session.ts"],"sourcesContent":["import type { Client, CustomTypesConfig, PoolClient, QueryResult, QueryResultRow } from 'pg';\nimport pg from 'pg';\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, NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery } from '~/pg-core/async/session.ts';\nimport { PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig } from '~/pg-core/session.ts';\nimport type { PreparedQueryConfig } from '~/pg-core/session.ts';\nimport { preparedStatementName } from '~/query-name-generator.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { type Query, sql } from '~/sql/sql.ts';\nimport type { Assume } from '~/utils.ts';\n\nconst { Pool, types } = pg;\nexport type NodePgClient = pg.Pool | PoolClient | Client;\n\nconst noop = (val: any) => val;\n\nconst typeConfig: CustomTypesConfig = {\n\tgetTypeParser: <CustomTypesConfig['getTypeParser']> ((typeId, format) => {\n\t\tswitch (typeId as number) {\n\t\t\tcase types.builtins.TIMESTAMPTZ:\n\t\t\t\treturn noop;\n\t\t\tcase types.builtins.TIMESTAMP:\n\t\t\t\treturn noop;\n\t\t\tcase types.builtins.DATE:\n\t\t\t\treturn noop;\n\t\t\tcase types.builtins.INTERVAL:\n\t\t\t\treturn noop;\n\t\t\t// numeric[]\n\t\t\tcase 1231:\n\t\t\t\treturn noop;\n\t\t\t// timestamp[]\n\t\t\tcase 1115:\n\t\t\t\treturn noop;\n\t\t\t// timestamp with timezone[]\n\t\t\tcase 1185:\n\t\t\t\treturn noop;\n\t\t\t// interval[]\n\t\t\tcase 1187:\n\t\t\t\treturn noop;\n\t\t\t// date[]\n\t\t\tcase 1182:\n\t\t\t\treturn noop;\n\t\t\tdefault:\n\t\t\t\treturn types.getTypeParser(typeId, format);\n\t\t}\n\t}),\n};\n\nexport interface NodePgSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class NodePgSession<\n\tTRelations extends AnyRelations,\n> extends PgAsyncSession<NodePgQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'NodePgSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: NodePgClient,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate options: NodePgSessionOptions = {},\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 PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\tname: string | boolean,\n\t\tmapper: ((rows: any[]) => any) | undefined,\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) {\n\t\tconst queryName = typeof name === 'string'\n\t\t\t? name\n\t\t\t: name === true\n\t\t\t? preparedStatementName(query.sql, query.params)\n\t\t\t: undefined;\n\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\treturn this.client.query({\n\t\t\t\tname: queryName,\n\t\t\t\trowMode: mode === 'arrays' ? 'array' : undefined as any,\n\t\t\t\ttext: query.sql,\n\t\t\t\ttypes: typeConfig,\n\t\t\t}, params).then((r) => mode === 'raw' ? r : r.rows);\n\t\t};\n\n\t\treturn new PgAsyncPreparedQuery<T>(\n\t\t\texecutor,\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\ttransaction: (tx: NodePgTransaction<TRelations>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig | undefined,\n\t): Promise<T> {\n\t\tconst isPool = this.client instanceof Pool || Object.getPrototypeOf(this.client).constructor.name.includes('Pool'); // oxlint-disable-line drizzle-internal/no-instanceof\n\t\tconst session = isPool\n\t\t\t? new NodePgSession(\n\t\t\t\tawait (<pg.Pool> this.client).connect(),\n\t\t\t\tthis.dialect,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.options,\n\t\t\t)\n\t\t\t: this;\n\t\tconst tx = new NodePgTransaction<TRelations>(\n\t\t\tthis.dialect,\n\t\t\tsession,\n\t\t\tthis.relations,\n\t\t\tundefined,\n\t\t\tfalse,\n\t\t);\n\t\tawait tx.execute(sql`begin${config ? sql` ${tx.getTransactionConfigSQL(config)}` : undefined}`);\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql`commit`);\n\t\t\treturn result;\n\t\t} catch (error) {\n\t\t\tawait tx.execute(sql`rollback`);\n\t\t\tthrow error;\n\t\t} finally {\n\t\t\tif (isPool) (session.client as PoolClient).release();\n\t\t}\n\t}\n}\n\nexport class NodePgTransaction<\n\tTRelations extends AnyRelations,\n> extends PgAsyncTransaction<NodePgQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'NodePgTransaction';\n\n\toverride transaction = async <T>(\n\t\ttransaction: (tx: NodePgTransaction<TRelations>) => Promise<T>,\n\t): Promise<T> => {\n\t\tconst savepointName = `sp${this.nestedIndex + 1}`;\n\t\tconst tx = new NodePgTransaction<TRelations>(\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis._.relations,\n\t\t\tthis.nestedIndex + 1,\n\t\t\tfalse,\n\t\t);\n\t\tawait tx.execute(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tawait tx.execute(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow err;\n\t\t}\n\t};\n}\n\nexport interface NodePgQueryResultHKT extends PgQueryResultHKT {\n\ttype: QueryResult<Assume<this['row'], QueryResultRow>>;\n}\n"],"mappings":";;;;;;;;;;;;AAgBA,MAAM,EAAE,MAAM,UAAU;AAGxB,MAAM,QAAQ,QAAa;AAE3B,MAAM,aAAgC,EACrC,iBAAsD,QAAQ,WAAW;AACxE,SAAQ,QAAR;EACC,KAAK,MAAM,SAAS,YACnB,QAAO;EACR,KAAK,MAAM,SAAS,UACnB,QAAO;EACR,KAAK,MAAM,SAAS,KACnB,QAAO;EACR,KAAK,MAAM,SAAS,SACnB,QAAO;EAER,KAAK,KACJ,QAAO;EAER,KAAK,KACJ,QAAO;EAER,KAAK,KACJ,QAAO;EAER,KAAK,KACJ,QAAO;EAER,KAAK,KACJ,QAAO;EACR,QACC,QAAO,MAAM,cAAc,QAAQ,OAAO;;IAG7C;AAQD,IAAa,gBAAb,MAAa,sBAEHA,0CAAiD;CAC1D,QAA0BC,0BAAsB;CAEhD,AAAQ;CACR,AAAQ;CAER,YACC,AAAQ,QACR,SACA,AAAQ,WACR,AAAQ,UAAgC,EAAE,EACzC;AACD,QAAM,QAAQ;EALN;EAEA;EACA;AAGR,OAAK,SAAS,QAAQ,UAAU,IAAIC,wBAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAIC,iCAAW;;CAG9C,aACC,OACA,MACA,MACA,QACA,eAIA,aACC;EACD,MAAM,YAAY,OAAO,SAAS,WAC/B,OACA,SAAS,4DACa,MAAM,KAAK,MAAM,OAAO,GAC9C;EAEH,MAAM,WAAW,OAAO,WAAuB;AAC9C,UAAO,KAAK,OAAO,MAAM;IACxB,MAAM;IACN,SAAS,SAAS,WAAW,UAAU;IACvC,MAAM,MAAM;IACZ,OAAO;IACP,EAAE,OAAO,CAAC,MAAM,MAAM,SAAS,QAAQ,IAAI,EAAE,KAAK;;AAGpD,SAAO,IAAIC,gDACV,UACA,OACA,QACA,MACA,KAAK,QACL,KAAK,OACL,eACA,YACA;;CAGF,MAAe,YACd,aACA,QACa;EACb,MAAM,SAAS,KAAK,kBAAkB,QAAQ,OAAO,eAAe,KAAK,OAAO,CAAC,YAAY,KAAK,SAAS,OAAO;EAClH,MAAM,UAAU,SACb,IAAI,cACL,MAAiB,KAAK,OAAQ,SAAS,EACvC,KAAK,SACL,KAAK,WACL,KAAK,QACL,GACC;EACH,MAAM,KAAK,IAAI,kBACd,KAAK,SACL,SACA,KAAK,WACL,QACA,MACA;AACD,QAAM,GAAG,QAAQ,gBAAG,QAAQ,SAAS,gBAAG,IAAI,GAAG,wBAAwB,OAAO,KAAK,SAAY;AAC/F,MAAI;GACH,MAAM,SAAS,MAAM,YAAY,GAAG;AACpC,SAAM,GAAG,QAAQ,gBAAG,SAAS;AAC7B,UAAO;WACC,OAAO;AACf,SAAM,GAAG,QAAQ,gBAAG,WAAW;AAC/B,SAAM;YACG;AACT,OAAI,OAAQ,CAAC,QAAQ,OAAsB,SAAS;;;;AAKvD,IAAa,oBAAb,MAAa,0BAEHC,8CAAqD;CAC9D,QAA0BJ,0BAAsB;CAEhD,AAAS,cAAc,OACtB,gBACgB;EAChB,MAAM,gBAAgB,KAAK,KAAK,cAAc;EAC9C,MAAM,KAAK,IAAI,kBACd,KAAK,SACL,KAAK,SACL,KAAK,EAAE,WACP,KAAK,cAAc,GACnB,MACA;AACD,QAAM,GAAG,QAAQK,iBAAI,IAAI,aAAa,gBAAgB,CAAC;AACvD,MAAI;GACH,MAAM,SAAS,MAAM,YAAY,GAAG;AACpC,SAAM,GAAG,QAAQA,iBAAI,IAAI,qBAAqB,gBAAgB,CAAC;AAC/D,UAAO;WACC,KAAK;AACb,SAAM,GAAG,QAAQA,iBAAI,IAAI,yBAAyB,gBAAgB,CAAC;AACnE,SAAM"}
+{"version":3,"file":"session.cjs","names":["PgAsyncPreparedQuery","entityKind","tracer","PgAsyncSession","NoopLogger","NoopCache","PgAsyncTransaction","sql"],"sources":["../../src/node-postgres/session.ts"],"sourcesContent":["import type { Client, CustomTypesConfig, PoolClient, QueryResult, QueryResultRow } from 'pg';\nimport pg from 'pg';\nimport type * as V1 from '~/_relations.ts';\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, NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery } from '~/pg-core/async/session.ts';\nimport { PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { SelectedFieldsOrdered } from '~/pg-core/query-builders/select.types.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig } from '~/pg-core/session.ts';\nimport type { PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { fillPlaceholders, type Query, sql } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { type Assume, mapResultRow } from '~/utils.ts';\n\nconst { Pool, types } = pg;\nexport type NodePgClient = pg.Pool | PoolClient | Client;\n\nconst parsers: CustomTypesConfig = {\n\t// @ts-ignore\n\tgetTypeParser: (typeId, format) => {\n\t\tif (typeId === types.builtins.TIMESTAMPTZ) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\tif (typeId === types.builtins.TIMESTAMP) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\tif (typeId === types.builtins.DATE) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\tif (typeId === types.builtins.INTERVAL) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\t// numeric[]\n\t\tif (typeId as number === 1231) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\t// timestamp[]\n\t\tif (typeId as number === 1115) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\t// timestamp with timezone[]\n\t\tif (typeId as number === 1185) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\t// interval[]\n\t\tif (typeId as number === 1187) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\t// date[]\n\t\tif (typeId as number === 1182) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\t// @ts-ignore\n\t\treturn types.getTypeParser(typeId, format);\n\t},\n};\n\nexport class NodePgPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends PgAsyncPreparedQuery<T>\n{\n\tstatic override readonly [entityKind]: string = 'NodePgPreparedQuery';\n\n\tconstructor(\n\t\tprivate client: NodePgClient,\n\t\tquery: Query,\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 name: string | undefined,\n\t\tprivate _isResponseInArrayMode: boolean,\n\t\tprivate customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => T['execute'],\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t) {\n\t\tsuper(query, cache, queryMetadata, cacheConfig);\n\t}\n\n\tasync execute(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tif (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);\n\n\t\treturn tracer.startActiveSpan('drizzle.execute', async () => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\t\tconst { query, client, joinsNotNullableMap, customResultMapper, name, fields } = this;\n\t\t\tif (!fields && !customResultMapper) {\n\t\t\t\treturn tracer.startActiveSpan('drizzle.driver.execute', async (span) => {\n\t\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t\t'drizzle.query.name': name,\n\t\t\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t\t});\n\t\t\t\t\treturn this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\t\treturn await client.query({\n\t\t\t\t\t\t\tname,\n\t\t\t\t\t\t\ttext: query.sql,\n\t\t\t\t\t\t\ttypes: parsers,\n\t\t\t\t\t\t}, params);\n\t\t\t\t\t});\n\t\t\t\t});\n\t\t\t}\n\n\t\t\tconst result = await tracer.startActiveSpan('drizzle.driver.execute', (span) => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.name': name,\n\t\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\t\t\t\treturn this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\treturn await client.query({\n\t\t\t\t\t\ttext: query.sql,\n\t\t\t\t\t\tname,\n\t\t\t\t\t\ttypes: parsers,\n\t\t\t\t\t\trowMode: 'array',\n\t\t\t\t\t}, params);\n\t\t\t\t});\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn customResultMapper\n\t\t\t\t\t? (customResultMapper as (rows: unknown[][]) => T['execute'])(result.rows)\n\t\t\t\t\t: result.rows.map((row) => mapResultRow<T['execute']>(fields!, row, joinsNotNullableMap));\n\t\t\t});\n\t\t});\n\t}\n\n\tprivate async executeRqbV2(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\treturn tracer.startActiveSpan('drizzle.execute', async () => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\t\tconst { client, customResultMapper, query, name } = this;\n\n\t\t\tconst result = await tracer.startActiveSpan('drizzle.driver.execute', (span) => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.name': name,\n\t\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\t\t\t\treturn client.query({\n\t\t\t\t\tname,\n\t\t\t\t\ttext: query.sql,\n\t\t\t\t\ttypes: parsers,\n\t\t\t\t}, params);\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => T['execute'])(result.rows);\n\t\t\t});\n\t\t});\n\t}\n\n\tall(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['all']> {\n\t\treturn tracer.startActiveSpan('drizzle.execute', () => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\t\t\treturn tracer.startActiveSpan('drizzle.driver.execute', (span) => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.name': this.name,\n\t\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\t\t\t\treturn this.queryWithCache(this.query.sql, params, async () => {\n\t\t\t\t\treturn this.client.query({\n\t\t\t\t\t\tname: this.name,\n\t\t\t\t\t\ttext: this.query.sql,\n\t\t\t\t\t\ttypes: parsers,\n\t\t\t\t\t}, params);\n\t\t\t\t}).then((result) => result.rows);\n\t\t\t});\n\t\t});\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport interface NodePgSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class NodePgSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<NodePgQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'NodePgSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: NodePgClient,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tprivate options: NodePgSessionOptions = {},\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 PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\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) {\n\t\treturn new NodePgPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\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\tname,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper?: (rows: Record<string, unknown>[]) => T['execute'],\n\t) {\n\t\treturn new NodePgPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfields,\n\t\t\tname,\n\t\t\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: NodePgTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig | undefined,\n\t): Promise<T> {\n\t\tconst isPool = this.client instanceof Pool || Object.getPrototypeOf(this.client).constructor.name.includes('Pool'); // oxlint-disable-line drizzle-internal/no-instanceof\n\t\tconst session = isPool\n\t\t\t? new NodePgSession(\n\t\t\t\tawait (<pg.Pool> this.client).connect(),\n\t\t\t\tthis.dialect,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.schema,\n\t\t\t\tthis.options,\n\t\t\t)\n\t\t\t: this;\n\t\tconst tx = new NodePgTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\tthis.dialect,\n\t\t\tsession,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t);\n\t\tawait tx.execute(sql`begin${config ? sql` ${tx.getTransactionConfigSQL(config)}` : undefined}`);\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql`commit`);\n\t\t\treturn result;\n\t\t} catch (error) {\n\t\t\tawait tx.execute(sql`rollback`);\n\t\t\tthrow error;\n\t\t} finally {\n\t\t\tif (isPool) (session.client as PoolClient).release();\n\t\t}\n\t}\n}\n\nexport class NodePgTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<NodePgQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'NodePgTransaction';\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: NodePgTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\tconst savepointName = `sp${this.nestedIndex + 1}`;\n\t\tconst tx = new NodePgTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t\tthis.nestedIndex + 1,\n\t\t);\n\t\tawait tx.execute(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tawait tx.execute(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow err;\n\t\t}\n\t}\n}\n\nexport interface NodePgQueryResultHKT extends PgQueryResultHKT {\n\ttype: QueryResult<Assume<this['row'], QueryResultRow>>;\n}\n"],"mappings":"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"}

package/node-postgres/session.d.cts

@@ -1,43 +1,63 @@
 import { entityKind } from "../entity.cjs";
 import { Query } from "../sql/sql.cjs";
 import { Assume } from "../utils.cjs";
+import * as V1 from "../_relations.cjs";
 import { WithCacheConfig } from "../cache/core/types.cjs";
 import { AnyRelations } from "../relations.cjs";
 import { PgDialect } from "../pg-core/dialect.cjs";
 import { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from "../pg-core/session.cjs";
-import { Logger } from "../logger.cjs";
+import { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.cjs";
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.cjs";
+import { Logger } from "../logger.cjs";
 import { Cache } from "../cache/core/index.cjs";
 import pg, { Client, PoolClient, QueryResult, QueryResultRow } from "pg";
 
 //#region src/node-postgres/session.d.ts
 type NodePgClient = pg.Pool | PoolClient | Client;
+declare class NodePgPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
+  private client;
+  private logger;
+  private fields;
+  private name;
+  private _isResponseInArrayMode;
+  private customResultMapper?;
+  private isRqbV2Query?;
+  static readonly [entityKind]: string;
+  constructor(client: NodePgClient, query: Query, logger: Logger, cache: Cache, queryMetadata: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, name: string | undefined, _isResponseInArrayMode: boolean, customResultMapper?: ((rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][]) => T["execute"]) | undefined, isRqbV2Query?: TIsRqbV2 | undefined);
+  execute(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
+  private executeRqbV2;
+  all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']>;
+}
 interface NodePgSessionOptions {
   logger?: Logger;
   cache?: Cache;
-  useJitMapper?: boolean;
 }
-declare class NodePgSession<TRelations extends AnyRelations> extends PgAsyncSession<NodePgQueryResultHKT, TRelations> {
+declare class NodePgSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<NodePgQueryResultHKT, TFullSchema, TRelations, TSchema> {
   private client;
   private relations;
+  private schema;
   private options;
   static readonly [entityKind]: string;
   private logger;
   private cache;
-  constructor(client: NodePgClient, dialect: PgDialect, relations: TRelations, options?: NodePgSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
+  constructor(client: NodePgClient, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: NodePgSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
-  }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  transaction<T>(transaction: (tx: NodePgTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig | undefined): Promise<T>;
+  }, cacheConfig?: WithCacheConfig): NodePgPreparedQuery<T, false>;
+  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): NodePgPreparedQuery<T, true>;
+  transaction<T>(transaction: (tx: NodePgTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig | undefined): Promise<T>;
 }
-declare class NodePgTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<NodePgQueryResultHKT, TRelations> {
+declare class NodePgTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<NodePgQueryResultHKT, TFullSchema, TRelations, TSchema> {
   static readonly [entityKind]: string;
-  transaction: <T>(transaction: (tx: NodePgTransaction<TRelations>) => Promise<T>) => Promise<T>;
+  transaction<T>(transaction: (tx: NodePgTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
 }
 interface NodePgQueryResultHKT extends PgQueryResultHKT {
   type: QueryResult<Assume<this['row'], QueryResultRow>>;
 }
 //#endregion
-export { NodePgClient, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction };
+export { NodePgClient, NodePgPreparedQuery, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction };
 //# sourceMappingURL=session.d.cts.map

package/node-postgres/session.d.ts

@@ -1,43 +1,63 @@
 import { entityKind } from "../entity.js";
 import { Assume } from "../utils.js";
 import { Query } from "../sql/sql.js";
-import { Cache } from "../cache/core/index.js";
+import * as V1 from "../_relations.js";
 import { Logger } from "../logger.js";
+import { PgDialect } from "../pg-core/dialect.js";
+import { Cache } from "../cache/core/index.js";
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
 import { AnyRelations } from "../relations.js";
-import { PgDialect } from "../pg-core/dialect.js";
 import pg, { Client, PoolClient, QueryResult, QueryResultRow } from "pg";
 import { WithCacheConfig } from "../cache/core/types.js";
 import { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from "../pg-core/session.js";
+import { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.js";
 
 //#region src/node-postgres/session.d.ts
 type NodePgClient = pg.Pool | PoolClient | Client;
+declare class NodePgPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
+  private client;
+  private logger;
+  private fields;
+  private name;
+  private _isResponseInArrayMode;
+  private customResultMapper?;
+  private isRqbV2Query?;
+  static readonly [entityKind]: string;
+  constructor(client: NodePgClient, query: Query, logger: Logger, cache: Cache, queryMetadata: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, name: string | undefined, _isResponseInArrayMode: boolean, customResultMapper?: ((rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][]) => T["execute"]) | undefined, isRqbV2Query?: TIsRqbV2 | undefined);
+  execute(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
+  private executeRqbV2;
+  all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']>;
+}
 interface NodePgSessionOptions {
   logger?: Logger;
   cache?: Cache;
-  useJitMapper?: boolean;
 }
-declare class NodePgSession<TRelations extends AnyRelations> extends PgAsyncSession<NodePgQueryResultHKT, TRelations> {
+declare class NodePgSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<NodePgQueryResultHKT, TFullSchema, TRelations, TSchema> {
   private client;
   private relations;
+  private schema;
   private options;
   static readonly [entityKind]: string;
   private logger;
   private cache;
-  constructor(client: NodePgClient, dialect: PgDialect, relations: TRelations, options?: NodePgSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
+  constructor(client: NodePgClient, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: NodePgSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
-  }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  transaction<T>(transaction: (tx: NodePgTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig | undefined): Promise<T>;
+  }, cacheConfig?: WithCacheConfig): NodePgPreparedQuery<T, false>;
+  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): NodePgPreparedQuery<T, true>;
+  transaction<T>(transaction: (tx: NodePgTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig | undefined): Promise<T>;
 }
-declare class NodePgTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<NodePgQueryResultHKT, TRelations> {
+declare class NodePgTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<NodePgQueryResultHKT, TFullSchema, TRelations, TSchema> {
   static readonly [entityKind]: string;
-  transaction: <T>(transaction: (tx: NodePgTransaction<TRelations>) => Promise<T>) => Promise<T>;
+  transaction<T>(transaction: (tx: NodePgTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
 }
 interface NodePgQueryResultHKT extends PgQueryResultHKT {
   type: QueryResult<Assume<this['row'], QueryResultRow>>;
 }
 //#endregion
-export { NodePgClient, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction };
+export { NodePgClient, NodePgPreparedQuery, NodePgQueryResultHKT, NodePgSession, NodePgSessionOptions, NodePgTransaction };
 //# sourceMappingURL=session.d.ts.map