@axiosleo/orm-mysql 0.2.1 → 0.2.3

package/.env

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

package/.eslintrc

@@ -103,7 +103,8 @@
     "it": true,
     "before": true,
     "after": true,
-    "beforeEach": true
+    "beforeEach": true,
+    "afterEach": true
   },
   "parserOptions": {
     "ecmaVersion": 2018,
@@ -111,4 +112,4 @@
     "ecmaFeatures": {}
   },
   "extends": "eslint:recommended"
-}
+}

package/package.json

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

package/runtimes/test.js

@@ -1,25 +1,32 @@
 'use strict';
 
 const { debug } = require('@axiosleo/cli-tool');
-const mm = require('mm');
-// const expect = require('chai').expect;
-const mysql = require('mysql2');
-const { QueryHandler, Query } = require('../src/operator');
+// const mm = require('mm');
+// // const expect = require('chai').expect;
+// const mysql = require('mysql2');
+const {
+  // QueryHandler,
+  Query
+} = require('../src/operator');
 
-mm(mysql, 'createConnection', (options) => {
-  return {
+// mm(mysql, 'createConnection', (options) => {
+//   return {
 
-  };
-});
+//   };
+// });
 
-const conn = mysql.createConnection({});
-const hanlder = new QueryHandler(conn);
-// const query = hanlder.table('meta_items', 'u');
+// const conn = mysql.createConnection({});
+// const hanlder = new QueryHandler(conn);
+// // const query = hanlder.table('meta_items', 'u');
 
-const query = hanlder.table('meta_items');
-const subQuery = new Query('select');
-subQuery.table('meta_items').attr('item_code').groupBy('item_code').having('COUNT(*)', '>', 1);
-const res = query.where('item_code', subQuery, 'IN').buildSql('select');
+// const query = hanlder.table('meta_items');
+// const subQuery = new Query('select');
+// subQuery.table('meta_items').attr('item_code').groupBy('item_code').having('COUNT(*)', '>', 1);
+// const res = query.where('item_code', subQuery, 'IN').buildSql('select');
 // expect(res.sql).to.be.equal('SELECT * FROM `users` AS `u` WHERE `name` IN (SELECT * FROM `users`)');
 
-debug.log(res);
+// debug.log(res);
+
+const q = new Query();
+
+debug.log(typeof q, q instanceof Query);

package/src/query.js

@@ -11,7 +11,8 @@ class Query {
       operator,
       data: null,
       groupField: [],
-      having: []
+      having: [],
+      joins: []
     };
   }
 
@@ -80,6 +81,9 @@ class Query {
   }
 
   attr(...attr) {
+    if (!attr.length) {
+      return this;
+    }
     if (!this.options.attrs) {
       this.options.attrs = [];
     }
@@ -128,6 +132,15 @@ class Query {
   }
 
   join(table, alias, on, type) {
+    if (!alias) {
+      throw new Error('Alias is required');
+    }
+    if (!on) {
+      throw new Error('On is required');
+    }
+    if (['left', 'right', 'inner'].indexOf(type) === -1) {
+      throw new Error('Invalid join type : ' + type + '; only supported left, right, inner');
+    }
     this.options.joins.push({ table, alias, on, type });
     return this;
   }