@yielded/auth-persistence-drizzle 0.1.0-beta.14 → 0.1.0-beta.16

package/src/drizzle/passkey-write-drivers.ts

@@ -163,12 +163,15 @@ export const makePasskeyWriteTarget = <
     | RSetup
     | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateTargetPasskeyManagement(
         database,
         options.mapping,
         configuration,
-        (transaction: TransactionOf<Database>, services) => {
+        (
+          transaction: TransactionOf<Database>,
+          services,
+        ): Effect.Effect<A, E, Exclude<R, PasskeyPersistence | PasskeyManagementPersistence>> => {
           const context = Context.make(PasskeyPersistence, services.passkeyPersistence).pipe(
             Context.add(PasskeyManagementPersistence, services.passkeyManagementPersistence),
           );
@@ -179,7 +182,7 @@ export const makePasskeyWriteTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
 
@@ -338,7 +341,7 @@ export const makePasskeyWriteTarget = <
     PasskeyCoordinatorError<E> | DatabaseError,
     Exclude<R, PasskeyPersistence | AuthorityId> | LifecycleHooks | RSetup | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateTargetPasskeyRegistrationWriter(
         database,
         options.mapping,
@@ -357,7 +360,7 @@ export const makePasskeyWriteTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
 

package/src/drizzle/password-prepared-sql.ts

@@ -1,4 +1,5 @@
 import {
+  type NativeDatabase,
   CurrentPasswordPreparedTransaction,
   PasswordPreparedPostconditions,
   PasswordPreparedJournalGuards,
@@ -53,6 +54,7 @@ import {
   type PasswordSqlQuery,
 } from "./password-sql";
 import { checkProofCompletionIn, completeProofPlanIn } from "./proof-sql";
+import { validateDrizzleStorage } from "./storage-validation";
 
 const translateFailure = <A, E, R>(
   effect: Effect.Effect<A, E, R>,
@@ -410,8 +412,18 @@ export const makeSqlPasswordPreparedPersistence = Effect.fn("makeSqlPasswordPrep
   function* (
     mapping: Mapping,
     configuration: PasswordSqlConfiguration,
-  ): Effect.fn.Return<PasswordPreparedPersistence, never, LifecycleHooks | CurrentPasswordSql> {
+  ): Effect.fn.Return<
+    PasswordPreparedPersistence,
+    PasswordUnavailable,
+    LifecycleHooks | CurrentPasswordSql | NativeDatabase
+  > {
     const database = yield* CurrentPasswordSql;
+
+    if (!configuration.coordinated)
+      yield* validateDrizzleStorage({
+        ...mapping,
+        proof: configuration.proof?.mapping,
+      }).pipe(Effect.mapError(unavailable));
     const hooks = yield* LifecycleHooks;
 
     const p = mapping.password,

package/src/drizzle/password-prepared-target.ts

@@ -1,4 +1,5 @@
 import {
+  type NativeDatabase,
   CurrentPasswordPreparedTransaction,
   PasswordPreparedPostconditions,
   PasswordPreparedJournalGuards,
@@ -23,6 +24,7 @@ import {
   type PasswordTargetConfiguration,
   type PasswordCoordinatorError,
 } from "./password-target";
+import { validateDrizzleStorage } from "./storage-validation";
 
 export const makeTargetPasswordPreparedPersistenceServices = (
   mapping: any,
@@ -51,13 +53,17 @@ export const coordinateTargetPasswordPreparedPersistence = <Transaction, A, E, R
     transaction: Transaction,
     services: { readonly passwordPreparedPersistence: PasswordPreparedPersistence },
   ) => Effect.Effect<A, E, R>,
-): Effect.Effect<A, PasswordCoordinatorError<E>, R | LifecycleHooks> =>
+): Effect.Effect<A, PasswordCoordinatorError<E>, R | LifecycleHooks | NativeDatabase> =>
   Effect.gen(function* () {
     const hooks = yield* LifecycleHooks;
 
     if (yield* hasCommitScope) return yield* PasswordUnavailable.make({});
     yield* configuration.coordinatorGuard ?? configuration.standaloneGuard;
 
+    yield* validateDrizzleStorage({ ...mapping, proof: proofMapping }).pipe(
+      Effect.mapError(() => PasswordUnavailable.make({})),
+    );
+
     const result = yield* coordinateCommit(
       () =>
         database.transaction((transaction) =>

package/src/drizzle/password-registration.ts

@@ -1,3 +1,7 @@
+import type {
+  NativeDatabase,
+  PasswordRegistrationAuthority,
+} from "@yielded/auth-persistence/Adapter";
 import {
   coordinateCommit,
   CurrentCommitJournal,
@@ -25,6 +29,7 @@ import {
 } from "./password-model";
 import { CurrentPasswordSql, type PasswordSqlQuery } from "./password-sql";
 import { CurrentProofSql, type ProofSqlDatabase } from "./proof-sql";
+import { validateDrizzleStorage } from "./storage-validation";
 
 type Mapping<Registration> = AnyPasswordRegistrationMapping<Registration>;
 const unavailable = () => PasswordUnavailable.make({});
@@ -40,7 +45,6 @@ const translateFailure = <A, E, R>(
       Schema.is(HookConfigurationError)(error),
   ).pipe(Effect.catchCause((cause) => Effect.failCause(Cause.map(cause, () => unavailable()))));
 
-import type { PasswordRegistrationAuthority } from "@yielded/auth-persistence/Adapter";
 export type { PasswordRegistrationAuthority } from "@yielded/auth-persistence/Adapter";
 
 export interface PasswordRegistrationConfiguration {
@@ -218,10 +222,13 @@ export const makeSqlPasswordRegistrationAuthority = Effect.fn(
   configuration: PasswordRegistrationConfiguration,
 ): Effect.fn.Return<
   PasswordRegistrationAuthority<Registration>,
-  never,
-  LifecycleHooks | CurrentPasswordSql
+  PasswordUnavailable,
+  LifecycleHooks | CurrentPasswordSql | NativeDatabase
 > {
   const database = yield* CurrentPasswordSql;
+
+  if (!configuration.coordinated)
+    yield* validateDrizzleStorage(mapping).pipe(Effect.mapError(unavailable));
   const hooks = yield* LifecycleHooks;
 
   return {

package/src/drizzle/password-target.ts

@@ -1,3 +1,4 @@
+import type { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import {
   coordinateCommit,
   hasCommitScope,
@@ -23,6 +24,7 @@ import {
 } from "./password-sql";
 import type { ProofTargetConfiguration } from "./proof-target";
 import { sqlClientStandaloneGuard, type TransactionService } from "./standalone-guard";
+import { validateDrizzleStorage } from "./storage-validation";
 
 export interface PasswordTargetConfiguration {
   readonly mode: "interactive" | "synchronous";
@@ -133,13 +135,21 @@ export const coordinateTargetPasswordPersistence = <Transaction, A, E, R>(
     transaction: Transaction,
     services: { readonly passwordPersistence: PasswordPersistence["Service"] },
   ) => Effect.Effect<A, E, R>,
-): Effect.Effect<A, PasswordCoordinatorError<E>, R | LifecycleHooks> =>
-  Effect.gen(function* (): Effect.fn.Return<A, PasswordCoordinatorError<E>, R | LifecycleHooks> {
+): Effect.Effect<A, PasswordCoordinatorError<E>, R | LifecycleHooks | NativeDatabase> =>
+  Effect.gen(function* (): Effect.fn.Return<
+    A,
+    PasswordCoordinatorError<E>,
+    R | LifecycleHooks | NativeDatabase
+  > {
     const hooks = yield* LifecycleHooks;
 
     if (yield* hasCommitScope) return yield* PasswordUnavailable.make({});
     yield* configuration.coordinatorGuard ?? configuration.standaloneGuard;
 
+    yield* validateDrizzleStorage({ ...mapping, proof: proofMapping }).pipe(
+      Effect.mapError(() => PasswordUnavailable.make({})),
+    );
+
     const result = yield* coordinateCommit(
       () =>
         database.transaction((transaction) =>
@@ -173,13 +183,21 @@ export const coordinateTargetPasswordRegistration = <Registration, Transaction,
       readonly registrationAuthority: PasswordRegistrationAuthority<Registration>;
     },
   ) => Effect.Effect<A, E, R>,
-): Effect.Effect<A, PasswordCoordinatorError<E>, R | LifecycleHooks> =>
-  Effect.gen(function* (): Effect.fn.Return<A, PasswordCoordinatorError<E>, R | LifecycleHooks> {
+): Effect.Effect<A, PasswordCoordinatorError<E>, R | LifecycleHooks | NativeDatabase> =>
+  Effect.gen(function* (): Effect.fn.Return<
+    A,
+    PasswordCoordinatorError<E>,
+    R | LifecycleHooks | NativeDatabase
+  > {
     const hooks = yield* LifecycleHooks;
 
     if (yield* hasCommitScope) return yield* PasswordUnavailable.make({});
     yield* configuration.coordinatorGuard ?? configuration.standaloneGuard;
 
+    yield* validateDrizzleStorage(mapping).pipe(
+      Effect.mapError(() => PasswordUnavailable.make({})),
+    );
+
     const result = yield* coordinateCommit(
       () =>
         database.transaction((transaction) =>

package/src/drizzle/pg-emails.ts

@@ -1,3 +1,4 @@
+import { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import { EmailAddressPersistence, type EmailUnavailable } from "@yielded/auth/Email";
 import type { LifecycleHooks, HookConfigurationError } from "@yielded/auth/Hooks";
 /* oxlint-disable no-explicit-any -- proof mapping tables are independently typed by the proof owner; this driver forwards them unchanged to the shared target. */
@@ -77,7 +78,10 @@ export const makePgEmailSignInServices = <
   Effect.flatMap(
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) => makeTargetEmailSignInServices(mapping, configuration),
-  ).pipe(Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export const makePgEmailAddressServices = <
   S extends AnyPgTable,
@@ -93,7 +97,10 @@ export const makePgEmailAddressServices = <
   Effect.flatMap(
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) => makeTargetEmailAddressServices(mapping, proofMapping, configuration),
-  ).pipe(Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export function coordinatePgEmailAddress<
   D extends Database,
@@ -179,7 +186,7 @@ export function coordinatePgEmailAddress<
   E | EmailUnavailable | HookConfigurationError | SqlError | DatabaseError,
   Exclude<R, EmailAddressPersistence> | LifecycleHooks | DatabaseRequirements
 > {
-  return Effect.flatMap(acquire, (database) =>
+  return Effect.flatMap(nativeDatabase(acquire), (database) =>
     coordinateTargetEmailAddress<TransactionOf<D>, Out, E, Exclude<R, EmailAddressPersistence>>(
       database,
       options.mapping,
@@ -196,7 +203,7 @@ export function coordinatePgEmailAddress<
           ? work
           : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
       },
-    ),
+    ).pipe(Effect.provideService(NativeDatabase, database)),
   );
 }
 
@@ -216,7 +223,10 @@ export const makePgEmailRegistrationServices = <
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) =>
       makeTargetEmailRegistrationServices<Registration>(mapping, proofMapping, configuration),
-  ).pipe(Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export function coordinatePgEmailRegistration<
   TargetId,
@@ -311,7 +321,7 @@ export function coordinatePgEmailRegistration<
   E | EmailUnavailable | HookConfigurationError | SqlError | DatabaseError,
   Exclude<R, TargetId> | LifecycleHooks | DatabaseRequirements
 > {
-  return Effect.flatMap(acquire, (database) =>
+  return Effect.flatMap(nativeDatabase(acquire), (database) =>
     coordinateTargetEmailRegistration<Registration, TransactionOf<D>, Out, E, Exclude<R, TargetId>>(
       database,
       options.mapping,
@@ -328,6 +338,6 @@ export function coordinatePgEmailRegistration<
           ? work
           : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
       },
-    ),
+    ).pipe(Effect.provideService(NativeDatabase, database)),
   );
 }

package/src/drizzle/pg-identity.ts

@@ -1,3 +1,4 @@
+import { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import {
   ExternalIdentityMutation,
   IdentityConflict,
@@ -24,7 +25,9 @@ import {
   type IdentityTables,
   type SubjectProvisioningTables,
 } from "./model";
+import { nativeDatabase } from "./native-database";
 import { Database as DatabaseService } from "./pg-database";
+import { validateDrizzleStorage } from "./storage-validation";
 
 type RuntimeDatabase = PgDatabase<any>;
 
@@ -48,6 +51,11 @@ export const makePgSubjectProvisioningServices = Effect.fnUntraced(function* <
 >(mapping: SubjectProvisioningTables<Subject, Identifier, Request, NativeId>) {
   const database = yield* DatabaseService;
 
+  yield* validateDrizzleStorage(mapping).pipe(
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+    Effect.mapError(() => IdentityUnavailable.make()),
+  );
+
   const db = database as RuntimeDatabase;
   const requestTable = mapping.provisioningRequest.table;
   const requestIdColumn = column(requestTable, mapping.provisioningRequest.requestId);
@@ -181,6 +189,11 @@ export const makePgExternalIdentityServices = Effect.fnUntraced(function* <
 >(mapping: ExternalIdentityTables<Subject, External, NativeId>) {
   const database = yield* DatabaseService;
 
+  yield* validateDrizzleStorage(mapping).pipe(
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+    Effect.mapError(() => IdentityUnavailable.make()),
+  );
+
   const db = database as RuntimeDatabase;
   const externalTable = mapping.externalIdentity.table;
 

package/src/drizzle/pg-password-prepared.ts

@@ -1,3 +1,4 @@
+import { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import type { LifecycleHooks, HookConfigurationError } from "@yielded/auth/Hooks";
 import type { PasswordUnavailable, PasswordPreparedPersistence } from "@yielded/auth/Password";
 import type { AnyRelations } from "drizzle-orm";
@@ -51,7 +52,10 @@ export const makePgPasswordPreparedPersistenceServices = <
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) =>
       makeTargetPasswordPreparedPersistenceServices(mapping, configuration, proofMapping),
-  ).pipe(Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export function coordinatePgPasswordPreparedPersistence<
   TargetId,
@@ -185,7 +189,7 @@ export function coordinatePgPasswordPreparedPersistence<
   E | PasswordUnavailable | HookConfigurationError | SqlError | DatabaseError,
   Exclude<R, TargetId> | LifecycleHooks | DatabaseRequirements
 > {
-  return Effect.flatMap(acquire, (database) =>
+  return Effect.flatMap(nativeDatabase(acquire), (database) =>
     coordinateTargetPasswordPreparedPersistence<TransactionOf<D>, Out, E, Exclude<R, TargetId>>(
       database,
       options.mapping,
@@ -202,6 +206,6 @@ export function coordinatePgPasswordPreparedPersistence<
           ? work
           : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
       },
-    ),
+    ).pipe(Effect.provideService(NativeDatabase, database)),
   );
 }

package/src/drizzle/pg-passwords.ts

@@ -1,3 +1,4 @@
+import { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import type { LifecycleHooks, HookConfigurationError } from "@yielded/auth/Hooks";
 import { type PasswordUnavailable, PasswordPersistence } from "@yielded/auth/Password";
 /* oxlint-disable no-explicit-any -- proof mapping tables are independently typed by the proof owner; this driver forwards them unchanged to the shared target. */
@@ -90,7 +91,10 @@ export const makePgPasswordPersistenceServices = <
   Effect.flatMap(
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) => makeTargetPasswordPersistenceServices(mapping, configuration, proofMapping),
-  ).pipe(Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export function coordinatePgPasswordPersistence<
   D extends Database,
@@ -194,7 +198,7 @@ export function coordinatePgPasswordPersistence<
   E | PasswordUnavailable | HookConfigurationError | SqlError | DatabaseError,
   Exclude<R, PasswordPersistence> | LifecycleHooks | DatabaseRequirements
 > {
-  return Effect.flatMap(acquire, (database) =>
+  return Effect.flatMap(nativeDatabase(acquire), (database) =>
     coordinateTargetPasswordPersistence<TransactionOf<D>, Out, E, Exclude<R, PasswordPersistence>>(
       database,
       options.mapping,
@@ -211,7 +215,7 @@ export function coordinatePgPasswordPersistence<
           ? work
           : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
       },
-    ),
+    ).pipe(Effect.provideService(NativeDatabase, database)),
   );
 }
 
@@ -229,7 +233,10 @@ export const makePgPasswordRegistrationServices = <
   Effect.flatMap(
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) => makeTargetPasswordRegistrationServices<Registration>(mapping, configuration),
-  ).pipe(Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export function coordinatePgPasswordRegistration<
   TargetId,
@@ -321,7 +328,7 @@ export function coordinatePgPasswordRegistration<
   E | PasswordUnavailable | HookConfigurationError | SqlError | DatabaseError,
   Exclude<R, TargetId> | LifecycleHooks | DatabaseRequirements
 > {
-  return Effect.flatMap(acquire, (database) =>
+  return Effect.flatMap(nativeDatabase(acquire), (database) =>
     coordinateTargetPasswordRegistration<
       Registration,
       TransactionOf<D>,
@@ -343,7 +350,7 @@ export function coordinatePgPasswordRegistration<
           ? work
           : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
       },
-    ),
+    ).pipe(Effect.provideService(NativeDatabase, database)),
   );
 }
 

package/src/drizzle/pg-proofs.ts

@@ -1,3 +1,4 @@
+import { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import type { LifecycleHooks, HookConfigurationError } from "@yielded/auth/Hooks";
 import { type ProofUnavailable, ProofPersistence } from "@yielded/auth/Proofs";
 import type { AnyRelations } from "drizzle-orm";
@@ -80,7 +81,10 @@ export const makePgProofPersistenceServices = <
   Effect.flatMap(
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) => makeTargetProofPersistenceServices(mapping, configuration),
-  ).pipe(Effect.provideServiceEffect(CurrentProofSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentProofSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export function coordinatePgProofPersistence<
   D extends Database,
@@ -181,7 +185,7 @@ export function coordinatePgProofPersistence<
   E | ProofUnavailable | HookConfigurationError | SqlError | DatabaseError,
   Exclude<R, ProofPersistence> | LifecycleHooks | DatabaseRequirements
 > {
-  return Effect.flatMap(acquire, (database) =>
+  return Effect.flatMap(nativeDatabase(acquire), (database) =>
     coordinateTargetProofPersistence<TransactionOf<D>, A, E, Exclude<R, ProofPersistence>>(
       database,
       options.mapping,
@@ -197,6 +201,6 @@ export function coordinatePgProofPersistence<
           ? work
           : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
       },
-    ),
+    ).pipe(Effect.provideService(NativeDatabase, database)),
   );
 }

package/src/drizzle/pg-sessions.ts

@@ -1,3 +1,4 @@
+import { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import type { LifecycleHooks, HookConfigurationError } from "@yielded/auth/Hooks";
 import {
   AuthenticationAuthority,
@@ -73,7 +74,10 @@ export const makePgAuthenticationAuthorityServices = <
   Effect.flatMap(
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) => makeTargetAuthenticationAuthorityServices<Claims>(mapping, configuration),
-  ).pipe(Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export const makePgPendingAuthenticationServices = <
   Claims,
@@ -95,7 +99,10 @@ export const makePgPendingAuthenticationServices = <
   Effect.flatMap(
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) => makeTargetPendingAuthenticationServices<Claims>(mapping, configuration),
-  ).pipe(Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export const makePgStatefulSessionServices = <
   Claims,
@@ -121,7 +128,10 @@ export const makePgStatefulSessionServices = <
   Effect.flatMap(
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) => makeTargetStatefulSessionServices<Claims>(mapping, configuration),
-  ).pipe(Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export const makePgSignedSessionValidityServices = <
   Subject extends AnyPgTable,
@@ -134,7 +144,10 @@ export const makePgSignedSessionValidityServices = <
   Effect.flatMap(
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) => makeTargetSignedSessionValidityServices(mapping, configuration),
-  ).pipe(Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export function coordinatePgAuthenticationAuthority<
   Claims,
@@ -217,7 +230,7 @@ export function coordinatePgAuthenticationAuthority<
   E | SessionUnavailable | HookConfigurationError | SqlError | DatabaseError,
   Exclude<R, AuthenticationAuthority> | LifecycleHooks | DatabaseRequirements
 > {
-  return Effect.flatMap(acquire, (database) =>
+  return Effect.flatMap(nativeDatabase(acquire), (database) =>
     coordinateTargetAuthenticationAuthority<
       Claims,
       TransactionOf<D>,
@@ -239,7 +252,7 @@ export function coordinatePgAuthenticationAuthority<
           ? work
           : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
       },
-    ),
+    ).pipe(Effect.provideService(NativeDatabase, database)),
   );
 }
 
@@ -330,7 +343,7 @@ export function coordinatePgPendingAuthentication<
   E | SessionUnavailable | HookConfigurationError | SqlError | DatabaseError,
   Exclude<R, TargetId> | LifecycleHooks | DatabaseRequirements
 > {
-  return Effect.flatMap(acquire, (database) =>
+  return Effect.flatMap(nativeDatabase(acquire), (database) =>
     coordinateTargetPendingAuthentication<Claims, TransactionOf<D>, A, E, Exclude<R, TargetId>>(
       database,
       options.mapping,
@@ -346,7 +359,7 @@ export function coordinatePgPendingAuthentication<
           ? work
           : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
       },
-    ),
+    ).pipe(Effect.provideService(NativeDatabase, database)),
   );
 }
 
@@ -476,7 +489,7 @@ export function coordinatePgStatefulSessions<
   E | SessionUnavailable | HookConfigurationError | SqlError | DatabaseError,
   Exclude<R, PersistenceId | RepositoryId> | LifecycleHooks | DatabaseRequirements
 > {
-  return Effect.flatMap(acquire, (database) =>
+  return Effect.flatMap(nativeDatabase(acquire), (database) =>
     coordinateTargetStatefulSessions<
       Claims,
       TransactionOf<D>,
@@ -505,7 +518,7 @@ export function coordinatePgStatefulSessions<
           ? work
           : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
       },
-    ),
+    ).pipe(Effect.provideService(NativeDatabase, database)),
   );
 }
 
@@ -590,7 +603,7 @@ export function coordinatePgSignedSessionValidity<
   E | SessionUnavailable | HookConfigurationError | SqlError | DatabaseError,
   Exclude<R, TargetId> | LifecycleHooks | DatabaseRequirements
 > {
-  return Effect.flatMap(acquire, (database) =>
+  return Effect.flatMap(nativeDatabase(acquire), (database) =>
     coordinateTargetSignedSessionValidity<TransactionOf<D>, A, E, Exclude<R, TargetId>>(
       database,
       options.mapping,
@@ -606,7 +619,7 @@ export function coordinatePgSignedSessionValidity<
           ? work
           : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
       },
-    ),
+    ).pipe(Effect.provideService(NativeDatabase, database)),
   );
 }
 
@@ -629,7 +642,10 @@ export const makePgSessionStepUpServices = <
   Effect.flatMap(
     Effect.map(acquireTransactionService(DatabaseService), configuration),
     (configuration) => makeTargetSessionStepUpServices(mapping, target, configuration),
-  ).pipe(Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(DatabaseService)));
+  ).pipe(
+    Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(DatabaseService)),
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(DatabaseService)),
+  );
 
 export function coordinatePgSessionStepUp<
   Claims,
@@ -751,7 +767,7 @@ export function coordinatePgSessionStepUp<
   E | SessionUnavailable | HookConfigurationError | SqlError | DatabaseError,
   Exclude<R, Id> | LifecycleHooks | DatabaseRequirements
 > {
-  return Effect.flatMap(acquire, (database) =>
+  return Effect.flatMap(nativeDatabase(acquire), (database) =>
     coordinateTargetSessionStepUp<Claims, Id, TransactionOf<D>, A, E, Exclude<R, Id>>(
       database,
       options.mapping,
@@ -768,6 +784,6 @@ export function coordinatePgSessionStepUp<
           ? work
           : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
       },
-    ),
+    ).pipe(Effect.provideService(NativeDatabase, database)),
   );
 }