@superhero/db 0.5.1 → 1.0.0

package/adapter/mysql/index.js

@@ -20,6 +20,11 @@ class AdapterMySql
     return new Promise(resolve)
   }
 
+  getFormattedQuery(query, ...ctx)
+  {
+    return this.pool.format(query, ...ctx)
+  }
+
   getConnection()
   {
     const resolve = (accept, reject, i = 0) =>

package/adapter/mysql2/index.js

@@ -12,7 +12,7 @@ class AdapterMySql2
     const resolve = (accept, reject, i = 0) =>
       this.pool.query(query, ctx, (error, response) =>
         error
-        ? error.code === 'ETIMEDOUT' && i < 3
+        ? ['ETIMEDOUT', 'ECONNREFUSED', 'ECONNRESET'].includes(error.code) && i < 3
           ? resolve(accept, reject, ++i)
           : reject(error)
         : accept(response))
@@ -20,6 +20,11 @@ class AdapterMySql2
     return new Promise(resolve)
   }
 
+  getFormattedQuery(query, ...ctx)
+  {
+    return this.pool.format(query, ...ctx)
+  }
+
   getConnection()
   {
     const resolve = (accept, reject, i = 0) =>

package/index.js

@@ -29,8 +29,19 @@ class Db
     {
       query = query.replace('?%s', ctx.shift())
     }
-
-    return await this.adaptor.query(query, ...ctx)
+  
+    try
+    {
+      return await this.adaptor.query(query, ...ctx)
+    }
+    catch(reason)
+    {
+      const error = new Error(`DB query '${file}' failed`)
+      error.code  = 'DB_QUERY_ERROR'
+      error.query = this.adaptor.getFormattedQuery?.(query, ...ctx) ?? query
+      error.cause = reason
+      throw error
+    }
   }
 
   async formatQuery(file, formatCtx, sqlCtx)
@@ -56,8 +67,8 @@ class Db
         : async (file, ...ctx) =>
         {
           const
-          query     = await this.getQuery(file),
-          response  = await transaction.query(query, ...ctx)
+            query     = await this.getQuery(file),
+            response  = await transaction.query(query, ...ctx)
 
           return response
         }

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@superhero/db",
-  "version": "0.5.1",
+  "version": "1.0.0",
   "description": "Db interaction, designed to separate queries from the source code",
-  "repository": "git@github.com:superhero/js.db.git",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/superhero/js.db.git"
+  },
   "main": "index.js",
   "license": "MIT",
   "author": {