fix: aggregator not parse null result (#322)

* fix: aggregator not parse null result

set decimalNumbers default to true for mysql2
use custom pg type parser

* Update src/drivers/postgres/index.js

Co-authored-by: Chen Yangjian <[email protected]>

src/collection.js

@@ -1,8 +1,5 @@
 'use strict';
 
-const { AGGREGATOR_MAP } = require('./constants');
-
-const AGGREGATORS = Object.values(AGGREGATOR_MAP);
 /**
  * An extended Array to represent collections of models.
  */
@@ -92,11 +89,6 @@ function dispatch(spell, rows, fields) {
       const row = rows[0];
       const record = row && (row[''] || row[table]);
       const result = record && record[value];
-      // see https://www.w3schools.com/mysql/mysql_ref_functions.asp
-      if (AGGREGATORS.includes(args[0].name)) {
-        const num = Number(result);
-        return isNaN(num) ? result : num;
-      }
       return result;
     }
   }

src/drivers/mysql/index.js

@@ -50,6 +50,7 @@ class MysqlDriver extends AbstractDriver {
     const {
       host, port, user, password,
       connectTimeout, connectionLimit, charset, stringifyObjects = true,
+      decimalNumbers = true,
     } = opts;
 
     if (client !== 'mysql' && client !== 'mysql2') {
@@ -66,6 +67,7 @@ class MysqlDriver extends AbstractDriver {
       database,
       charset,
       stringifyObjects,
+      decimalNumbers,
     });
   }
 

src/drivers/postgres/index.js

@@ -5,7 +5,7 @@ const { performance } = require('perf_hooks');
 const AbstractDriver = require('../abstract');
 const Attribute = require('./attribute');
 const DataTypes = require('./data_types');
-const { 
+const {
   escape, escapeId, formatAddColumn,
   formatAlterColumns, formatDropColumn,
   cast, nest, parameterize,
@@ -36,6 +36,9 @@ class PostgresDriver extends AbstractDriver {
 
   createPool(opts) {
     const { host, port, user, password, database } = opts;
+    // dynamic require pg type parse
+    // if not use pg, pg-types may not exits
+    require('./type_parser');
     return new (require('pg')).Pool({ host, port, user, password, database });
   }
 

src/drivers/postgres/type_parser.js

@@ -0,0 +1,7 @@
+'use strict';
+
+const pgTypes = require('pg-types');
+
+pgTypes.setTypeParser(1700, 'text', function (val) {
+    return Number(val);
+});

src/spell.js

@@ -15,8 +15,8 @@ const { AGGREGATOR_MAP } = require('./constants');
 
 /**
  * check condition to avoid use virtual fields as where condtions
- * @param {Bone} Model 
- * @param {Array<Object>} conds 
+ * @param {Bone} Model
+ * @param {Array<Object>} conds
  */
 function checkCond(Model, conds) {
   if (Array.isArray(conds)) {

test/integration/suite/querying.test.js

@@ -14,6 +14,7 @@ const Post = require('../../models/post');
 const Tag = require('../../models/tag');
 const TagMap = require('../../models/tagMap');
 const { logger } = require('../../../src/utils');
+const {max} = require('dayjs');
 
 describe('=> Query', function() {
 
@@ -652,11 +653,27 @@ describe('=> Calculations', function() {
     expect(Math.floor(maximum)).to.equal(Math.floor(29.95));
   });
 
+  it('Bone.maximum() should not parse result is null', async function() {
+    const maximum = await Book.maximum('price')
+        .where({
+          name: 'not_exists_book',
+        });
+    expect(maximum).to.be(null);
+  });
+
   it('Bone.sum()', async function() {
     const sum = await Book.sum('price');
     assert.equal(typeof sum, 'number');
     expect(Math.floor(sum)).to.equal(Math.floor(22.95 + 29.95 + 21));
   });
+
+  it('Bone.sum() should not parse result is null', async function() {
+    const sum = await Book.sum('price')
+        .where({
+          name: 'not_exists_book',
+        });
+    expect(sum).to.be(null);
+  });
 });
 
 describe('=> Batch', function() {