leoric 2.6.1 → 2.6.2

package/package.json

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

package/src/constants.js

@@ -8,6 +8,8 @@ const AGGREGATOR_MAP = {
   sum: 'sum'
 };
 
+const AGGREGATORS = Object.values(AGGREGATOR_MAP);
+
 const LEGACY_TIMESTAMP_MAP = {
   gmtCreate: 'createdAt',
   gmtModified: 'updatedAt',
@@ -20,7 +22,7 @@ const LEGACY_TIMESTAMP_COLUMN_MAP = {
   deleted_at: 'gmt_deleted',
 };
 
-const TIMESTAMP_ATTRIBUTE_NAMES = [ 
+const TIMESTAMP_ATTRIBUTE_NAMES = [
   'createdAt', 'updatedAt', 'deletedAt',
   'gmtCreate', 'gmtModified', 'gmtDeleted',
   'created_at', 'updated_at', 'deleted_at',
@@ -40,5 +42,6 @@ module.exports = {
   TIMESTAMP_NAMES,
   LEGACY_TIMESTAMP_COLUMN_MAP,
   ASSOCIATE_METADATA_MAP,
-  TIMESTAMP_ATTRIBUTE_NAMES
+  TIMESTAMP_ATTRIBUTE_NAMES,
+  AGGREGATORS,
 };

package/src/drivers/abstract/spellbook.js

@@ -3,7 +3,7 @@
 const SqlString = require('sqlstring');
 
 const { copyExpr, findExpr, walkExpr } = require('../../expr');
-const { formatExpr, formatConditions, collectLiteral } = require('../../expr_formatter');
+const { formatExpr, formatConditions, collectLiteral, isAggregatorExpr } = require('../../expr_formatter');
 const Raw = require('../../raw');
 
 /**
@@ -91,10 +91,12 @@ function formatSelectExpr(spell, values) {
   const baseName = Model.tableAlias;
   const selects = new Set();
   const map = {};
+  let isAggregate = false;
 
   for (const token of columns) {
     collectLiteral(spell, token, values);
     const selectExpr = formatExpr(spell, token);
+    isAggregate = isAggregate || isAggregatorExpr(spell, token);
     const qualifier = token.qualifiers ? token.qualifiers[0] : '';
     const list = map[qualifier] || (map[qualifier] = []);
     list.push(selectExpr);
@@ -104,7 +106,7 @@ function formatSelectExpr(spell, values) {
     const list = map[qualifier];
     if (list) {
       for (const selectExpr of list) selects.add(selectExpr);
-    } else if (groups.length === 0 && Model.driver.type !== 'sqlite') {
+    } else if (groups.length === 0 && Model.driver.type !== 'sqlite' && !isAggregate) {
       selects.add(`${escapeId(qualifier)}.*`);
     }
   }
@@ -163,7 +165,7 @@ class SpellBook {
     const { escapeId } = Model.driver;
     let columns = [];
     let updateOnDuplicateColumns = [];
-  
+
     let values = [];
     let placeholders = [];
     if (Array.isArray(sets)) {
@@ -181,14 +183,14 @@ class SpellBook {
           columnAttributes.push(Model.columnAttributes[name]);
         }
       }
-  
+
       for (const entry of columnAttributes) {
         columns.push(entry.columnName);
-        if (updateOnDuplicate && createdAt && entry.name === createdAt 
+        if (updateOnDuplicate && createdAt && entry.name === createdAt
           && !(Array.isArray(updateOnDuplicate) && updateOnDuplicate.includes(createdAt))) continue;
         updateOnDuplicateColumns.push(entry.columnName);
       }
-  
+
       for (const entry of sets) {
         if (shardingKey && entry[shardingKey] == null) {
           throw new Error(`Sharding key ${Model.table}.${shardingKey} cannot be NULL.`);
@@ -199,7 +201,7 @@ class SpellBook {
         }
         placeholders.push(`(${new Array(columnAttributes.length).fill('?').join(',')})`);
       }
-  
+
     } else {
       if (shardingKey && sets[shardingKey] == null) {
         throw new Error(`Sharding key ${Model.table}.${shardingKey} cannot be NULL.`);
@@ -216,10 +218,10 @@ class SpellBook {
         updateOnDuplicateColumns.push(Model.unalias(name));
       }
     }
-  
-  
+
+
     const chunks = ['INSERT'];
-  
+
     // see https://dev.mysql.com/doc/refman/8.0/en/optimizer-hints.html
     const hintStr = this.formatOptimizerHints(spell);
     if (hintStr) {

package/src/expr_formatter.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { precedes, walkExpr } = require('./expr');
+const { AGGREGATORS } = require('./constants');
 
 /**
  * Find model by qualifiers.
@@ -65,6 +66,31 @@ function formatLiteral(spell, ast) {
   return '?';
 }
 
+/**
+ * Format the abstract syntax tree of an expression into escaped string.
+ * @param {Spell}  spell
+ * @param {Object} ast
+ */
+function isAggregatorExpr(spell, ast) {
+  const { type, name, args } = ast;
+  switch (type) {
+    case 'literal':
+    case 'subquery':
+    case 'wildcard':
+    case 'mod':
+    case 'id':
+    case 'raw':
+    case 'op':
+      return false;
+    case 'alias':
+      return isAggregatorExpr(spell, args[0]);
+    case 'func':
+      return AGGREGATORS.includes(name);
+    default:
+      throw new Error(`Unexpected type ${type}`);
+  }
+}
+
 /**
  * Format the abstract syntax tree of an expression into escaped string.
  * @param {Spell}  spell
@@ -216,4 +242,4 @@ function coerceLiteral(spell, ast) {
   }
 }
 
-module.exports = { formatExpr, formatConditions, collectLiteral };
+module.exports = { formatExpr, formatConditions, collectLiteral, isAggregatorExpr };

package/types/index.d.ts

@@ -205,6 +205,11 @@ interface QueryOptions {
   hooks?: boolean;
   paranoid?: boolean;
   silent?: boolean;
+  connection?: Connection;
+}
+
+interface TransactionOptions {
+  connection: Connection;
 }
 
 interface QueryResult {
@@ -214,7 +219,7 @@ interface QueryResult {
   fields?: Array<{ table: string, name: string }>,
 }
 
-interface Connection {
+export interface Connection {
   /**
    * MySQL
    */
@@ -322,10 +327,10 @@ declare class AbstractDriver {
    * @param callback
    */
   disconnect(callback?: Function): Promise<boolean | void>;
-  
+
   /**
    * query with spell
-   * @param spell 
+   * @param spell
    */
   cast(spell: Spell<typeof Bone, ResultSet | number | null>): Promise<QueryResult>;
 
@@ -424,7 +429,7 @@ declare class AbstractDriver {
    * remove index in table
    * @param table string
    * @param attributes attributes name
-   * @param opts 
+   * @param opts
    */
   removeIndex(table: string, attributes: string[], opts?: { unique?: boolean, type?: string }): Promise<void>;
 
@@ -695,7 +700,7 @@ export class Bone {
    * });
    */
   static transaction(callback: GeneratorFunction): Promise<RawQueryResult>;
-  static transaction(callback: (connection: Connection) => Promise<RawQueryResult>): Promise<RawQueryResult>;
+  static transaction(callback: (connection: TransactionOptions) => Promise<RawQueryResult | void>): Promise<RawQueryResult>;
 
   /**
    * DROP the table