@superhero/db 0.4.0 → 0.5.1

package/adapter/mysql2/error/nested-transactions-not-allowed.js

@@ -0,0 +1,10 @@
+class NestedTransactionsNotAllowed extends Error
+{
+  constructor(...args)
+  {
+    super(...args)
+    this.code = 'E_MYSQL2_NESTED_TRANSACTIONS_UNSUPPORTED'
+  }
+}
+
+module.exports = NestedTransactionsNotAllowed

package/adapter/mysql2/factory.js

@@ -0,0 +1,12 @@
+const AdapterMySql2 = require('.')
+
+class AdapterMySql2Factory
+{
+  create(mysql2, config)
+  {
+    const pool = mysql2.createPool(config)
+    return new AdapterMySql2(pool)
+  }
+}
+
+module.exports = AdapterMySql2Factory

package/adapter/mysql2/index.js

@@ -0,0 +1,51 @@
+const AdapterMySql2Transaction = require('./transaction')
+
+class AdapterMySql2
+{
+  constructor(pool)
+  {
+    this.pool = pool
+  }
+
+  query(query, ...ctx)
+  {
+    const resolve = (accept, reject, i = 0) =>
+      this.pool.query(query, ctx, (error, response) =>
+        error
+        ? error.code === 'ETIMEDOUT' && i < 3
+          ? resolve(accept, reject, ++i)
+          : reject(error)
+        : accept(response))
+
+    return new Promise(resolve)
+  }
+
+  getConnection()
+  {
+    const resolve = (accept, reject, i = 0) =>
+      this.pool.getConnection((error, connection) =>
+        error
+        ? error.code === 'ETIMEDOUT' && i < 3
+          ? resolve(accept, reject, ++i)
+          : reject(error)
+        : accept(connection))
+
+    return new Promise(resolve)
+  }
+
+  async createTransaction()
+  {
+    const connection  = await this.getConnection()
+    await connection.query('START TRANSACTION')
+    const transaction = new AdapterMySql2Transaction(connection)
+
+    return transaction
+  }
+
+  close()
+  {
+    this.pool.end()
+  }
+}
+
+module.exports = AdapterMySql2

package/adapter/mysql2/transaction.js

@@ -0,0 +1,44 @@
+const NestedTransactionsNotAllowed = require('./error/nested-transactions-not-allowed')
+
+class AdapterMySql2Transaction
+{
+  constructor(connection)
+  {
+    this.connection = connection
+  }
+
+  createTransaction()
+  {
+    throw new NestedTransactionsNotAllowed('Nested transactions are not allowed')
+  }
+
+  query(...args)
+  {
+    return this._query(...args)
+  }
+
+  // We are forced to have a different query function to be able to use it from inside
+  // the class without the Proxy making interferences
+  async _query(query, ...ctx)
+  {
+    return new Promise((accept, reject) =>
+      this.connection.query(query, ...ctx, (error, response) =>
+        error
+        ? reject(error)
+        : accept(response)))
+  }
+
+  async commit()
+  {
+    await this._query('COMMIT')
+    this.connection.release()
+  }
+
+  async rollback()
+  {
+    await this._query('ROLLBACK')
+    this.connection.release()
+  }
+}
+
+module.exports = AdapterMySql2Transaction

package/index.js

@@ -21,11 +21,16 @@ class Db
 
   async query(file, ...ctx)
   {
-    const
-      query     = await this.getQuery(file),
-      response  = await this.adaptor.query(query, ...ctx)
+    let query = await this.getQuery(file)
 
-    return response
+    for(let noEscapeReplace = query.indexOf('?%s');
+            noEscapeReplace > -1;
+            noEscapeReplace = query.indexOf('?%s'))
+    {
+      query = query.replace('?%s', ctx.shift())
+    }
+
+    return await this.adaptor.query(query, ...ctx)
   }
 
   async formatQuery(file, formatCtx, sqlCtx)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superhero/db",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Db interaction, designed to separate queries from the source code",
   "repository": "git@github.com:superhero/js.db.git",
   "main": "index.js",