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

package/src/drizzle/phone-target.ts

@@ -28,6 +28,7 @@ import {
   type PhoneMapping,
   type PhoneMappingSource,
   type PhonePersistenceServices,
+  type PhoneProofCompletionMapping,
   requiredPhoneConstraints,
 } from "./phone-model";
 import {
@@ -43,6 +44,7 @@ import {
 } from "./phone-state";
 import { requiredProofConstraints } from "./proof-model";
 import { completeProofPlanIn, CurrentProofSql } from "./proof-sql";
+import { validateDrizzleStorage } from "./storage-validation";
 import type { SuppliedService } from "./SuppliedService";
 import {
   coordinateTransactionOwner,
@@ -277,6 +279,11 @@ export const makeTargetPhonePersistence = <
       catch: () => PhoneConfigurationError.make({}),
     });
 
+    yield* validateDrizzleStorage({
+      ...mapping,
+      proofs: phoneProofs(mapping.proofs),
+    }).pipe(Effect.mapError(() => PhoneConfigurationError.make({})));
+
     const execution = yield* makeTransactionExecution(
       CurrentPhoneTransaction,
       configuration,
@@ -287,7 +294,13 @@ export const makeTargetPhonePersistence = <
     return yield* services(mapping, execution, configuration);
   });
 
