@elizaos/plugin-sql 1.6.5-alpha.21 → 1.6.5-alpha.23

package/dist/node/index.node.js

@@ -634,7 +634,7 @@ var init_subquery = __esm(() => {
 });
 
 // ../../node_modules/drizzle-orm/version.js
-var version = "0.44.7";
+var version = "0.45.0";
 var init_version = () => {};
 
 // ../../node_modules/drizzle-orm/tracing.js
@@ -1261,6 +1261,8 @@ function mapResultRow(columns, row, joinsNotNullableMap) {
       decoder = field;
     } else if (is(field, SQL)) {
       decoder = field.decoder;
+    } else if (is(field, Subquery)) {
+      decoder = field._.sql.decoder;
     } else {
       decoder = field.sql.decoder;
     }
@@ -1301,7 +1303,7 @@ function orderSelectedFields(fields, pathPrefix) {
       return result;
     }
     const newPath = pathPrefix ? [...pathPrefix, name] : [name];
-    if (is(field, Column) || is(field, SQL) || is(field, SQL.Aliased)) {
+    if (is(field, Column) || is(field, SQL) || is(field, SQL.Aliased) || is(field, Subquery)) {
       result.push({ path: newPath, field });
     } else if (is(field, Table)) {
       result.push(...orderSelectedFields(field[Table.Symbol.Columns], newPath));
@@ -1739,7 +1741,9 @@ var init_date = __esm(() => {
       return "date";
     }
     mapFromDriverValue(value) {
-      return new Date(value);
+      if (typeof value === "string")
+        return new Date(value);
+      return value;
     }
     mapToDriverValue(value) {
       return value.toISOString();
@@ -1759,6 +1763,11 @@ var init_date = __esm(() => {
     getSQLType() {
       return "date";
     }
+    mapFromDriverValue(value) {
+      if (typeof value === "string")
+        return value;
+      return value.toISOString().slice(0, -14);
+    }
   };
 });
 
@@ -2581,9 +2590,11 @@ var init_timestamp = __esm(() => {
       const precision = this.precision === undefined ? "" : ` (${this.precision})`;
       return `timestamp${precision}${this.withTimezone ? " with time zone" : ""}`;
     }
-    mapFromDriverValue = (value) => {
-      return new Date(this.withTimezone ? value : value + "+0000");
-    };
+    mapFromDriverValue(value) {
+      if (typeof value === "string")
+        return new Date(this.withTimezone ? value : value + "+0000");
+      return value;
+    }
     mapToDriverValue = (value) => {
       return value.toISOString();
     };
@@ -2612,6 +2623,17 @@ var init_timestamp = __esm(() => {
       const precision = this.precision === undefined ? "" : `(${this.precision})`;
       return `timestamp${precision}${this.withTimezone ? " with time zone" : ""}`;
     }
+    mapFromDriverValue(value) {
+      if (typeof value === "string")
+        return value;
+      const shortened = value.toISOString().slice(0, -1).replace("T", " ");
+      if (this.withTimezone) {
+        const offset = value.getTimezoneOffset();
+        const sign = offset <= 0 ? "+" : "-";
+        return `${shortened}${sign}${Math.floor(Math.abs(offset) / 60).toString().padStart(2, "0")}`;
+      }
+      return shortened;
+    }
   };
 });
 
@@ -3727,7 +3749,8 @@ var init_dialect = __esm(() => {
       const setSize = columnNames.length;
       return sql.join(columnNames.flatMap((colName, i) => {
         const col = tableColumns[colName];
-        const value = set[colName] ?? sql.param(col.onUpdateFn(), col);
+        const onUpdateFnResult = col.onUpdateFn?.();
+        const value = set[colName] ?? (is(onUpdateFnResult, SQL) ? onUpdateFnResult : sql.param(onUpdateFnResult, col));
         const res = sql`${sql.identifier(this.casing.getColumnCasing(col))} = ${value}`;
         if (i < setSize - 1) {
           return [res, sql.raw(", ")];
@@ -3776,6 +3799,16 @@ var init_dialect = __esm(() => {
           } else {
             chunk.push(field);
           }
+        } else if (is(field, Subquery)) {
+          const entries = Object.entries(field._.selectedFields);
+          if (entries.length === 1) {
+            const entry = entries[0][1];
+            const fieldDecoder = is(entry, SQL) ? entry.decoder : is(entry, Column) ? { mapFromDriverValue: (v) => entry.mapFromDriverValue(v) } : entry.sql.decoder;
+            if (fieldDecoder) {
+              field._.sql.decoder = fieldDecoder;
+            }
+          }
+          chunk.push(field);
         }
         if (i < columnsLen - 1) {
           chunk.push(sql`, `);
@@ -7429,7 +7462,12 @@ class RuntimeMigrator {
         logger6.warn({ src: "plugin:sql", pluginName, tableName: tableData.name, expectedSchema }, "Plugin table is using public schema - consider using pgSchema for better isolation");
       }
       if (isCorePLugin && actualSchema !== "public") {
-        logger6.warn({ src: "plugin:sql", pluginName: "@elizaos/plugin-sql", tableName: tableData.name, actualSchema }, "Core plugin table should use public schema");
+        logger6.warn({
+          src: "plugin:sql",
+          pluginName: "@elizaos/plugin-sql",
+          tableName: tableData.name,
+          actualSchema
+        }, "Core plugin table should use public schema");
       }
     }
   }
@@ -7674,13 +7712,21 @@ class RuntimeMigrator {
             logger6.debug({ src: "plugin:sql", pluginName, lockId: lockIdStr }, "Advisory lock acquired");
           }
         } catch (lockError) {
-          logger6.warn({ src: "plugin:sql", pluginName, error: lockError instanceof Error ? lockError.message : String(lockError) }, "Failed to acquire advisory lock, continuing without lock");
+          logger6.warn({
+            src: "plugin:sql",
+            pluginName,
+            error: lockError instanceof Error ? lockError.message : String(lockError)
+          }, "Failed to acquire advisory lock, continuing without lock");
           lockAcquired = false;
         }
       } else {
         logger6.debug({ src: "plugin:sql" }, "Development database detected, skipping advisory locks");
       }
-      await this.extensionManager.installRequiredExtensions(["vector", "fuzzystrmatch", "pgcrypto"]);
+      await this.extensionManager.installRequiredExtensions([
+        "vector",
+        "fuzzystrmatch",
+        "pgcrypto"
+      ]);
       const currentSnapshot = await generateSnapshot(schema2);
       await this.ensureSchemasExist(currentSnapshot);
       this.validateSchemaUsage(pluginName, currentSnapshot);
@@ -7729,7 +7775,12 @@ class RuntimeMigrator {
         const isProduction = false;
         const allowDestructive = options.force || options.allowDataLoss || process.env.ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS === "true";
         if (!allowDestructive) {
-          logger6.error({ src: "plugin:sql", pluginName, environment: isProduction ? "PRODUCTION" : "DEVELOPMENT", warnings: dataLossCheck.warnings }, "Destructive migration blocked - set ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS=true or use force option");
+          logger6.error({
+            src: "plugin:sql",
+            pluginName,
+            environment: isProduction ? "PRODUCTION" : "DEVELOPMENT",
+            warnings: dataLossCheck.warnings
+          }, "Destructive migration blocked - set ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS=true or use force option");
           const errorMessage = isProduction ? `Destructive migration blocked in production for ${pluginName}. Set ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS=true or use drizzle-kit.` : `Destructive migration blocked for ${pluginName}. Set ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS=true to proceed.`;
           throw new Error(errorMessage);
         }
@@ -7756,7 +7807,11 @@ class RuntimeMigrator {
       logger6.info({ src: "plugin:sql", pluginName }, "Migration completed successfully");
       return;
     } catch (error) {
-      logger6.error({ src: "plugin:sql", pluginName, error: error instanceof Error ? error.message : String(error) }, "Migration failed");
+      logger6.error({
+        src: "plugin:sql",
+        pluginName,
+        error: error instanceof Error ? error.message : String(error)
+      }, "Migration failed");
       throw error;
     } finally {
       const postgresUrl = process.env.POSTGRES_URL || process.env.DATABASE_URL || "";
@@ -7767,7 +7822,11 @@ class RuntimeMigrator {
           await this.db.execute(sql`SELECT pg_advisory_unlock(CAST(${lockIdStr} AS bigint))`);
           logger6.debug({ src: "plugin:sql", pluginName }, "Advisory lock released");
         } catch (unlockError) {
-          logger6.warn({ src: "plugin:sql", pluginName, error: unlockError instanceof Error ? unlockError.message : String(unlockError) }, "Failed to release advisory lock");
+          logger6.warn({
+            src: "plugin:sql",
+            pluginName,
+            error: unlockError instanceof Error ? unlockError.message : String(unlockError)
+          }, "Failed to release advisory lock");
         }
       }
     }
@@ -7794,7 +7853,10 @@ class RuntimeMigrator {
           await this.db.execute(sql`ROLLBACK`);
           logger6.error({ src: "plugin:sql", error: error instanceof Error ? error.message : String(error) }, "Migration failed, rolled back");
         } catch (rollbackError) {
-          logger6.error({ src: "plugin:sql", error: rollbackError instanceof Error ? rollbackError.message : String(rollbackError) }, "Failed to rollback transaction");
+          logger6.error({
+            src: "plugin:sql",
+            error: rollbackError instanceof Error ? rollbackError.message : String(rollbackError)
+          }, "Failed to rollback transaction");
         }
       }
       throw error;
@@ -7841,7 +7903,11 @@ class RuntimeMigrator {
       }
       return dataLossCheck;
     } catch (error) {
-      logger6.error({ src: "plugin:sql", pluginName, error: error instanceof Error ? error.message : String(error) }, "Failed to check migration");
+      logger6.error({
+        src: "plugin:sql",
+        pluginName,
+        error: error instanceof Error ? error.message : String(error)
+      }, "Failed to check migration");
       throw error;
     }
   }
@@ -8686,7 +8752,11 @@ class DatabaseMigrationService {
         this.registeredSchemas.set(plugin.name, plugin.schema);
       }
     }
-    logger9.info({ src: "plugin:sql", schemasDiscovered: this.registeredSchemas.size, totalPlugins: plugins.length }, "Plugin schemas discovered");
+    logger9.info({
+      src: "plugin:sql",
+      schemasDiscovered: this.registeredSchemas.size,
+      totalPlugins: plugins.length
+    }, "Plugin schemas discovered");
   }
   registerSchema(pluginName, schema2) {
     this.registeredSchemas.set(pluginName, schema2);
@@ -8702,7 +8772,12 @@ class DatabaseMigrationService {
       force: options?.force ?? false,
       dryRun: options?.dryRun ?? false
     };
-    logger9.info({ src: "plugin:sql", environment: isProduction ? "PRODUCTION" : "DEVELOPMENT", pluginCount: this.registeredSchemas.size, dryRun: migrationOptions.dryRun }, "Starting migrations");
+    logger9.info({
+      src: "plugin:sql",
+      environment: isProduction ? "PRODUCTION" : "DEVELOPMENT",
+      pluginCount: this.registeredSchemas.size,
+      dryRun: migrationOptions.dryRun
+    }, "Starting migrations");
     let successCount = 0;
     let failureCount = 0;
     const errors2 = [];
@@ -9149,9 +9224,7 @@ var cacheTable = pgTable("cache", {
   value: jsonb("value").notNull(),
   createdAt: timestamp("created_at", { withTimezone: true }).default(sql`now()`).notNull(),
   expiresAt: timestamp("expires_at", { withTimezone: true })
-}, (table3) => [
-  primaryKey({ columns: [table3.key, table3.agentId] })
-]);
+}, (table3) => [primaryKey({ columns: [table3.key, table3.agentId] })]);
 // src/schema/component.ts
 init_drizzle_orm();
 init_pg_core();
