leoric 1.14.4 → 1.15.0

package/History.md

@@ -1,3 +1,13 @@
+1.15.0 / 2021-11-22
+===================
+
+## What's Changed
+* feat: make duration in precise milliseconds by @fengmk2 in https://github.com/cyjake/leoric/pull/236
+* fix: spell.increment() & spell.decrement() @cyjake https://github.com/cyjake/leoric/pull/234
+* fix: bulkCreate should adapte empty data @JimmyDaddy  https://github.com/cyjake/leoric/pull/232
+
+**Full Changelog**: https://github.com/cyjake/leoric/compare/v1.14.4...v1.14.5
+
 1.14.4 / 2021-11-15
 ===================
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leoric",
-  "version": "1.14.4",
+  "version": "1.15.0",
   "description": "JavaScript Object-relational mapping alchemy",
   "main": "index.js",
   "types": "types/index.d.ts",

package/src/bone.js

@@ -1322,6 +1322,7 @@ class Bone {
   }
 
   static async bulkCreate(records, options = {}) {
+    if (!records || !records.length) return records;
     const { driver, attributes, primaryKey, primaryColumn } = this;
 
     const { createdAt, updatedAt } = this.timestamps;

package/src/collection.js

@@ -11,7 +11,8 @@ class Collection extends Array {
    * @param {Array} fields
    * @returns {Collection|Array}
    */
-  static init({ spell, rows, fields }) {
+  static init({ spell, rows, fields, insertId, affectedRows}) {
+    if (spell.command !== 'select') return { insertId, affectedRows };
     return dispatch(spell, rows, fields);
   }
 

package/src/drivers/mysql/index.js

@@ -1,10 +1,13 @@
 'use strict';
 
+const { performance } = require('perf_hooks');
+
 const AbstractDriver = require('../abstract');
 const Attribute = require('./attribute');
 const DataTypes = require('./data_types');
 const spellbook = require('./spellbook');
 const schema = require('./schema');
+const { calculateDuration } = require('../../utils');
 
 class MysqlDriver extends AbstractDriver {
   /**
@@ -84,19 +87,19 @@ class MysqlDriver extends AbstractDriver {
       });
     });
     const sql = logger.format(query, values, opts);
-    const start = Date.now();
+    const start = performance.now();
     let result;
 
     try {
       result = await promise;
     } catch (err) {
-      logger.logQueryError(sql, err, Date.now() - start, opts);
+      logger.logQueryError(sql, err, calculateDuration(start), opts);
       throw err;
     } finally {
       if (!opts.connection) connection.release();
     }
 
-    logger.tryLogQuery(sql, Date.now() - start, opts);
+    logger.tryLogQuery(sql, calculateDuration(start), opts);
     const [ results, fields ] = result;
     if (fields) return { rows: results, fields };
     return results;

package/src/drivers/postgres/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { Pool } = require('pg');
+const { performance } = require('perf_hooks');
 
 const AbstractDriver = require('../abstract');
 const Attribute = require('./attribute');
@@ -8,6 +9,7 @@ const DataTypes = require('./data_types');
 const { escape, escapeId } = require('./sqlstring');
 const spellbook = require('./spellbook');
 const schema = require('./schema');
+const { calculateDuration } = require('../../utils');
 
 /**
  * The actual column type can be found by mapping the `oid` (which is called `dataTypeID`) in the `RowDescription`.
@@ -129,19 +131,19 @@ class PostgresDriver extends AbstractDriver {
 
     async function tryQuery(...args) {
       const formatted = logger.format(sql, values, spell);
-      const start = new Date();
+      const start = performance.now();
       let result;
 
       try {
         result = await connection.query(...args);
       } catch (err) {
-        logger.logQueryError(formatted, err, Date.now() - start, spell);
+        logger.logQueryError(formatted, err, calculateDuration(start), spell);
         throw err;
       } finally {
         if (!spell.connection) connection.release();
       }
 
-      logger.tryLogQuery(formatted, Date.now() - start, spell);
+      logger.tryLogQuery(formatted, calculateDuration(start), spell);
       return result;
     }
 

package/src/drivers/sqlite/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const strftime = require('strftime');
+const { performance } = require('perf_hooks');
 
 const AbstractDriver = require('../abstract');
 const Attribute = require('./attribute');
@@ -9,6 +10,7 @@ const { escapeId, escape } = require('./sqlstring');
 const schema = require('./schema');
 const spellbook = require('./spellbook');
 const Pool = require('./pool');
+const { calculateDuration } = require('../../utils');
 
 class SqliteDriver extends AbstractDriver {
   constructor(opts = {}) {
@@ -40,19 +42,19 @@ class SqliteDriver extends AbstractDriver {
 
     const { logger } = this;
     const sql = logger.format(query, values, opts);
-    const start = Date.now();
+    const start = performance.now();
     let result;
 
     try {
       result = await connection.query(query, values, opts);
     } catch (err) {
-      logger.logQueryError(sql, err, Date.now() - start, opts);
+      logger.logQueryError(sql, err, calculateDuration(start), opts);
       throw err;
     } finally {
       if (!opts.connection) connection.release();
     }
 
-    logger.tryLogQuery(sql, Date.now() - start, opts);
+    logger.tryLogQuery(sql, calculateDuration(start), opts);
     return result;
   }
 

package/src/utils/index.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { performance } = require('perf_hooks');
+
 function isPlainObject(value) {
   return Object.prototype.toString.call(value) === '[object Object]';
 }
@@ -28,6 +30,11 @@ function getPropertyNames(obj) {
   return Array.from(propertyNamesSet);
 }
 
+// microseconds to millisecond, 10.456
+function calculateDuration(starttime) {
+  return Math.floor((performance.now() - starttime) * 1000) / 1000;
+}
+
 const logger = {};
 
 [ 'log', 'warn', 'debug', 'info', 'error' ].forEach(key => {
@@ -40,5 +47,6 @@ module.exports = {
   isPlainObject,
   compose,
   getPropertyNames,
+  calculateDuration,
   logger,
 };

package/types/index.d.ts

@@ -107,6 +107,9 @@ export class Spell<T extends typeof Bone, U = InstanceType<T> | Collection<Insta
 
   batch(size?: number): AsyncIterable<T>;
 
+  increment(name: string, by?: number, options?: QueryOptions): Spell<T, number>;
+  decrement(name: string, by?: number, options?: QueryOptions): Spell<T, number>;
+
   toSqlString(): string;
   toString(): string;
 }
@@ -158,6 +161,7 @@ interface QueryOptions {
   individualHooks?: boolean;
   hooks?: boolean;
   paranoid?: boolean;
+  silent?: boolean;
 }
 
 interface QueryResult {