@axiosleo/orm-mysql 0.5.0 → 0.5.2

package/README.md

@@ -164,10 +164,20 @@ const conn = createPromiseClient({
   database: process.env.MYSQL_DB,
 });
 
-const transaction = new TransactionHandler(connection);
+const transaction = new TransactionHandler(conn, {
+  /*
+  level = 'READ UNCOMMITTED' | 'RU'
+        | 'READ COMMITTED' | 'RC'
+        | 'REPEATABLE READ' | 'RR'
+        | 'SERIALIZABLE' | 'S'
+  */
+  level: "SERIALIZABLE", // 'SERIALIZABLE' as default value
+});
+await transaction.begin();
 
 try {
   // insert user info
+  // will not really create a record.
   let row = await transaction.table("users").insert({
     name: "Joe",
     age: 18,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiosleo/orm-mysql",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "MySQL ORM tool",
   "keywords": [
     "mysql",

package/src/builder.js

@@ -192,6 +192,21 @@ class Builder {
     return null;
   }
 
+  _buildContidionIn(condition, isNot = false) {
+    if (!Array.isArray(condition.value) && !(condition.value instanceof Query)) {
+      throw new Error('Value must be an array for "IN" condition');
+    }
+    if (condition.key.indexOf('$') !== -1) {
+      let res = this._buildConditionValues(condition.value);
+      let sql = res ? `JSON_CONTAINS(JSON_ARRAY(${res}), ${this._buildFieldKey(condition.key)})` :
+        `JSON_CONTAINS(JSON_ARRAY(?), ${this._buildFieldKey(condition.key)})`;
+      return isNot ? `${sql}=0` : sql;
+    }
+    let res = this._buildConditionValues(condition.value);
+    const opt = isNot ? 'NOT IN' : 'IN';
+    return res ? `${this._buildFieldKey(condition.key)} ${opt} (${res})` : `${this._buildFieldKey(condition.key)} ${opt} (?)`;
+  }
+
   _buildContidion(conditions, prefix) {
     if (!conditions || !conditions.length) {
       return '';
@@ -216,9 +231,10 @@ class Builder {
           ], '');
         }
         const opt = c.opt.toLowerCase();
-        if (opt === 'in' && Array.isArray(c.value)) {
-          let res = this._buildConditionValues(c.value);
-          return res ? `${this._buildFieldKey(c.key)} IN (${res})` : `${this._buildFieldKey(c.key)} IN (?)`;
+        if (opt === 'in') {
+          return this._buildContidionIn(c);
+        } else if (opt === 'not in') {
+          return this._buildContidionIn(c, true);
         } else if (opt === 'group' && Array.isArray(c.value)) {
           return `(${this._buildContidion(c.value, '')})`;
         }

package/.env

@@ -1,6 +0,0 @@
-[mysql]
-MYSQL_HOST = "rm-bp1a906h4019pldm6io.mysql.rds.aliyuncs.com"
-MYSQL_USER = "kms"
-MYSQL_PASS = "bmPWuq_vJgupdL9"
-MYSQL_PORT = 3306
-MYSQL_DB = "kms-test"

package/.prettierignore

@@ -1 +0,0 @@
-README.md

package/runtimes/hook.js

@@ -1,104 +0,0 @@
-/* eslint-disable no-console */
-'use strict';
-
-const EventEmitter = require('events');
-const { debug } = require('@axiosleo/cli-tool');
-const events = {}; // event tree
-const hook = new EventEmitter();
-
-const pushEvent = ({ label, table, opt, callback }) => {
-  label = label || '*';
-  if (!events[label]) {
-    events[label] = {};
-  }
-  table = table || '*';
-  if (!events[label][table]) {
-    events[label][table] = {};
-  }
-  opt = opt || '*';
-  if (!events[label][table][opt]) {
-    events[label][table][opt] = 0;
-  }
-  events[label][table][opt]++;
-  hook.on(`${label}::${table}::${opt}`, callback);
-  return { label, table, opt, callback };
-};
-
-const eventRecur = (curr, trace, step, paths, args) => {
-  if (step === trace.length) {
-    hook.emit(paths.join('::'), ...args);
-    return;
-  }
-  const t = trace[step];
-  if (curr['*']) {
-    paths[step] = '*';
-    eventRecur(curr[t], trace, step + 1, paths, args);
-  }
-  if (curr[t]) {
-    paths[step] = t;
-    eventRecur(curr[t], trace, step + 1, paths, args);
-  }
-  return;
-};
-
-const handleEvent = (label, table, opt, ...args) => {
-  let curr = events;
-  let step = 0;
-  let trace = [label, table, opt];
-  eventRecur(curr, trace, step, [], args);
-};
-
-pushEvent({
-  label: 'before',
-  table: 'table1',
-  opt: 'insert',
-  callback: (...args) => {
-    debug.log(args);
-  }
-});
-pushEvent({
-  table: 'table1',
-  opt: 'insert',
-  callback: (...args) => {
-    debug.log(args);
-  }
-});
-pushEvent({
-  label: 'before',
-  table: 'table1',
-  callback: (...args) => {
-    debug.log(args);
-  }
-});
-pushEvent({
-  label: 'before',
-  opt: 'insert',
-  callback: (...args) => {
-    debug.log(args);
-  }
-});
-pushEvent({
-  label: 'before',
-  callback: (...args) => {
-    debug.log(args);
-  }
-});
-pushEvent({
-  table: 'table1',
-  callback: (...args) => {
-    debug.log(args);
-  }
-});
-pushEvent({
-  opt: 'insert',
-  callback: (...args) => {
-    debug.log(args);
-  }
-});
-pushEvent({
-  callback: (...args) => {
-    debug.log(args);
-  }
-});
-debug.log(JSON.stringify(events, null, 2));
-handleEvent('before', 'table1', 'insert', 1, 2, 3);

package/runtimes/test.js

@@ -1,73 +0,0 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-console */
-'use strict';
-
-const path = require('path');
-const dotenv = require('dotenv');
-dotenv.config({
-  path: path.join(__dirname, '../.env')
-});
-const { debug } = require('@axiosleo/cli-tool');
-
-const mysql = require('mysql2/promise');
-
-const { TransactionHandler } = require('../src/transaction');
-
-async function main() {
-  const items = ['RI0002', 'CB0004'];
-  const config = {
-    user: process.env.MYSQL_USER,
-    password: process.env.MYSQL_PASS,
-    host: process.env.MYSQL_HOST,
-    port: process.env.MYSQL_PORT,
-    database: process.env.MYSQL_DB,
-  };
-  const connection = await mysql.createConnection(config);
-  const transaction = new TransactionHandler(connection);
-  await transaction.begin();
-  console.log('Finished setting the isolation level to read committed');
-  try {
-    await transaction.table('product').attr('id', 'name').where('sku', items, 'IN').append('FOR UPDATE').select();
-    console.log(`Locked rows for skus ${items.join()}`);
-    const [itemsToOrder] = await transaction.table('product').attr('name', 'quantity', 'price').where('sku', items, 'IN').orderBy('id').select();
-    console.log('Selected quantities for items');
-    let orderTotal = 0;
-    let orderItems = [];
-    for (let itemToOrder of itemsToOrder) {
-      if (itemToOrder.quantity < 1) {
-        throw new Error(`One of the items is out of stock ${itemToOrder.name}`);
-      }
-      console.log(`Quantity for ${itemToOrder.name} is ${itemToOrder.quantity}`);
-      orderTotal += itemToOrder.price;
-      orderItems.push(itemToOrder.name);
-    }
-    const res = await transaction.table('sales_order').insert({
-      items: orderItems.join(),
-      total: orderTotal,
-    });
-    // const lastInsertId = res[0].insertId;
-    debug.log('result', res);
-    await debug.pause('pause', {
-      items: orderItems.join(),
-      total: orderTotal,
-    });
-    console.log('Order created');
-    await transaction.execute(
-      'UPDATE product SET quantity=quantity - 1 WHERE sku IN (?, ?)',
-      items
-    );
-    console.log(`Deducted quantities by 1 for ${items.join()}`);
-    await transaction.commit();
-    const lastInsertId = await transaction.lastInsertId('order_id');
-    debug.log(`order created with id ${lastInsertId}`);
-    return `order created with id ${lastInsertId}`;
-  } catch (err) {
-    console.error(`Error occurred while creating order: ${err.message}`, err);
-    transaction.rollback();
-    console.info('Rollback successful');
-    debug.log('error creating order');
-    return 'error creating order';
-  }
-}
-
-main();