drizzle-orm 1.0.0-beta.8-dbc3565 → 1.0.0-beta.8-c55bf0f

package/effect-postgres/migrator.cjs

@@ -0,0 +1,34 @@
+"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_session = require("../pg-core/effect/session.cjs");
+async function migrate(db, config) {
+  const migrations = (0, import_migrator.readMigrationFiles)(config);
+  return (0, import_session.migrate)(migrations, db.session, config);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  migrate
+});
+//# sourceMappingURL=migrator.cjs.map

package/effect-postgres/migrator.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/effect-postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/effect/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { EffectPgDatabase } from './driver.ts';\n\nexport async function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(\n\tdb: EffectPgDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn coreMigrate(migrations, db.session, config);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,sBAAmC;AACnC,qBAAuC;AAIvC,eAAsB,QACrB,IACA,QACC;AACD,QAAM,iBAAa,oCAAmB,MAAM;AAC5C,aAAO,eAAAA,SAAY,YAAY,GAAG,SAAS,MAAM;AAClD;","names":["coreMigrate"]}

package/effect-postgres/migrator.d.cts

@@ -0,0 +1,4 @@
+import type { MigrationConfig } from "../migrator.cjs";
+import type { AnyRelations } from "../relations.cjs";
+import type { EffectPgDatabase } from "./driver.cjs";
+export declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: EffectPgDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<import("effect/Effect").Effect<void | import("../migrator.ts").MigratorInitFailResponse, import("../errors.ts").DrizzleQueryError, never>>;

package/effect-postgres/migrator.d.ts

@@ -0,0 +1,4 @@
+import type { MigrationConfig } from "../migrator.js";
+import type { AnyRelations } from "../relations.js";
+import type { EffectPgDatabase } from "./driver.js";
+export declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: EffectPgDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<import("effect/Effect").Effect<void | import("../migrator.js").MigratorInitFailResponse, import("../errors.js").DrizzleQueryError, never>>;

package/effect-postgres/migrator.js

@@ -0,0 +1,10 @@
+import { readMigrationFiles } from "../migrator.js";
+import { migrate as coreMigrate } from "../pg-core/effect/session.js";
+async function migrate(db, config) {
+  const migrations = readMigrationFiles(config);
+  return coreMigrate(migrations, db.session, config);
+}
+export {
+  migrate
+};
+//# sourceMappingURL=migrator.js.map

package/effect-postgres/migrator.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/effect-postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/effect/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { EffectPgDatabase } from './driver.ts';\n\nexport async function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(\n\tdb: EffectPgDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn coreMigrate(migrations, db.session, config);\n}\n"],"mappings":"AACA,SAAS,0BAA0B;AACnC,SAAS,WAAW,mBAAmB;AAIvC,eAAsB,QACrB,IACA,QACC;AACD,QAAM,aAAa,mBAAmB,MAAM;AAC5C,SAAO,YAAY,YAAY,GAAG,SAAS,MAAM;AAClD;","names":[]}

package/effect-postgres/session.cjs

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var session_exports = {};
 __export(session_exports, {
   EffectPgPreparedQuery: () => EffectPgPreparedQuery,
-  EffectPgSession: () => EffectPgSession
+  EffectPgSession: () => EffectPgSession,
+  EffectPgTransaction: () => EffectPgTransaction
 });
 module.exports = __toCommonJS(session_exports);
 var import_effect = require("effect");
@@ -30,7 +31,7 @@ var import_session = require("../pg-core/effect/session.cjs");
 var import_sql = require("../sql/sql.cjs");
 var import_utils = require("../utils.cjs");
 class EffectPgPreparedQuery extends import_session.PgEffectPreparedQuery {
-  constructor(client, queryString, params, logger, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
+  constructor(client, queryString, params, logger, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper, isRqbV2Query, wrap = (t) => t) {
     super({ sql: queryString, params }, cache, queryMetadata, cacheConfig);
     this.client = client;
     this.queryString = queryString;
@@ -40,6 +41,7 @@ class EffectPgPreparedQuery extends import_session.PgEffectPreparedQuery {
     this._isResponseInArrayMode = _isResponseInArrayMode;
     this.customResultMapper = customResultMapper;
     this.isRqbV2Query = isRqbV2Query;
+    this.wrap = wrap;
   }
   static [import_entity.entityKind] = "EffectPgPreparedQuery";
   execute(placeholderValues) {
@@ -57,31 +59,35 @@ class EffectPgPreparedQuery extends import_session.PgEffectPreparedQuery {
     return this.queryWithCache(
       query.sql,
       params,
-      client.unsafe(query.sql, params).values.pipe(import_effect.Effect.andThen(
-        (rows) => {
-          if (customResultMapper) return customResultMapper(rows);
-          return rows.map(
-            (row) => (0, import_utils.mapResultRow)(
-              fields,
-              row,
-              joinsNotNullableMap
-            )
-          );
-        }
-      ))
+      this.wrap(
+        client.unsafe(query.sql, params).values.pipe(import_effect.Effect.andThen(
+          (rows) => {
+            if (customResultMapper) return customResultMapper(rows);
+            return rows.map(
+              (row) => (0, import_utils.mapResultRow)(
+                fields,
+                row,
+                joinsNotNullableMap
+              )
+            );
+          }
+        ))
+      )
     );
   }
   executeRqbV2(placeholderValues) {
     const { query, logger, customResultMapper, client } = this;
     const params = (0, import_sql.fillPlaceholders)(query.params, placeholderValues ?? {});
     logger.logQuery(query.sql, params);
-    return client.unsafe(query.sql, params).withoutTransform.pipe(
-      import_effect.Effect.andThen(
-        (v) => customResultMapper(v)
-      )
-    ).pipe(import_effect.Effect.catchAll((e) => {
-      return import_effect.Effect.fail(new import_errors.DrizzleQueryError(query.sql, params, e instanceof Error ? e : void 0));
-    }));
+    return this.wrap(
+      client.unsafe(query.sql, params).withoutTransform.pipe(
+        import_effect.Effect.andThen(
+          (v) => customResultMapper(v)
+        )
+      ).pipe(import_effect.Effect.catchAll((e) => {
+        return import_effect.Effect.fail(new import_errors.DrizzleQueryError(query.sql, params, e instanceof Error ? e : void 0));
+      }))
+    );
   }
   all(placeholderValues) {
     const { query, logger, client } = this;
@@ -90,7 +96,7 @@ class EffectPgPreparedQuery extends import_session.PgEffectPreparedQuery {
     return this.queryWithCache(
       query.sql,
       params,
-      client.unsafe(query.sql, params).withoutTransform
+      this.wrap(client.unsafe(query.sql, params).withoutTransform)
     );
   }
   /** @internal */
@@ -99,9 +105,13 @@ class EffectPgPreparedQuery extends import_session.PgEffectPreparedQuery {
   }
 }
 class EffectPgSession extends import_session.PgEffectSession {
-  constructor(client, dialect, relations, schema, options = {}) {
+  constructor(client, dialect, relations, schema, options = {}, wrap = (t) => t, nestedIndex = 0) {
     super(dialect);
     this.client = client;
+    this.relations = relations;
+    this.schema = schema;
+    this.wrap = wrap;
+    this.nestedIndex = nestedIndex;
     this.logger = options.logger ?? new import_logger.NoopLogger();
     this.cache = options.cache;
   }
@@ -120,7 +130,9 @@ class EffectPgSession extends import_session.PgEffectSession {
       fields,
       name,
       isResponseInArrayMode,
-      customResultMapper
+      customResultMapper,
+      false,
+      this.wrap
     );
   }
   prepareRelationalQuery(query, fields, name, customResultMapper) {
@@ -136,7 +148,8 @@ class EffectPgSession extends import_session.PgEffectSession {
       name,
       false,
       customResultMapper,
-      true
+      true,
+      this.wrap
     );
   }
   execute(query) {
@@ -155,10 +168,48 @@ class EffectPgSession extends import_session.PgEffectSession {
       false
     ).all();
   }
+  transaction(transaction) {
+    const { dialect, relations, schema, client, logger, cache, nestedIndex } = this;
+    const sp = `sp${this.nestedIndex}`;
+    return this.client.withTransaction(import_effect.Effect.gen(function* (txAdapter) {
+      const session = new EffectPgSession(
+        client,
+        dialect,
+        relations,
+        schema,
+        { logger, cache },
+        txAdapter,
+        nestedIndex + 1
+      );
+      const tx = new EffectPgTransaction(
+        dialect,
+        session,
+        relations,
+        schema,
+        nestedIndex + 1
+      );
+      if (nestedIndex) yield* tx.execute(import_sql.sql.raw(`savepoint ${sp}`));
+      const res = yield* transaction(tx).pipe(import_effect.Effect.catchAll(
+        (e) => import_effect.Effect.gen(function* () {
+          if (nestedIndex) yield* tx.execute(import_sql.sql.raw(`rollback to savepoint ${sp}`));
+          return yield* import_effect.Effect.fail(e);
+        })
+      ));
+      if (nestedIndex) yield* tx.execute(import_sql.sql.raw(`release savepoint ${sp}`));
+      return res;
+    }));
+  }
+}
+class EffectPgTransaction extends import_session.PgEffectTransaction {
+  static [import_entity.entityKind] = "EffectPgTransaction";
+  transaction(transaction) {
+    return this.session.transaction(transaction);
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   EffectPgPreparedQuery,
-  EffectPgSession
+  EffectPgSession,
+  EffectPgTransaction
 });
 //# sourceMappingURL=session.cjs.map

package/effect-postgres/session.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/effect-postgres/session.ts"],"sourcesContent":["import type { PgClient } from '@effect/sql-pg/PgClient';\nimport { Effect } from 'effect';\nimport type * as V1 from '~/_relations.ts';\nimport type { EffectCache } from '~/cache/core/cache-effect.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport { DrizzleQueryError } from '~/errors.ts';\nimport { type Logger, NoopLogger } from '~/logger.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport { PgEffectPreparedQuery, PgEffectSession } from '~/pg-core/effect/session.ts';\nimport type { SelectedFieldsOrdered } from '~/pg-core/query-builders/select.types.ts';\nimport type { PgQueryResultHKT, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query, SQL } from '~/sql/sql.ts';\nimport { fillPlaceholders } from '~/sql/sql.ts';\nimport { mapResultRow } from '~/utils.ts';\n\nexport interface EffectPgQueryResultHKT extends PgQueryResultHKT {\n\ttype: readonly object[];\n}\n\nexport class EffectPgPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends PgEffectPreparedQuery<T>\n{\n\tstatic override readonly [entityKind]: string = 'EffectPgPreparedQuery';\n\n\tconstructor(\n\t\tprivate client: PgClient,\n\t\tprivate queryString: string,\n\t\tprivate params: unknown[],\n\t\tprivate logger: Logger,\n\t\tcache: EffectCache | undefined,\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\tname: 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({ sql: queryString, params }, cache, queryMetadata, cacheConfig);\n\t}\n\n\texecute(placeholderValues?: Record<string, unknown>): Effect.Effect<T['execute'], DrizzleQueryError> {\n\t\tif (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);\n\n\t\tconst { query, logger, customResultMapper, fields, joinsNotNullableMap, client } = this;\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\tlogger.logQuery(query.sql, params);\n\n\t\tif (!fields && !customResultMapper) {\n\t\t\treturn this.queryWithCache(\n\t\t\t\tquery.sql,\n\t\t\t\tparams,\n\t\t\t\tthis.client.unsafe(query.sql, params as any).withoutTransform,\n\t\t\t);\n\t\t}\n\n\t\treturn this.queryWithCache(\n\t\t\tquery.sql,\n\t\t\tparams,\n\t\t\tclient.unsafe(query.sql, params as any).values.pipe(Effect.andThen(\n\t\t\t\t(rows) => {\n\t\t\t\t\tif (customResultMapper) return (customResultMapper as (rows: unknown[][]) => unknown)(rows as unknown[][]);\n\n\t\t\t\t\treturn rows.map((row) =>\n\t\t\t\t\t\tmapResultRow(\n\t\t\t\t\t\t\tfields!,\n\t\t\t\t\t\t\trow as unknown[],\n\t\t\t\t\t\t\tjoinsNotNullableMap,\n\t\t\t\t\t\t)\n\t\t\t\t\t);\n\t\t\t\t},\n\t\t\t)),\n\t\t);\n\t}\n\n\tprivate executeRqbV2(\n\t\tplaceholderValues?: Record<string, unknown>,\n\t): Effect.Effect<T['execute'], DrizzleQueryError> {\n\t\tconst { query, logger, customResultMapper, client } = this;\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\n\t\tlogger.logQuery(query.sql, params);\n\t\treturn client.unsafe(query.sql, params as any).withoutTransform.pipe(\n\t\t\tEffect.andThen((v) =>\n\t\t\t\t(customResultMapper as (\n\t\t\t\t\trows: Record<string, unknown>[],\n\t\t\t\t\tmapColumnValue?: (value: unknown) => unknown,\n\t\t\t\t) => unknown)(v as Record<string, unknown>[])\n\t\t\t),\n\t\t).pipe(Effect.catchAll((e) => {\n\t\t\t// eslint-disable-next-line @drizzle-internal/no-instanceof\n\t\t\treturn Effect.fail(new DrizzleQueryError(query.sql, params, e instanceof Error ? e : undefined));\n\t\t}));\n\t}\n\n\toverride all(placeholderValues?: Record<string, unknown>): Effect.Effect<T['all'], DrizzleQueryError, never> {\n\t\tconst { query, logger, client } = this;\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\n\t\tlogger.logQuery(query.sql, params);\n\n\t\treturn this.queryWithCache(\n\t\t\tquery.sql,\n\t\t\tparams,\n\t\t\tclient.unsafe(query.sql, params as any).withoutTransform,\n\t\t);\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport class EffectPgSession<\n\t_TFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgEffectSession {\n\tstatic override readonly [entityKind]: string = 'EffectPgSession';\n\n\tprivate logger: Logger;\n\tprivate cache: EffectCache | undefined;\n\n\tconstructor(\n\t\tprivate client: PgClient,\n\t\tdialect: PgDialect,\n\t\trelations: TRelations,\n\t\tschema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\toptions: { logger?: Logger; cache?: EffectCache } = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache;\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 EffectPgPreparedQuery(\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\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): EffectPgPreparedQuery<T, true> {\n\t\treturn new EffectPgPreparedQuery<T, true>(\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\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 execute<T>(query: SQL): Effect.Effect<T, DrizzleQueryError> {\n\t\treturn this.prepareQuery<PreparedQueryConfig & { execute: T }>(\n\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfalse,\n\t\t).execute();\n\t}\n\n\toverride all<T>(query: SQL): Effect.Effect<T, DrizzleQueryError> {\n\t\treturn this.prepareQuery<PreparedQueryConfig & { all: T }>(\n\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfalse,\n\t\t).all();\n\t}\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/effect-postgres/session.ts"],"sourcesContent":["import type { PgClient } from '@effect/sql-pg/PgClient';\nimport { Effect } from 'effect';\nimport type * as V1 from '~/_relations.ts';\nimport type { EffectCache } from '~/cache/core/cache-effect.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport { DrizzleQueryError, type TransactionRollbackError } from '~/errors.ts';\nimport { type Logger, NoopLogger } from '~/logger.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport { PgEffectPreparedQuery, PgEffectSession, PgEffectTransaction } from '~/pg-core/effect/session.ts';\nimport type { SelectedFieldsOrdered } from '~/pg-core/query-builders/select.types.ts';\nimport type { PgQueryResultHKT, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query, SQL } from '~/sql/sql.ts';\nimport { fillPlaceholders, sql } from '~/sql/sql.ts';\nimport { mapResultRow } from '~/utils.ts';\nexport interface EffectPgQueryResultHKT extends PgQueryResultHKT {\n\ttype: readonly object[];\n}\n\nexport class EffectPgPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends PgEffectPreparedQuery<T>\n{\n\tstatic override readonly [entityKind]: string = 'EffectPgPreparedQuery';\n\n\tconstructor(\n\t\tprivate client: PgClient,\n\t\tprivate queryString: string,\n\t\tprivate params: unknown[],\n\t\tprivate logger: Logger,\n\t\tcache: EffectCache | undefined,\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\tname: 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\tprivate wrap: Effect.Adapter = <T>(t: T): T => t,\n\t) {\n\t\tsuper({ sql: queryString, params }, cache, queryMetadata, cacheConfig);\n\t}\n\n\texecute(placeholderValues?: Record<string, unknown>): Effect.Effect<T['execute'], DrizzleQueryError> {\n\t\tif (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);\n\n\t\tconst { query, logger, customResultMapper, fields, joinsNotNullableMap, client } = this;\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\tlogger.logQuery(query.sql, params);\n\n\t\tif (!fields && !customResultMapper) {\n\t\t\treturn this.queryWithCache(\n\t\t\t\tquery.sql,\n\t\t\t\tparams,\n\t\t\t\tthis.client.unsafe(query.sql, params as any).withoutTransform,\n\t\t\t);\n\t\t}\n\n\t\treturn this.queryWithCache(\n\t\t\tquery.sql,\n\t\t\tparams,\n\t\t\tthis.wrap(\n\t\t\t\tclient.unsafe(query.sql, params as any).values.pipe(Effect.andThen(\n\t\t\t\t\t(rows) => {\n\t\t\t\t\t\tif (customResultMapper) return (customResultMapper as (rows: unknown[][]) => unknown)(rows as unknown[][]);\n\n\t\t\t\t\t\treturn rows.map((row) =>\n\t\t\t\t\t\t\tmapResultRow(\n\t\t\t\t\t\t\t\tfields!,\n\t\t\t\t\t\t\t\trow as unknown[],\n\t\t\t\t\t\t\t\tjoinsNotNullableMap,\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)),\n\t\t\t),\n\t\t);\n\t}\n\n\tprivate executeRqbV2(\n\t\tplaceholderValues?: Record<string, unknown>,\n\t): Effect.Effect<T['execute'], DrizzleQueryError> {\n\t\tconst { query, logger, customResultMapper, client } = this;\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\n\t\tlogger.logQuery(query.sql, params);\n\t\treturn this.wrap(\n\t\t\tclient.unsafe(query.sql, params as any).withoutTransform.pipe(\n\t\t\t\tEffect.andThen((v) =>\n\t\t\t\t\t(customResultMapper as (\n\t\t\t\t\t\trows: Record<string, unknown>[],\n\t\t\t\t\t\tmapColumnValue?: (value: unknown) => unknown,\n\t\t\t\t\t) => unknown)(v as Record<string, unknown>[])\n\t\t\t\t),\n\t\t\t).pipe(Effect.catchAll((e) => {\n\t\t\t\t// eslint-disable-next-line @drizzle-internal/no-instanceof\n\t\t\t\treturn Effect.fail(new DrizzleQueryError(query.sql, params, e instanceof Error ? e : undefined));\n\t\t\t})),\n\t\t);\n\t}\n\n\toverride all(placeholderValues?: Record<string, unknown>): Effect.Effect<T['all'], DrizzleQueryError, never> {\n\t\tconst { query, logger, client } = this;\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\n\t\tlogger.logQuery(query.sql, params);\n\n\t\treturn this.queryWithCache(\n\t\t\tquery.sql,\n\t\t\tparams,\n\t\t\tthis.wrap(client.unsafe(query.sql, params as any).withoutTransform),\n\t\t);\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport class EffectPgSession<\n\tTQueryResult extends PgQueryResultHKT,\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgEffectSession<TQueryResult, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'EffectPgSession';\n\n\tprivate logger: Logger;\n\tprivate cache: EffectCache | undefined;\n\n\tconstructor(\n\t\tprivate client: PgClient,\n\t\tdialect: PgDialect,\n\t\tprotected relations: TRelations,\n\t\tprotected schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\toptions: { logger?: Logger; cache?: EffectCache } = {},\n\t\tprivate wrap: Effect.Adapter = <T>(t: T): T => t,\n\t\tprivate nestedIndex = 0,\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache;\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 EffectPgPreparedQuery(\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\tname,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t\tfalse,\n\t\t\tthis.wrap,\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): EffectPgPreparedQuery<T, true> {\n\t\treturn new EffectPgPreparedQuery<T, true>(\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\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\tthis.wrap,\n\t\t);\n\t}\n\n\toverride execute<T>(query: SQL): Effect.Effect<T, DrizzleQueryError> {\n\t\treturn this.prepareQuery<PreparedQueryConfig & { execute: T }>(\n\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfalse,\n\t\t).execute();\n\t}\n\n\toverride all<T>(query: SQL): Effect.Effect<T, DrizzleQueryError> {\n\t\treturn this.prepareQuery<PreparedQueryConfig & { all: T }>(\n\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfalse,\n\t\t).all();\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (\n\t\t\ttx: EffectPgTransaction<\n\t\t\t\tTQueryResult,\n\t\t\t\tTFullSchema,\n\t\t\t\tTRelations,\n\t\t\t\tTSchema\n\t\t\t>,\n\t\t) => Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never>,\n\t): Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never> {\n\t\tconst { dialect, relations, schema, client, logger, cache, nestedIndex } = this;\n\t\tconst sp = `sp${this.nestedIndex}`;\n\n\t\treturn this.client.withTransaction(Effect.gen(function*(txAdapter) {\n\t\t\tconst session = new EffectPgSession(\n\t\t\t\tclient,\n\t\t\t\tdialect,\n\t\t\t\trelations,\n\t\t\t\tschema,\n\t\t\t\t{ logger, cache },\n\t\t\t\ttxAdapter,\n\t\t\t\tnestedIndex + 1,\n\t\t\t);\n\n\t\t\tconst tx = new EffectPgTransaction<TQueryResult, TFullSchema, TRelations, TSchema>(\n\t\t\t\tdialect,\n\t\t\t\tsession,\n\t\t\t\trelations,\n\t\t\t\tschema,\n\t\t\t\tnestedIndex + 1,\n\t\t\t);\n\n\t\t\tif (nestedIndex) yield* tx.execute(sql.raw(`savepoint ${sp}`));\n\n\t\t\tconst res = yield* transaction(tx).pipe(Effect.catchAll((e) =>\n\t\t\t\tEffect.gen(function*() {\n\t\t\t\t\tif (nestedIndex) yield* (tx.execute(sql.raw(`rollback to savepoint ${sp}`)));\n\t\t\t\t\treturn yield* Effect.fail(e);\n\t\t\t\t})\n\t\t\t));\n\t\t\tif (nestedIndex) yield* (tx.execute(sql.raw(`release savepoint ${sp}`)));\n\n\t\t\treturn res;\n\t\t}));\n\t}\n}\n\nexport class EffectPgTransaction<\n\tTQueryResult extends PgQueryResultHKT,\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgEffectTransaction<TQueryResult, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'EffectPgTransaction';\n\n\toverride transaction<T>(\n\t\ttransaction: (\n\t\t\ttx: PgEffectTransaction<TQueryResult, TFullSchema, TRelations, TSchema>,\n\t\t) => Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never>,\n\t): Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never> {\n\t\treturn this.session.transaction(transaction);\n\t}\n}\n"],"mappings":"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","names":[]}

package/effect-postgres/session.d.cts

@@ -4,10 +4,10 @@ import type * as V1 from "../_relations.cjs";
 import type { EffectCache } from "../cache/core/cache-effect.cjs";
 import type { WithCacheConfig } from "../cache/core/types.cjs";
 import { entityKind } from "../entity.cjs";
-import { DrizzleQueryError } from "../errors.cjs";
+import { DrizzleQueryError, type TransactionRollbackError } from "../errors.cjs";
 import { type Logger } from "../logger.cjs";
 import type { PgDialect } from "../pg-core/dialect.cjs";
-import { PgEffectPreparedQuery, PgEffectSession } from "../pg-core/effect/session.cjs";
+import { PgEffectPreparedQuery, PgEffectSession, PgEffectTransaction } from "../pg-core/effect/session.cjs";
 import type { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.cjs";
 import type { PgQueryResultHKT, PreparedQueryConfig } from "../pg-core/session.cjs";
 import type { AnyRelations } from "../relations.cjs";
@@ -24,24 +24,29 @@ export declare class EffectPgPreparedQuery<T extends PreparedQueryConfig, TIsRqb
     private _isResponseInArrayMode;
     private customResultMapper?;
     private isRqbV2Query?;
+    private wrap;
     static readonly [entityKind]: string;
     constructor(client: PgClient, queryString: string, params: unknown[], logger: Logger, cache: EffectCache | undefined, 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);
+    } | 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, wrap?: Effect.Adapter);
     execute(placeholderValues?: Record<string, unknown>): Effect.Effect<T['execute'], DrizzleQueryError>;
     private executeRqbV2;
     all(placeholderValues?: Record<string, unknown>): Effect.Effect<T['all'], DrizzleQueryError, never>;
 }
-export declare class EffectPgSession<_TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgEffectSession {
+export declare class EffectPgSession<TQueryResult extends PgQueryResultHKT, TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgEffectSession<TQueryResult, TFullSchema, TRelations, TSchema> {
     private client;
+    protected relations: TRelations;
+    protected schema: V1.RelationalSchemaConfig<TSchema> | undefined;
+    private wrap;
+    private nestedIndex;
     static readonly [entityKind]: string;
     private logger;
     private cache;
     constructor(client: PgClient, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: {
         logger?: Logger;
         cache?: EffectCache;
-    });
+    }, wrap?: Effect.Adapter, nestedIndex?: number);
     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[];
@@ -49,4 +54,9 @@ export declare class EffectPgSession<_TFullSchema extends Record<string, unknown
     prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): EffectPgPreparedQuery<T, true>;
     execute<T>(query: SQL): Effect.Effect<T, DrizzleQueryError>;
     all<T>(query: SQL): Effect.Effect<T, DrizzleQueryError>;
+    transaction<T>(transaction: (tx: EffectPgTransaction<TQueryResult, TFullSchema, TRelations, TSchema>) => Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never>): Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never>;
+}
+export declare class EffectPgTransaction<TQueryResult extends PgQueryResultHKT, TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgEffectTransaction<TQueryResult, TFullSchema, TRelations, TSchema> {
+    static readonly [entityKind]: string;
+    transaction<T>(transaction: (tx: PgEffectTransaction<TQueryResult, TFullSchema, TRelations, TSchema>) => Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never>): Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never>;
 }

package/effect-postgres/session.d.ts

@@ -4,10 +4,10 @@ import type * as V1 from "../_relations.js";
 import type { EffectCache } from "../cache/core/cache-effect.js";
 import type { WithCacheConfig } from "../cache/core/types.js";
 import { entityKind } from "../entity.js";
-import { DrizzleQueryError } from "../errors.js";
+import { DrizzleQueryError, type TransactionRollbackError } from "../errors.js";
 import { type Logger } from "../logger.js";
 import type { PgDialect } from "../pg-core/dialect.js";
-import { PgEffectPreparedQuery, PgEffectSession } from "../pg-core/effect/session.js";
+import { PgEffectPreparedQuery, PgEffectSession, PgEffectTransaction } from "../pg-core/effect/session.js";
 import type { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.js";
 import type { PgQueryResultHKT, PreparedQueryConfig } from "../pg-core/session.js";
 import type { AnyRelations } from "../relations.js";
@@ -24,24 +24,29 @@ export declare class EffectPgPreparedQuery<T extends PreparedQueryConfig, TIsRqb
     private _isResponseInArrayMode;
     private customResultMapper?;
     private isRqbV2Query?;
+    private wrap;
     static readonly [entityKind]: string;
     constructor(client: PgClient, queryString: string, params: unknown[], logger: Logger, cache: EffectCache | undefined, 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);
+    } | 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, wrap?: Effect.Adapter);
     execute(placeholderValues?: Record<string, unknown>): Effect.Effect<T['execute'], DrizzleQueryError>;
     private executeRqbV2;
     all(placeholderValues?: Record<string, unknown>): Effect.Effect<T['all'], DrizzleQueryError, never>;
 }
-export declare class EffectPgSession<_TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgEffectSession {
+export declare class EffectPgSession<TQueryResult extends PgQueryResultHKT, TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgEffectSession<TQueryResult, TFullSchema, TRelations, TSchema> {
     private client;
+    protected relations: TRelations;
+    protected schema: V1.RelationalSchemaConfig<TSchema> | undefined;
+    private wrap;
+    private nestedIndex;
     static readonly [entityKind]: string;
     private logger;
     private cache;
     constructor(client: PgClient, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: {
         logger?: Logger;
         cache?: EffectCache;
-    });
+    }, wrap?: Effect.Adapter, nestedIndex?: number);
     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[];
@@ -49,4 +54,9 @@ export declare class EffectPgSession<_TFullSchema extends Record<string, unknown
     prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): EffectPgPreparedQuery<T, true>;
     execute<T>(query: SQL): Effect.Effect<T, DrizzleQueryError>;
     all<T>(query: SQL): Effect.Effect<T, DrizzleQueryError>;
+    transaction<T>(transaction: (tx: EffectPgTransaction<TQueryResult, TFullSchema, TRelations, TSchema>) => Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never>): Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never>;
+}
+export declare class EffectPgTransaction<TQueryResult extends PgQueryResultHKT, TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgEffectTransaction<TQueryResult, TFullSchema, TRelations, TSchema> {
+    static readonly [entityKind]: string;
+    transaction<T>(transaction: (tx: PgEffectTransaction<TQueryResult, TFullSchema, TRelations, TSchema>) => Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never>): Effect.Effect<T, DrizzleQueryError | TransactionRollbackError, never>;
 }

package/effect-postgres/session.js

@@ -2,11 +2,11 @@ import { Effect } from "effect";
 import { entityKind } from "../entity.js";
 import { DrizzleQueryError } from "../errors.js";
 import { NoopLogger } from "../logger.js";
-import { PgEffectPreparedQuery, PgEffectSession } from "../pg-core/effect/session.js";
-import { fillPlaceholders } from "../sql/sql.js";
+import { PgEffectPreparedQuery, PgEffectSession, PgEffectTransaction } from "../pg-core/effect/session.js";
+import { fillPlaceholders, sql } from "../sql/sql.js";
 import { mapResultRow } from "../utils.js";
 class EffectPgPreparedQuery extends PgEffectPreparedQuery {
-  constructor(client, queryString, params, logger, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
+  constructor(client, queryString, params, logger, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper, isRqbV2Query, wrap = (t) => t) {
     super({ sql: queryString, params }, cache, queryMetadata, cacheConfig);
     this.client = client;
     this.queryString = queryString;
@@ -16,6 +16,7 @@ class EffectPgPreparedQuery extends PgEffectPreparedQuery {
     this._isResponseInArrayMode = _isResponseInArrayMode;
     this.customResultMapper = customResultMapper;
     this.isRqbV2Query = isRqbV2Query;
+    this.wrap = wrap;
   }
   static [entityKind] = "EffectPgPreparedQuery";
   execute(placeholderValues) {
@@ -33,31 +34,35 @@ class EffectPgPreparedQuery extends PgEffectPreparedQuery {
     return this.queryWithCache(
       query.sql,
       params,
-      client.unsafe(query.sql, params).values.pipe(Effect.andThen(
-        (rows) => {
-          if (customResultMapper) return customResultMapper(rows);
-          return rows.map(
-            (row) => mapResultRow(
-              fields,
-              row,
-              joinsNotNullableMap
-            )
-          );
-        }
-      ))
+      this.wrap(
+        client.unsafe(query.sql, params).values.pipe(Effect.andThen(
+          (rows) => {
+            if (customResultMapper) return customResultMapper(rows);
+            return rows.map(
+              (row) => mapResultRow(
+                fields,
+                row,
+                joinsNotNullableMap
+              )
+            );
+          }
+        ))
+      )
     );
   }
   executeRqbV2(placeholderValues) {
     const { query, logger, customResultMapper, client } = this;
     const params = fillPlaceholders(query.params, placeholderValues ?? {});
     logger.logQuery(query.sql, params);
-    return client.unsafe(query.sql, params).withoutTransform.pipe(
-      Effect.andThen(
-        (v) => customResultMapper(v)
-      )
-    ).pipe(Effect.catchAll((e) => {
-      return Effect.fail(new DrizzleQueryError(query.sql, params, e instanceof Error ? e : void 0));
-    }));
+    return this.wrap(
+      client.unsafe(query.sql, params).withoutTransform.pipe(
+        Effect.andThen(
+          (v) => customResultMapper(v)
+        )
+      ).pipe(Effect.catchAll((e) => {
+        return Effect.fail(new DrizzleQueryError(query.sql, params, e instanceof Error ? e : void 0));
+      }))
+    );
   }
   all(placeholderValues) {
     const { query, logger, client } = this;
@@ -66,7 +71,7 @@ class EffectPgPreparedQuery extends PgEffectPreparedQuery {
     return this.queryWithCache(
       query.sql,
       params,
-      client.unsafe(query.sql, params).withoutTransform
+      this.wrap(client.unsafe(query.sql, params).withoutTransform)
     );
   }
   /** @internal */
@@ -75,9 +80,13 @@ class EffectPgPreparedQuery extends PgEffectPreparedQuery {
   }
 }
 class EffectPgSession extends PgEffectSession {
-  constructor(client, dialect, relations, schema, options = {}) {
+  constructor(client, dialect, relations, schema, options = {}, wrap = (t) => t, nestedIndex = 0) {
     super(dialect);
     this.client = client;
+    this.relations = relations;
+    this.schema = schema;
+    this.wrap = wrap;
+    this.nestedIndex = nestedIndex;
     this.logger = options.logger ?? new NoopLogger();
     this.cache = options.cache;
   }
@@ -96,7 +105,9 @@ class EffectPgSession extends PgEffectSession {
       fields,
       name,
       isResponseInArrayMode,
-      customResultMapper
+      customResultMapper,
+      false,
+      this.wrap
     );
   }
   prepareRelationalQuery(query, fields, name, customResultMapper) {
@@ -112,7 +123,8 @@ class EffectPgSession extends PgEffectSession {
       name,
       false,
       customResultMapper,
-      true
+      true,
+      this.wrap
     );
   }
   execute(query) {
@@ -131,9 +143,47 @@ class EffectPgSession extends PgEffectSession {
       false
     ).all();
   }
+  transaction(transaction) {
+    const { dialect, relations, schema, client, logger, cache, nestedIndex } = this;
+    const sp = `sp${this.nestedIndex}`;
+    return this.client.withTransaction(Effect.gen(function* (txAdapter) {
+      const session = new EffectPgSession(
+        client,
+        dialect,
+        relations,
+        schema,
+        { logger, cache },
+        txAdapter,
+        nestedIndex + 1
+      );
+      const tx = new EffectPgTransaction(
+        dialect,
+        session,
+        relations,
+        schema,
+        nestedIndex + 1
+      );
+      if (nestedIndex) yield* tx.execute(sql.raw(`savepoint ${sp}`));
+      const res = yield* transaction(tx).pipe(Effect.catchAll(
+        (e) => Effect.gen(function* () {
+          if (nestedIndex) yield* tx.execute(sql.raw(`rollback to savepoint ${sp}`));
+          return yield* Effect.fail(e);
+        })
+      ));
+      if (nestedIndex) yield* tx.execute(sql.raw(`release savepoint ${sp}`));
+      return res;
+    }));
+  }
+}
+class EffectPgTransaction extends PgEffectTransaction {
+  static [entityKind] = "EffectPgTransaction";
+  transaction(transaction) {
+    return this.session.transaction(transaction);
+  }
 }
 export {
   EffectPgPreparedQuery,
-  EffectPgSession
+  EffectPgSession,
+  EffectPgTransaction
 };
 //# sourceMappingURL=session.js.map