@@ -9332,18 +9405,14 @@ init_pg_core();
 var channelParticipantsTable = pgTable("channel_participants", {
   channelId: text("channel_id").notNull().references(() => channelTable.id, { onDelete: "cascade" }),
   entityId: text("entity_id").notNull()
-}, (table3) => [
-  primaryKey({ columns: [table3.channelId, table3.entityId] })
-]);
+}, (table3) => [primaryKey({ columns: [table3.channelId, table3.entityId] })]);
 // src/schema/messageServerAgent.ts
 init_pg_core();
 init_agent();
 var messageServerAgentsTable = pgTable("message_server_agents", {
   messageServerId: uuid("message_server_id").notNull().references(() => messageServerTable.id, { onDelete: "cascade" }),
   agentId: uuid("agent_id").notNull().references(() => agentTable.id, { onDelete: "cascade" })
-}, (table3) => [
-  primaryKey({ columns: [table3.messageServerId, table3.agentId] })
-]);
+}, (table3) => [primaryKey({ columns: [table3.messageServerId, table3.agentId] })]);
 // src/base.ts
 class BaseDrizzleAdapter extends DatabaseAdapter {
   maxRetries = 3;
@@ -9405,10 +9474,19 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           const backoffDelay = Math.min(this.baseDelay * 2 ** (attempt - 1), this.maxDelay);
           const jitter = Math.random() * this.jitterMax;
           const delay = backoffDelay + jitter;
-          logger10.warn({ src: "plugin:sql", attempt, maxRetries: this.maxRetries, error: error instanceof Error ? error.message : String(error) }, "Database operation failed, retrying");
+          logger10.warn({
+            src: "plugin:sql",
+            attempt,
+            maxRetries: this.maxRetries,
+            error: error instanceof Error ? error.message : String(error)
+          }, "Database operation failed, retrying");
           await new Promise((resolve) => setTimeout(resolve, delay));
         } else {
-          logger10.error({ src: "plugin:sql", totalAttempts: attempt, error: error instanceof Error ? error.message : String(error) }, "Max retry attempts reached");
+          logger10.error({
+            src: "plugin:sql",
+            totalAttempts: attempt,
+            error: error instanceof Error ? error.message : String(error)
+          }, "Max retry attempts reached");
           throw error instanceof Error ? error : new Error(String(error));
         }
       }
