@axiosleo/orm-mysql 0.9.7 → 0.9.9

package/bin/orm-mysql.js

@@ -9,7 +9,7 @@ const app = new App({
   name: 'MySQL ORM CLI',
   desc: 'migrate, model, seed, etc.',
   bin: 'orm-mysql',
-  version: '0.9.7',
+  version: '0.9.9',
   commands_dir: path.join(__dirname, '../commands'),
 });
 

package/index.d.ts

@@ -101,7 +101,7 @@ export declare class Query {
 
   andWhere(key: string | null, opt: OptType, value: ConditionValueType | WhereOptions[]): this;
 
-  attr(...attr: Attr[]): this;
+  attr(...attr: Attr[] | Attr[][]): this;
 
   orderBy(sortField: string, sortOrder: 'asc' | 'desc'): this;
 
@@ -365,7 +365,7 @@ export declare class MigrationInterface {
     autoIncrement?: boolean,
     primaryKey?: boolean,
     uniqIndex?: boolean,
-    after?: string
+    after?: string,
   }): void;
 
   createIndex(tableName: string, columns: string[], options?: {

package/package.json

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

package/src/builder.js

@@ -150,6 +150,7 @@ class Builder {
         table = `\`${table}\``;
       }
       let sql = '';
+      join_type = join_type.toLowerCase();
       switch (join_type) {
         case 'left':
           sql = 'LEFT JOIN ';
@@ -370,9 +371,6 @@ class ManageSQLBuilder extends Builder {
     if (is.empty(options.columns)) {
       throw new Error('At least one column is required');
     }
-    if (!Object.values(options.columns).find(c => c.primaryKey === true)) {
-      throw new Error('At least one primary key column is required');
-    }
     let columns = Object.keys(options.columns).map(name => {
       return { name, ...options.columns[name] };
     });
@@ -386,20 +384,9 @@ class ManageSQLBuilder extends Builder {
   }
 
   createColumn(options) {
-    _validate(options, {
-      table: 'required|string',
-      name: 'required|string',
-      type: 'required|string',
-      length: 'integer',
-      unsigned: 'boolean',
-      allowNull: 'boolean',
-      default: 'string',
-      comment: 'string',
-      autoIncrement: 'boolean',
-      primaryKey: 'boolean',
-      uniqIndex: 'boolean',
-      after: 'string'
-    });
+    if (!options.table) {
+      throw new Error('Table name is required');
+    }
     return `ALTER TABLE \`${options.table}\` ADD COLUMN ` + this.renderSingleColumn(options);
   }
 
@@ -430,6 +417,8 @@ class ManageSQLBuilder extends Builder {
   }
 
   createForeignKey(options) {
+    options.reference.onDelete = options.reference.onDelete ? options.reference.onDelete.toUpperCase() : 'NO ACTION';
+    options.reference.onUpdate = options.reference.onUpdate ? options.reference.onUpdate.toUpperCase() : 'NO ACTION';
     _validate(options, {
       name: 'required|string',
       table: 'required|string',
@@ -558,6 +547,8 @@ class ManageSQLBuilder extends Builder {
       str += '(11)';
     } else if (type === 'VARCHAR') {
       str += '(255)';
+    } else if (type === 'TINYINT') {
+      str += '(4)';
     }
     if (options.allowNull === false) {
       str += ' NOT NULL';

package/src/query.js

@@ -2,7 +2,6 @@
 
 const { _assign } = require('@axiosleo/cli-tool/src/helper/obj');
 const { _validate } = require('./utils');
-const is = require('@axiosleo/cli-tool/src/helper/is');
 
 function joinOn(table, on, options = {}) {
   let o = _assign({ alias: null, join_type: 'INNER', table, on }, options);
@@ -24,6 +23,7 @@ class Query {
       conditions: [],
       orders: [],
       tables: [],
+      attrs: [],
       operator,
       data: null,
       groupField: [],
@@ -124,18 +124,12 @@ class Query {
     return this;
   }
 
-  attr(...attr) {
-    if (attr.length === 1 && is.array(attr)) {
-      this.options.attrs = attr;
-      return this;
-    }
-    if (!attr.length) {
-      return this;
-    }
-    if (!this.options.attrs) {
+  attr(...attrs) {
+    if (!attrs.length) {
       this.options.attrs = [];
+      return this;
     }
-    this.options.attrs.push(...attr);
+    this.options.attrs = attrs;
     return this;
   }