@agentforge/tools 0.16.15 → 0.16.17

package/dist/index.cjs

@@ -4286,6 +4286,79 @@ async function initializeSQLiteConnection(connection) {
   const db = drizzle({ client });
   return { client, db };
 }
+
+// src/data/relational/connection/query-execution.ts
+async function executeQuery(context, query, logger23) {
+  logger23.debug("Executing SQL query", {
+    vendor: context.vendor
+  });
+  if (context.vendor === "sqlite") {
+    return executeSqliteQuery(
+      context.db,
+      query,
+      context.isSqliteNonQueryError
+    );
+  }
+  if (context.vendor === "mysql") {
+    return normalizeMySqlResult(
+      await context.db.execute(query)
+    );
+  }
+  return context.db.execute(query);
+}
+async function executeSqliteQuery(db, query, isSqliteNonQueryError) {
+  try {
+    return db.all(query);
+  } catch (error) {
+    if (isSqliteNonQueryError(error)) {
+      const runResult = db.run(query);
+      return { ...runResult, affectedRows: runResult.changes ?? 0 };
+    }
+    throw error;
+  }
+}
+function normalizeMySqlResult(raw) {
+  if (Array.isArray(raw) && raw.length === 2) {
+    return raw[0];
+  }
+  return raw;
+}
+
+// src/data/relational/connection/session-adapters.ts
+async function executeInDedicatedConnection(context, callback) {
+  if (context.vendor === "sqlite") {
+    return callback(
+      (query) => executeSqliteQuery(
+        context.db,
+        query,
+        context.isSqliteNonQueryError
+      )
+    );
+  }
+  if (context.vendor === "postgresql") {
+    const poolClient = await context.client.connect();
+    try {
+      const { drizzle } = await import('drizzle-orm/node-postgres');
+      const sessionDb = drizzle({ client: poolClient });
+      return await callback((query) => sessionDb.execute(query));
+    } finally {
+      poolClient.release();
+    }
+  }
+  if (context.vendor === "mysql") {
+    const mysqlConnection = await context.client.getConnection();
+    try {
+      const { drizzle } = await import('drizzle-orm/mysql2');
+      const sessionDb = drizzle({ client: mysqlConnection });
+      return await callback(
+        async (query) => normalizeMySqlResult(await sessionDb.execute(query))
+      );
+    } finally {
+      mysqlConnection.release();
+    }
+  }
+  throw new Error(`Unsupported database vendor: ${context.vendor}`);
+}
 var logger8 = core.createLogger("agentforge:tools:data:relational:connection");
 var ConnectionManager = class extends events.EventEmitter {
   vendor;
@@ -4586,28 +4659,15 @@ var ConnectionManager = class extends events.EventEmitter {
     if (!this.db) {
       throw new Error("Database not initialized. Call initialize() first.");
     }
-    logger8.debug("Executing SQL query", {
-      vendor: this.vendor
-    });
-    if (this.vendor === "sqlite") {
-      try {
-        return this.db.all(query);
-      } catch (error) {
-        if (this.isSqliteNonQueryError(error)) {
-          const runResult = this.db.run(query);
-          return { ...runResult, affectedRows: runResult.changes ?? 0 };
-        }
-        throw error;
-      }
-    }
-    if (this.vendor === "mysql") {
-      const raw = await this.db.execute(query);
-      if (Array.isArray(raw) && raw.length === 2) {
-        return raw[0];
-      }
-      return raw;
-    }
-    return this.db.execute(query);
+    return executeQuery(
+      {
+        vendor: this.vendor,
+        db: this.db,
+        isSqliteNonQueryError: (error) => this.isSqliteNonQueryError(error)
+      },
+      query,
+      logger8
+    );
   }
   /**
    * Execute a callback with a single dedicated database connection/session.
@@ -4619,46 +4679,15 @@ var ConnectionManager = class extends events.EventEmitter {
     if (!this.client || !this.db) {
       throw new Error("Database not initialized. Call connect() first.");
     }
-    if (this.vendor === "sqlite") {
-      return callback(async (query) => {
-        try {
-          return this.db.all(query);
-        } catch (error) {
-          if (this.isSqliteNonQueryError(error)) {
-            const runResult = this.db.run(query);
-            return { ...runResult, affectedRows: runResult.changes ?? 0 };
-          }
-          throw error;
-        }
-      });
-    }
-    if (this.vendor === "postgresql") {
-      const poolClient = await this.client.connect();
-      try {
-        const { drizzle } = await import('drizzle-orm/node-postgres');
-        const sessionDb = drizzle({ client: poolClient });
-        return await callback(async (query) => sessionDb.execute(query));
-      } finally {
-        poolClient.release();
-      }
-    }
-    if (this.vendor === "mysql") {
-      const mysqlConnection = await this.client.getConnection();
-      try {
-        const { drizzle } = await import('drizzle-orm/mysql2');
-        const sessionDb = drizzle({ client: mysqlConnection });
-        return await callback(async (query) => {
-          const raw = await sessionDb.execute(query);
-          if (Array.isArray(raw) && raw.length === 2) {
-            return raw[0];
-          }
-          return raw;
-        });
-      } finally {
-        mysqlConnection.release();
-      }
-    }
-    throw new Error(`Unsupported database vendor: ${this.vendor}`);
+    return executeInDedicatedConnection(
+      {
+        vendor: this.vendor,
+        client: this.client,
+        db: this.db,
+        isSqliteNonQueryError: (error) => this.isSqliteNonQueryError(error)
+      },
+      callback
+    );
   }
   /**
    * Get connection pool metrics
@@ -4877,7 +4906,7 @@ function buildParameterizedQuery(sqlString, params) {
     return sqlChunks.length > 0 ? drizzleOrm.sql.join(sqlChunks, drizzleOrm.sql.raw("")) : drizzleOrm.sql.raw(sqlString);
   }
 }
-async function executeQuery(manager, input, context) {
+async function executeQuery2(manager, input, context) {
   const startTime = Date.now();
   logger9.debug("Executing query", {
     vendor: input.vendor,
@@ -5948,11 +5977,11 @@ async function withTransaction(manager, operation, options) {
     ...resolvedOptions.isolationLevel ? { isolationLevel: resolvedOptions.isolationLevel } : {},
     ...resolvedOptions.timeoutMs !== void 0 ? { timeoutMs: resolvedOptions.timeoutMs } : {}
   });
-  return manager.executeInConnection(async (executeQuery2) => {
+  return manager.executeInConnection(async (executeQuery3) => {
     const transaction = new ManagedTransaction({
       id: transactionId,
       vendor,
-      executeQuery: executeQuery2,
+      executeQuery: executeQuery3,
       options: resolvedOptions
     });
     await transaction.begin();
@@ -6318,7 +6347,7 @@ var SchemaInspector = class _SchemaInspector {
     };
   }
   async runQueryRows(query) {
-    const result = await executeQuery(this.manager, {
+    const result = await executeQuery2(this.manager, {
       sql: query,
       vendor: this.vendor
     });
@@ -7042,7 +7071,7 @@ var relationalQuery = core.toolBuilder().name("relational-query").displayName("R
   });
   try {
     await manager.initialize();
-    const result = await executeQuery(manager, {
+    const result = await executeQuery2(manager, {
       sql: input.sql,
       params: input.params,
       vendor: input.vendor
@@ -10393,7 +10422,7 @@ exports.directoryOperationTools = directoryOperationTools;
 exports.emailValidator = emailValidator;
 exports.embeddingManager = embeddingManager;
 exports.executeBatchedTask = executeBatchedTask;
-exports.executeQuery = executeQuery;
+exports.executeQuery = executeQuery2;
 exports.executeStreamingSelect = executeStreamingSelect;
 exports.exportSchemaToJson = exportSchemaToJson;
 exports.extractImages = extractImages;