@@ -9475,7 +9553,11 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         });
         return true;
       } catch (error) {
-        logger10.error({ src: "plugin:sql", agentId: agent.id, error: error instanceof Error ? error.message : String(error) }, "Failed to create agent");
+        logger10.error({
+          src: "plugin:sql",
+          agentId: agent.id,
+          error: error instanceof Error ? error.message : String(error)
+        }, "Failed to create agent");
         return false;
       }
     });
@@ -9511,7 +9593,11 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         });
         return true;
       } catch (error) {
-        logger10.error({ src: "plugin:sql", agentId, error: error instanceof Error ? error.message : String(error) }, "Failed to update agent");
+        logger10.error({
+          src: "plugin:sql",
+          agentId,
+          error: error instanceof Error ? error.message : String(error)
+        }, "Failed to update agent");
         return false;
       }
     });
@@ -9562,7 +9648,11 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         }
         return true;
       } catch (error) {
-        logger10.error({ src: "plugin:sql", agentId, error: error instanceof Error ? error.message : String(error) }, "Failed to delete agent");
+        logger10.error({
+          src: "plugin:sql",
+          agentId,
+          error: error instanceof Error ? error.message : String(error)
+        }, "Failed to delete agent");
         throw error;
       }
     });
@@ -9665,7 +9755,11 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           return true;
         });
       } catch (error) {
-        logger10.error({ src: "plugin:sql", entityId: entities[0]?.id, error: error instanceof Error ? error.message : String(error) }, "Failed to create entities");
+        logger10.error({
+          src: "plugin:sql",
+          entityId: entities[0]?.id,
+          error: error instanceof Error ? error.message : String(error)
+        }, "Failed to create entities");
         return false;
       }
     });