-export const coordinateTargetPhone = <M, A, E, R, RSetup = never>(
+export const coordinateTargetPhone = <
+  M extends { readonly proofs: PhoneProofCompletionMapping },
+  A,
+  E,
+  R,
+  RSetup = never,
+>(
   database: TransactionNativeDatabase,
   source: PhoneMappingSource<M, RSetup>,
   configuration: PhoneTargetConfiguration,
@@ -296,7 +309,7 @@ export const coordinateTargetPhone = <M, A, E, R, RSetup = never>(
     services: PhonePersistenceServices,
     append: (statement: Statement<any>) => void,
   ) => Effect.Effect<A, E, R>,
-): Effect.Effect<A, PhoneCoordinatorError<E>, R | RSetup | LifecycleHooks> =>
+): Effect.Effect<A, PhoneCoordinatorError<E>, R | RSetup | LifecycleHooks | NativeDatabase> =>
   Effect.gen(function* () {
     const original = yield* Effect.isEffect(source) ? source : Effect.succeed(source);
 
@@ -305,6 +318,11 @@ export const coordinateTargetPhone = <M, A, E, R, RSetup = never>(
       catch: () => PhoneConfigurationError.make({}),
     });
 
+    yield* validateDrizzleStorage({
+      ...mapping,
+      proofs: phoneProofs(mapping.proofs),
+    }).pipe(Effect.mapError(() => PhoneConfigurationError.make({})));
+
     return yield* coordinateTransactionOwner(
       database,
       CurrentPhoneTransaction,
@@ -437,12 +455,19 @@ export const makePhoneTarget = <
     | RSetup
     | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateTargetPhone(
         database as any,
         options.mapping,
         configuration,
-        (transaction: TransactionOf<Database>, services) => {
+        (
+          transaction: TransactionOf<Database>,
+          services,
+        ): Effect.Effect<
+          A,
+          E,
+          Exclude<R, PhonePersistence | PhoneAdmission | PhoneSignInTargets>
+        > => {
           const provided = Context.make(PhonePersistence, services.phonePersistence).pipe(
             Context.add(PhoneAdmission, services.phoneAdmission),
             Context.add(PhoneSignInTargets, services.phoneSignInTargets),
@@ -454,7 +479,7 @@ export const makePhoneTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
 

package/src/drizzle/proof-target.ts

@@ -1,3 +1,4 @@
+import type { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import {
   coordinateCommit,
   hasCommitScope,
@@ -17,6 +18,7 @@ import {
   type ProofSqlQuery,
 } from "./proof-sql";
 import { sqlClientStandaloneGuard, type TransactionService } from "./standalone-guard";
+import { validateDrizzleStorage } from "./storage-validation";
 
 export interface ProofTargetConfiguration {
   readonly mode: "interactive" | "synchronous";
@@ -83,13 +85,19 @@ export const coordinateTargetProofPersistence = <Transaction, A, E, R>(
     transaction: Transaction,
     services: { readonly proofPersistence: ProofPersistence["Service"] },
   ) => Effect.Effect<A, E, R>,
-): Effect.Effect<A, ProofCoordinatorError<E>, R | LifecycleHooks> =>
-  Effect.gen(function* (): Effect.fn.Return<A, ProofCoordinatorError<E>, R | LifecycleHooks> {
+): Effect.Effect<A, ProofCoordinatorError<E>, R | LifecycleHooks | NativeDatabase> =>
+  Effect.gen(function* (): Effect.fn.Return<
+    A,
+    ProofCoordinatorError<E>,
+    R | LifecycleHooks | NativeDatabase
+  > {
     const hooks = yield* LifecycleHooks;
 
     if (yield* hasCommitScope) return yield* ProofUnavailable.make({});
     yield* configuration.coordinatorGuard ?? configuration.standaloneGuard;
 
+    yield* validateDrizzleStorage(mapping).pipe(Effect.mapError(() => ProofUnavailable.make({})));
+
     const result = yield* coordinateCommit(
       () =>
         database.transaction((transaction) =>

package/src/drizzle/query-operations.ts

@@ -18,8 +18,10 @@ import {
 
 import { balancedD1And, compactD1GeneratedStatement } from "./d1-generated-statement";
 import { column, updateValues } from "./model";
+import { validateDrizzleStorage } from "./storage-validation";
 
 const operations = {
+  validateStorage: validateDrizzleStorage,
   and,
   asc,
   or,

package/src/drizzle/session-target.ts

@@ -1,3 +1,4 @@
+import type { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import {
   coordinateCommit,
   hasCommitScope,
@@ -28,6 +29,7 @@ import {
   type SessionSqlOptions,
 } from "./session-sql";
 import { sqlClientStandaloneGuard, type TransactionService } from "./standalone-guard";
+import { validateDrizzleStorage } from "./storage-validation";
 
 export interface SessionTargetConfiguration {
   readonly mode: "interactive" | "synchronous";
@@ -53,6 +55,7 @@ const options = (
   configuration: SessionTargetConfiguration,
   transactionBound = false,
 ): SessionSqlOptions => ({
+  coordinated: transactionBound,
   mode: configuration.mode,
   locking: configuration.locking,
   standaloneGuard: transactionBound ? Effect.void : configuration.standaloneGuard,
@@ -101,13 +104,22 @@ export const makeTargetSignedSessionValidityServices = (
 const coordinate = <Transaction, Services, A, E, R>(
   database: TransactionOwner<Transaction>,
   configuration: SessionTargetConfiguration,
-  make: (transaction: Transaction) => Effect.Effect<Services, never, LifecycleHooks>,
+  mapping: object,
+  make: (
+    transaction: Transaction,
+  ) => Effect.Effect<Services, SessionUnavailable, LifecycleHooks | NativeDatabase>,
   owner: (transaction: Transaction, services: Services) => Effect.Effect<A, E, R>,
-): Effect.Effect<A, CoordinatorError<E>, R | LifecycleHooks> =>
-  Effect.gen(function* (): Effect.fn.Return<A, CoordinatorError<E>, R | LifecycleHooks> {
+): Effect.Effect<A, CoordinatorError<E>, R | LifecycleHooks | NativeDatabase> =>
+  Effect.gen(function* (): Effect.fn.Return<
+    A,
+    CoordinatorError<E>,
+    R | LifecycleHooks | NativeDatabase
+  > {
     if (yield* hasCommitScope) return yield* SessionUnavailable.make({});
     yield* configuration.coordinatorGuard ?? configuration.standaloneGuard;
 
+    yield* validateDrizzleStorage(mapping).pipe(Effect.mapError(() => SessionUnavailable.make({})));
+
     const result = yield* coordinateCommit(
       () =>
         database.transaction((transaction) =>
@@ -137,6 +149,7 @@ export const coordinateTargetAuthenticationAuthority = <Claims, Transaction, A,
   coordinate(
     database,
     configuration,
+    mapping,
     (transaction) =>
       Effect.map(
         makeSqlAuthenticationAuthority<Claims>(mapping, options(configuration, true)).pipe(
@@ -159,6 +172,7 @@ export const coordinateTargetPendingAuthentication = <Claims, Transaction, A, E,
   coordinate(
     database,
     configuration,
+    mapping,
     (transaction) =>
       Effect.map(
         makeSqlPendingAuthentication<Claims>(mapping, options(configuration, true)).pipe(
@@ -184,6 +198,7 @@ export const coordinateTargetStatefulSessions = <Claims, Transaction, A, E, R>(
   coordinate(
     database,
     configuration,
+    mapping,
     (transaction) =>
       makeSqlStatefulSessions<Claims>(mapping, options(configuration, true)).pipe(
         Effect.provideService(CurrentSessionSql, transaction as unknown as SessionSqlDatabase),
@@ -203,6 +218,7 @@ export const coordinateTargetSignedSessionValidity = <Transaction, A, E, R>(
   coordinate(
     database,
     configuration,
+    mapping,
     (transaction) =>
       Effect.map(
         makeSqlSignedValidity(mapping, options(configuration, true)).pipe(
@@ -307,6 +323,7 @@ export const coordinateTargetSessionStepUp = <Claims, Id, Transaction, A, E, R>(
   coordinate(
     database,
     configuration,
+    mapping,
     (transaction) =>
       Effect.map(
         makeSqlSessionStepUp<Claims>(mapping, options(configuration, true)).pipe(

package/src/drizzle/sqlite-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. */
@@ -189,7 +190,7 @@ export const makeSqliteEmailTarget = <
     E | EmailUnavailable | HookConfigurationError | SqlError | DatabaseError,
     Exclude<R, EmailAddressPersistence> | LifecycleHooks | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateTargetEmailAddress<
         TransactionOf<Database>,
         Out,
@@ -211,7 +212,7 @@ export const makeSqliteEmailTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
   function coordinateEmailRegistration<
@@ -309,7 +310,7 @@ export const makeSqliteEmailTarget = <
     E | EmailUnavailable | HookConfigurationError | SqlError | DatabaseError,
     Exclude<R, TargetId> | LifecycleHooks | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateTargetEmailRegistration<
         Registration,
         TransactionOf<Database>,
@@ -332,7 +333,7 @@ export const makeSqliteEmailTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
 
@@ -347,7 +348,10 @@ export const makeSqliteEmailTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeTargetEmailSignInServices(mapping, configuration),
-      ).pipe(Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     makeEmailAddressServices: <
       S extends AnySQLiteTable,
       I extends AnySQLiteTable,
@@ -361,7 +365,10 @@ export const makeSqliteEmailTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeTargetEmailAddressServices(mapping, proofMapping, configuration),
-      ).pipe(Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     coordinateEmailAddress,
     makeEmailRegistrationServices: <
       Registration,
@@ -377,7 +384,10 @@ export const makeSqliteEmailTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeTargetEmailRegistrationServices<Registration>(mapping, proofMapping, configuration),
-      ).pipe(Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     coordinateEmailRegistration,
   };
 };

package/src/drizzle/sqlite-identity.ts

@@ -26,6 +26,7 @@ import {
   type IdentityTables,
   type SubjectProvisioningTables,
 } from "./model";
+import { validateDrizzleStorage } from "./storage-validation";
 
 type ClosedQueryEffectHKT = QueryEffectHKTBase & { readonly context: never };
 type RuntimeDatabase = SQLiteEffectDatabase<ClosedQueryEffectHKT, unknown, any>;
@@ -52,6 +53,8 @@ export const makeSqliteSubjectProvisioningServices = Effect.fnUntraced(function*
 ) {
   const database = yield* NativeDatabase;
 
+  yield* validateDrizzleStorage(mapping).pipe(Effect.mapError(() => IdentityUnavailable.make()));
+
   const db = database as unknown as RuntimeDatabase;
   const requestTable = mapping.provisioningRequest.table;
 
@@ -200,6 +203,8 @@ export const makeSqliteExternalIdentityServices = Effect.fnUntraced(function* <
 >(mapping: ExternalIdentityTables<Subject, External, NativeId>) {
   const database = yield* NativeDatabase;
 
+  yield* validateDrizzleStorage(mapping).pipe(Effect.mapError(() => IdentityUnavailable.make()));
+
   const db = database as unknown as RuntimeDatabase;
   const externalTable = mapping.externalIdentity.table;
 

package/src/drizzle/sqlite-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 { AnySQLiteTable } from "drizzle-orm/sqlite-core";
@@ -216,7 +217,7 @@ export const makeSqlitePasswordPreparedTarget = <
     E | PasswordUnavailable | HookConfigurationError | SqlError | DatabaseError,
     Exclude<R, TargetId> | LifecycleHooks | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateTargetPasswordPreparedPersistence<
         TransactionOf<Database>,
         Out,
@@ -238,7 +239,7 @@ export const makeSqlitePasswordPreparedTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
 
@@ -268,7 +269,10 @@ export const makeSqlitePasswordPreparedTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeTargetPasswordPreparedPersistenceServices(mapping, configuration, proofMapping),
-      ).pipe(Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     coordinatePasswordPreparedPersistence,
   };
 };

package/src/drizzle/sqlite-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. */
@@ -304,7 +305,7 @@ export const makeSqlitePasswordTarget = <
     E | PasswordUnavailable | HookConfigurationError | SqlError | DatabaseError,
     Exclude<R, PasswordPersistence> | LifecycleHooks | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateSqlitePasswordPersistence(
         database,
         options.mapping,
@@ -321,7 +322,7 @@ export const makeSqlitePasswordTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
   function coordinatePasswordRegistration<
@@ -440,7 +441,7 @@ export const makeSqlitePasswordTarget = <
     E | PasswordUnavailable | HookConfigurationError | SqlError | DatabaseError,
     Exclude<R, TargetId> | LifecycleHooks | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateSqlitePasswordRegistration(
         database,
         options.mapping,
@@ -456,7 +457,7 @@ export const makeSqlitePasswordTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
 
@@ -490,7 +491,10 @@ export const makeSqlitePasswordTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeSqlitePasswordPersistenceServices(mapping, configuration, proofMapping),
-      ).pipe(Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     coordinatePasswordPersistence,
     makePasswordRegistrationServices: <
       Registration,
@@ -505,7 +509,10 @@ export const makeSqlitePasswordTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeSqlitePasswordRegistrationServices(mapping, configuration),
-      ).pipe(Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     coordinatePasswordRegistration,
   };
 };

package/src/drizzle/sqlite-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";
@@ -180,7 +181,7 @@ export const makeSqliteProofTarget = <
     E | ProofUnavailable | HookConfigurationError | SqlError | DatabaseError,
     Exclude<R, ProofPersistence> | LifecycleHooks | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateTargetProofPersistence<TransactionOf<Database>, A, E, Exclude<R, ProofPersistence>>(
         database,
         options.mapping,
@@ -196,7 +197,7 @@ export const makeSqliteProofTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
 
@@ -219,7 +220,10 @@ export const makeSqliteProofTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeTargetProofPersistenceServices(mapping, configuration),
-      ).pipe(Effect.provideServiceEffect(CurrentProofSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentProofSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     coordinateProofPersistence,
   };
 };

package/src/drizzle/sqlite-sessions.ts

@@ -1,3 +1,4 @@
+import { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import type { LifecycleHooks, HookConfigurationError } from "@yielded/auth/Hooks";
 import {
   AuthenticationAuthority,
@@ -364,7 +365,7 @@ export const makeSqliteSessionTarget = <
     E | SessionUnavailable | HookConfigurationError | SqlError | DatabaseError,
     Exclude<R, Id> | LifecycleHooks | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateSqliteSessionStepUp(
         database,
         options.mapping,
@@ -381,7 +382,7 @@ export const makeSqliteSessionTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
   function coordinateAuthenticationAuthority<
@@ -471,7 +472,7 @@ export const makeSqliteSessionTarget = <
     E | SessionUnavailable | HookConfigurationError | SqlError | DatabaseError,
     Exclude<R, AuthenticationAuthority> | LifecycleHooks | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateSqliteAuthenticationAuthority(
         database,
         options.mapping,
@@ -487,7 +488,7 @@ export const makeSqliteSessionTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
   function coordinatePendingAuthentication<
@@ -579,7 +580,7 @@ export const makeSqliteSessionTarget = <
     E | SessionUnavailable | HookConfigurationError | SqlError | DatabaseError,
     Exclude<R, TargetId> | LifecycleHooks | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateSqlitePendingAuthentication(
         database,
         options.mapping,
@@ -595,7 +596,7 @@ export const makeSqliteSessionTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
   function coordinateStatefulSessions<
@@ -730,7 +731,7 @@ export const makeSqliteSessionTarget = <
     E | SessionUnavailable | HookConfigurationError | SqlError | DatabaseError,
     Exclude<R, PersistenceId | RepositoryId> | LifecycleHooks | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateSqliteStatefulSessions(
         database,
         options.mapping,
@@ -753,7 +754,7 @@ export const makeSqliteSessionTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
   function coordinateSignedSessionValidity<
@@ -839,7 +840,7 @@ export const makeSqliteSessionTarget = <
     E | SessionUnavailable | HookConfigurationError | SqlError | DatabaseError,
     Exclude<R, TargetId> | LifecycleHooks | DatabaseRequirements
   > {
-    return Effect.flatMap(acquire, (database) =>
+    return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateSqliteSignedSessionValidity(
         database,
         options.mapping,
@@ -855,7 +856,7 @@ export const makeSqliteSessionTarget = <
             ? work
             : Effect.provideService(work, options.transaction, options.transaction.of(transaction));
         },
-      ),
+      ).pipe(Effect.provideService(NativeDatabase, database)),
     );
   }
 
@@ -885,7 +886,10 @@ export const makeSqliteSessionTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeSqliteSessionStepUpServices(mapping, target, configuration),
-      ).pipe(Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     coordinateSessionStepUp,
     makeAuthenticationAuthorityServices: <
       Claims,
@@ -899,7 +903,10 @@ export const makeSqliteSessionTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeSqliteAuthenticationAuthorityServices(mapping, configuration),
-      ).pipe(Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     makePendingAuthenticationServices: <
       Claims,
       S extends AnySQLiteTable,
@@ -912,7 +919,10 @@ export const makeSqliteSessionTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeSqlitePendingAuthenticationServices(mapping, configuration),
-      ).pipe(Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     makeStatefulSessionServices: <
       Claims,
       S extends AnySQLiteTable,
@@ -927,7 +937,10 @@ export const makeSqliteSessionTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeSqliteStatefulSessionServices(mapping, configuration),
-      ).pipe(Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     makeSignedSessionValidityServices: <
       S extends AnySQLiteTable,
       T extends AnySQLiteTable,
@@ -938,7 +951,10 @@ export const makeSqliteSessionTarget = <
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>
         makeSqliteSignedSessionValidityServices(mapping, configuration),
-      ).pipe(Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(databaseService))),
+      ).pipe(
+        Effect.provideServiceEffect(CurrentSessionSql, nativeDatabase(databaseService)),
+        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
+      ),
     coordinateAuthenticationAuthority,
     coordinatePendingAuthentication,
     coordinateStatefulSessions,