stabilize-orm 1.1.6 → 1.1.7

package/client.ts

@@ -103,41 +103,50 @@ export class DBClient {
    * const users = await dbClient.query('SELECT * FROM users WHERE status = ?', ['active']);
    * ```
    */
-  async query<T>(query: string, params: any[] = []): Promise<T[]> {
-    const start = Date.now();
-    this.logger.logQuery(query, params);
-
-    for (let attempt = 1; attempt <= this.retryAttempts; attempt++) {
-      try {
-        let result: any;
-
-        if (this.client instanceof Database) { // SQLite
-          let stmt = this.preparedStatements.get(query);
-          if (!stmt) {
-            stmt = this.client.prepare(query);
-            this.preparedStatements.set(query, stmt);
-          }
-          result = stmt.all(...params);
-        } else if (isMySQLPool(this.client) || ('query' in this.client && 'release' in this.client)) { // mysql2 Pool or Connection
-            const [rows] = await (this.client as mysql.Pool).query(query, params);
-            result = rows;
-        } else { // Postgres Pool or Client
-          const pgQuery = query.replace(/\?/g, (_, i) => `$${i + 1}`);
-          const pgResult = await (this.client as Pool).query(pgQuery, params);
-          result = pgResult.rows;
+  
+    async query<T>(query: string, params: any[] = []): Promise<T[]> {
+        const start = Date.now();
+        
+        for (let attempt = 1; attempt <= this.retryAttempts; attempt++) {
+            try {
+                let result: any;
+                
+                // Log the query before execution
+                this.logger.logQuery(query, params);
+
+                if (this.client instanceof Database) { // SQLite
+                    let stmt = this.preparedStatements.get(query);
+                    if (!stmt) {
+                        stmt = this.client.prepare(query);
+                        this.preparedStatements.set(query, stmt);
+                    }
+                    result = stmt.all(...params);
+                } else if (isMySQLPool(this.client) || ('query' in this.client && 'release' in this.client && !(this.client instanceof Pool))) { // mysql2 Pool or Connection
+                    const [rows] = await (this.client as mysql.Pool).query(query, params);
+                    result = rows;
+                } else { // Postgres Pool or Client
+                    
+                    // Correctly replace '?' with '$1', '$2', etc.
+                    let paramIndex = 0;
+                    const pgQuery = query.replace(/\?/g, () => `$${++paramIndex}`);
+                    const pgResult = await (this.client as Pool).query(pgQuery, params);
+                    result = pgResult.rows;
+                }
+
+                const executionTime = Date.now() - start;
+                this.logger.logQuery(query, params, executionTime);
+                return result as T[];
+            } catch (error) {
+                this.logger.logError(error as Error);
+                if (attempt === this.retryAttempts) {
+                    throw new StabilizeError(`Query failed after ${this.retryAttempts} attempts: ${(error as Error).message}`, "QUERY_ERROR");
+                }
+                await new Promise(res => setTimeout(res, this.retryDelay * Math.pow(2, attempt - 1) + this.getJitter()));
+            }
         }
-
-        const executionTime = Date.now() - start;
-        this.logger.logQuery(query, params, executionTime);
-        return result as T[];
-      } catch (error) {
-        this.logger.logError(error as Error);
-        if (attempt === this.retryAttempts) throw new StabilizeError(`Query failed: ${(error as Error).message}`, "QUERY_ERROR");
-        await new Promise(res => setTimeout(res, this.retryDelay * Math.pow(2, attempt - 1) + this.getJitter()));
-      }
+        // This line should theoretically be unreachable if retryAttempts >= 1
+        throw new StabilizeError("Query failed: maximum retries reached without success", "QUERY_ERROR");
     }
-    throw new StabilizeError("Query failed: no attempts made", "QUERY_ERROR");
-  }
 
   /**
    * Executes a series of database operations within a single atomic transaction.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stabilize-orm",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "A lightweight, type-safe ORM for Bun.js with support for SQLite, MySQL, PostgreSQL, and Redis caching",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",