@@ -9682,7 +9776,11 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       }
       return true;
     } catch (error) {
-      logger10.error({ src: "plugin:sql", entityId: entity2.id, error: error instanceof Error ? error.message : String(error) }, "Failed to ensure entity exists");
+      logger10.error({
+        src: "plugin:sql",
+        entityId: entity2.id,
+        error: error instanceof Error ? error.message : String(error)
+      }, "Failed to ensure entity exists");
       return false;
     }
   }
@@ -10032,7 +10130,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           levenshtein_score: Number(row.levenshtein_score)
         })).filter((row) => Array.isArray(row.embedding));
       } catch (error) {
-        logger10.error({ src: "plugin:sql", tableName: opts.query_table_name, fieldName: opts.query_field_name, error: error instanceof Error ? error.message : String(error) }, "Failed to get cached embeddings");
+        logger10.error({
+          src: "plugin:sql",
+          tableName: opts.query_table_name,
+          fieldName: opts.query_field_name,
+          error: error instanceof Error ? error.message : String(error)
+        }, "Failed to get cached embeddings");
         if (error instanceof Error && error.message === "levenshtein argument exceeds maximum length of 255 characters") {
           return [];
         }
@@ -10054,7 +10157,13 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           });
         });
       } catch (error) {
-        logger10.error({ src: "plugin:sql", type: params.type, roomId: params.roomId, entityId: params.entityId, error: error instanceof Error ? error.message : String(error) }, "Failed to create log entry");
+        logger10.error({
+          src: "plugin:sql",
+          type: params.type,
+          roomId: params.roomId,
+          entityId: params.entityId,
+          error: error instanceof Error ? error.message : String(error)
+        }, "Failed to create log entry");
         throw error;
       }
     });
@@ -10416,7 +10525,11 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         });
         return true;
       } catch (error) {
-        logger10.error({ src: "plugin:sql", memoryId: memory.id, error: error instanceof Error ? error.message : String(error) }, "Failed to update memory");
+        logger10.error({
+          src: "plugin:sql",
+          memoryId: memory.id,
+          error: error instanceof Error ? error.message : String(error)
+        }, "Failed to update memory");
         return false;
       }
     });
@@ -10583,7 +10696,13 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         }).onConflictDoNothing();
         return true;
       } catch (error) {
-        logger10.error({ src: "plugin:sql", entityId, roomId, agentId: this.agentId, error: error instanceof Error ? error.message : String(error) }, "Failed to add participant to room");
+        logger10.error({
+          src: "plugin:sql",
+          entityId,
+          roomId,
+          agentId: this.agentId,
+          error: error instanceof Error ? error.message : String(error)
+        }, "Failed to add participant to room");
         return false;
       }
     });
@@ -10599,7 +10718,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         await this.db.insert(participantTable).values(values).onConflictDoNothing().execute();
         return true;
       } catch (error) {
-        logger10.error({ src: "plugin:sql", roomId, agentId: this.agentId, error: error instanceof Error ? error.message : String(error) }, "Failed to add participants to room");
+        logger10.error({
+          src: "plugin:sql",
+          roomId,
+          agentId: this.agentId,
+          error: error instanceof Error ? error.message : String(error)
+        }, "Failed to add participants to room");
         return false;
       }
     });
@@ -10613,7 +10737,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         const removed = result.length > 0;
         return removed;
       } catch (error) {
-        logger10.error({ src: "plugin:sql", entityId, roomId, error: error instanceof Error ? error.message : String(error) }, "Failed to remove participant from room");
+        logger10.error({
+          src: "plugin:sql",
+          entityId,
+          roomId,
+          error: error instanceof Error ? error.message : String(error)
+        }, "Failed to remove participant from room");
         return false;
       }
     });
@@ -10660,7 +10789,13 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           await tx.update(participantTable).set({ roomState: state }).where(and(eq(participantTable.roomId, roomId), eq(participantTable.entityId, entityId), eq(participantTable.agentId, this.agentId)));
         });
       } catch (error) {
-        logger10.error({ src: "plugin:sql", roomId, entityId, state, error: error instanceof Error ? error.message : String(error) }, "Failed to set participant follow state");
+        logger10.error({
+          src: "plugin:sql",
+          roomId,
+          entityId,
+          state,
+          error: error instanceof Error ? error.message : String(error)
+        }, "Failed to set participant follow state");
         throw error;
       }
     });
@@ -10680,7 +10815,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         await this.db.insert(relationshipTable).values(saveParams);
         return true;
       } catch (error) {
-        logger10.error({ src: "plugin:sql", agentId: this.agentId, error: error instanceof Error ? error.message : String(error), saveParams }, "Error creating relationship");
+        logger10.error({
+          src: "plugin:sql",
+          agentId: this.agentId,
+          error: error instanceof Error ? error.message : String(error),
+          saveParams
+        }, "Error creating relationship");
         return false;
       }
     });
@@ -10693,7 +10833,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           metadata: relationship.metadata || {}
         }).where(eq(relationshipTable.id, relationship.id));
       } catch (error) {
-        logger10.error({ src: "plugin:sql", agentId: this.agentId, error: error instanceof Error ? error.message : String(error), relationshipId: relationship.id }, "Error updating relationship");
+        logger10.error({
+          src: "plugin:sql",
+          agentId: this.agentId,
+          error: error instanceof Error ? error.message : String(error),
+          relationshipId: relationship.id
+        }, "Error updating relationship");
         throw error;
       }
     });
@@ -10755,7 +10900,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         }
         return;
       } catch (error) {
-        logger10.error({ src: "plugin:sql", agentId: this.agentId, error: error instanceof Error ? error.message : String(error), key }, "Error fetching cache");
+        logger10.error({
+          src: "plugin:sql",
+          agentId: this.agentId,
+          error: error instanceof Error ? error.message : String(error),
+          key
+        }, "Error fetching cache");
         return;
       }
     });
@@ -10775,7 +10925,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         });
         return true;
       } catch (error) {
-        logger10.error({ src: "plugin:sql", agentId: this.agentId, error: error instanceof Error ? error.message : String(error), key }, "Error setting cache");
+        logger10.error({
+          src: "plugin:sql",
+          agentId: this.agentId,
+          error: error instanceof Error ? error.message : String(error),
+          key
+        }, "Error setting cache");
         return false;
       }
     });
@@ -10788,7 +10943,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         });
         return true;
       } catch (error) {
-        logger10.error({ src: "plugin:sql", agentId: this.agentId, error: error instanceof Error ? error.message : String(error), key }, "Error deleting cache");
+        logger10.error({
+          src: "plugin:sql",
+          agentId: this.agentId,
+          error: error instanceof Error ? error.message : String(error),
+          key
+        }, "Error deleting cache");
         return false;
       }
     });
@@ -10964,7 +11124,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           await this.db.delete(memoryTable).where(inArray(memoryTable.id, memoryIdsInRooms));
         }
         await this.db.delete(roomTable).where(inArray(roomTable.id, roomIds));
-        logger10.debug({ src: "plugin:sql", worldId, roomsDeleted: roomIds.length, memoriesDeleted: memoryIdsInRooms.length }, "World cleanup completed");
+        logger10.debug({
+          src: "plugin:sql",
+          worldId,
+          roomsDeleted: roomIds.length,
+          memoriesDeleted: memoryIdsInRooms.length
+        }, "World cleanup completed");
       }
     });
   }
@@ -11409,6 +11574,7 @@ init_sql();
 init_tracing();
 init_utils();
 var { Pool, types: types3 } = pg;
+var NativePool = pg.native ? pg.native.Pool : undefined;
 
 class NodePgPreparedQuery extends PgPreparedQuery {
   constructor(client, queryString, params, logger12, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper) {
@@ -11566,7 +11732,7 @@ class NodePgSession extends PgSession {
     return new NodePgPreparedQuery(this.client, query.sql, query.params, this.logger, this.cache, queryMetadata, cacheConfig, fields, name, isResponseInArrayMode, customResultMapper);
   }
   async transaction(transaction, config) {
-    const session2 = this.client instanceof Pool ? new NodePgSession(await this.client.connect(), this.dialect, this.schema, this.options) : this;
+    const session2 = this.client instanceof Pool || NativePool && this.client instanceof NativePool ? new NodePgSession(await this.client.connect(), this.dialect, this.schema, this.options) : this;
     const tx = new NodePgTransaction(this.dialect, session2, this.schema);
     await tx.execute(sql`begin${config ? sql` ${tx.getTransactionConfigSQL(config)}` : undefined}`);
     try {
@@ -11577,7 +11743,7 @@ class NodePgSession extends PgSession {
       await tx.execute(sql`rollback`);
       throw error;
     } finally {
-      if (this.client instanceof Pool) {
+      if (this.client instanceof Pool || NativePool && this.client instanceof NativePool) {
         session2.client.release();
       }
     }
@@ -11930,7 +12096,11 @@ function createDatabaseAdapter(config, agentId) {
       }
       rlsServerId = stringToUuid(rlsServerIdString);
       managerKey = rlsServerId;
-      logger14.debug({ src: "plugin:sql", rlsServerId: rlsServerId.slice(0, 8), serverIdString: rlsServerIdString }, "Using connection pool for RLS server");
+      logger14.debug({
+        src: "plugin:sql",
+        rlsServerId: rlsServerId.slice(0, 8),
+        serverIdString: rlsServerIdString
+      }, "Using connection pool for RLS server");
     }
     if (!globalSingletons.postgresConnectionManagers) {
       globalSingletons.postgresConnectionManagers = new Map;
@@ -11996,5 +12166,5 @@ export {
   DatabaseMigrationService
 };
 
-//# debugId=C2608A88C2C2BA8564756E2164756E21
+//# debugId=EA546D2333E8154064756E2164756E21
 //# sourceMappingURL=index.node.js.map