alasql 2.1.7 → 2.2.0

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.1.6-develop-8399ae92 | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.1.8-develop-7e87d661 | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 2.1.6-develop-8399ae92
+@version 2.1.8-develop-7e87d661
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '2.1.6-develop-8399ae92';
+alasql.version = '2.1.8-develop-7e87d661';
 
 /**
 	Debug flag
@@ -3178,64 +3178,64 @@ alasql.pretty = function (sql, flag) {
 var utils = (alasql.utils = {});
 
 /**
- Convert NaN to undefined
- @function
- @param {string} s JavaScript string to be modified
- @return {string} Covered expression
+  Convert NaN to undefined
+  @function
+  @param {string} s JavaScript string to be modified
+  @return {string} Covered expression
 
- @example
+  @example
 
- 123         => 123
- undefined   => undefined
- NaN         => undefined
+  123         => 123
+  undefined   => undefined
+  NaN         => undefined
 
- */
+  */
 function n2u(s) {
 	return '(y=' + s + ',y===y?y:undefined)';
 }
 
 /**
- Return undefined if s undefined
- @param {string} s JavaScript string to be modified
- @return {string} Covered expression
+  Return undefined if s undefined
+  @param {string} s JavaScript string to be modified
+  @return {string} Covered expression
 
- @example
+  @example
 
- 123,a       => a
- undefined,a => undefined
- NaN,a       => undefined
+  123,a       => a
+  undefined,a => undefined
+  NaN,a       => undefined
 
- */
+  */
 function und(s, r) {
 	return '(y=' + s + ',typeof y=="undefined"?undefined:' + r + ')';
 }
 
 /**
- Return always true. Stub for non-ecisting WHERE clause, because is faster then if(whenrfn) whenfn()
- @function
- @return {boolean} Always true
- */
+  Return always true. Stub for non-ecisting WHERE clause, because is faster then if(whenrfn) whenfn()
+  @function
+  @return {boolean} Always true
+  */
 function returnTrue() {
 	return true;
 }
 
 /**
- Return undefined. Stub for non-ecisting WHERE clause, because is faster then if(whenrfn) whenfn()
- @function
- @return {undefined} Always undefined
- */
+  Return undefined. Stub for non-ecisting WHERE clause, because is faster then if(whenrfn) whenfn()
+  @function
+  @return {undefined} Always undefined
+  */
 function returnUndefined() {}
 
 /**
- Escape string
- @function
- @param {string} s Source string
- @return {string} Escaped string
- @example
+  Escape string
+  @function
+  @param {string} s Source string
+  @return {string} Escaped string
+  @example
 
- Pit\er's => Pit\\er\'s
+  Pit\er's => Pit\\er\'s
 
- */
+  */
 // based on joliss/js-string-escape
 var escapeq = (utils.escapeq = function (s) {
 
@@ -3262,49 +3262,49 @@ var escapeq = (utils.escapeq = function (s) {
 });
 
 /**
- Double quotes for SQL statements
- @param {string} s Source string
- @return {string} Escaped string
+  Double quotes for SQL statements
+  @param {string} s Source string
+  @return {string} Escaped string
 
- @example
+  @example
 
- Piter's => Piter''s
+  Piter's => Piter''s
 
- */
+  */
 var escapeqq = (utils.undoubleq = function (s) {
 	return s.replace(/(\')/g, "''");
 });
 
 /**
- Replace double quotes with single quote
- @param {string} s Source string
- @return {string} Replaced string
- @example
+  Replace double quotes with single quote
+  @param {string} s Source string
+  @return {string} Replaced string
+  @example
 
- Piter''s => Piter's
+  Piter''s => Piter's
 
- */
+  */
 var doubleq = (utils.doubleq = function (s) {
 	return s.replace(/(\'\')/g, "\\'");
 });
 
 /**
- Replace sigle quote to escaped single quote
- @param {string} s Source string
- @return {string} Replaced string
+  Replace sigle quote to escaped single quote
+  @param {string} s Source string
+  @return {string} Replaced string
 
- @todo Chack this functions
+  @todo Chack this functions
 
- */
+  */
 var doubleqq = (utils.doubleqq = function (s) {
 	return s.replace(/\'/g, "'");
 });
 
 /**
- Cut BOM first character for UTF-8 files (for merging two files)
- @param {string} s Source string
- @return {string} Replaced string
- */
+  Cut BOM first character for UTF-8 files (for merging two files)
+  @param {string} s Source string
+  @return {string} Replaced string
+  */
 
 var cutbom = function (s) {
 	if (s[0] === String.fromCharCode(65279)) {
@@ -3314,10 +3314,10 @@ var cutbom = function (s) {
 };
 
 /**
- Get the global scope
- Inspired by System.global
- @return {object} The global scope
- */
+  Get the global scope
+  Inspired by System.global
+  @return {object} The global scope
+  */
 utils.global = (function () {
 	if (typeof self !== 'undefined') {
 		return self;
@@ -3332,18 +3332,18 @@ utils.global = (function () {
 })();
 
 /**
- Find out if a function is native to the enviroment
- @param {function} Function to check
- @return {boolean} True if function is native
- */
+  Find out if a function is native to the enviroment
+  @param {function} Function to check
+  @return {boolean} True if function is native
+  */
 var isNativeFunction = (utils.isNativeFunction = function (fn) {
 	return typeof fn === 'function' && !!~fn.toString().indexOf('[native code]');
 });
 
 /**
- Find out if code is running in a web worker enviroment
- @return {boolean} True if code is running in a web worker enviroment
- */
+  Find out if code is running in a web worker enviroment
+  @return {boolean} True if code is running in a web worker enviroment
+  */
 utils.isWebWorker = (function () {
 	try {
 		var importScripts = utils.global.importScripts;
@@ -3354,9 +3354,9 @@ utils.isWebWorker = (function () {
 })();
 
 /**
- Find out if code is running in a node enviroment
- @return {boolean} True if code is running in a node enviroment
- */
+  Find out if code is running in a node enviroment
+  @return {boolean} True if code is running in a node enviroment
+  */
 utils.isNode = (function () {
 	try {
 		return utils.isNativeFunction(utils.global.process.reallyExit);
@@ -3366,9 +3366,9 @@ utils.isNode = (function () {
 })();
 
 /**
- Find out if code is running in a browser enviroment
- @return {boolean} True if code is running in a browser enviroment
- */
+  Find out if code is running in a browser enviroment
+  @return {boolean} True if code is running in a browser enviroment
+  */
 utils.isBrowser = (function () {
 	try {
 		return utils.isNativeFunction(utils.global.location.reload);
@@ -3378,17 +3378,17 @@ utils.isBrowser = (function () {
 })();
 
 /**
- Find out if code is running in a browser with a browserify setup
- @return {boolean} True if code is running in a browser with a browserify setup
- */
+  Find out if code is running in a browser with a browserify setup
+  @return {boolean} True if code is running in a browser with a browserify setup
+  */
 utils.isBrowserify = (function () {
 	return utils.isBrowser && typeof process !== 'undefined' && process.browser;
 })();
 
 /**
- Find out if code is running in a browser with a requireJS setup
- @return {boolean} True if code is running in a browser with a requireJS setup
- */
+  Find out if code is running in a browser with a requireJS setup
+  @return {boolean} True if code is running in a browser with a requireJS setup
+  */
 utils.isRequireJS = (function () {
 	return (
 		utils.isBrowser && typeof require === 'function' && typeof require.specified === 'function'
@@ -3396,37 +3396,37 @@ utils.isRequireJS = (function () {
 })();
 
 /**
- Find out if code is running with Meteor in the enviroment
- @return {boolean} True if code is running with Meteor in the enviroment
+  Find out if code is running with Meteor in the enviroment
+  @return {boolean} True if code is running with Meteor in the enviroment
 
- @todo Find out if this is the best way to do this
- */
+  @todo Find out if this is the best way to do this
+  */
 utils.isMeteor = (function () {
 	return typeof Meteor !== 'undefined' && Meteor.release;
 })();
 
 /**
- Find out if code is running on a Meteor client
- @return {boolean} True if code is running on a Meteor client
- */
+  Find out if code is running on a Meteor client
+  @return {boolean} True if code is running on a Meteor client
+  */
 utils.isMeteorClient = utils.isMeteorClient = (function () {
 	return utils.isMeteor && Meteor.isClient;
 })();
 
 /**
- Find out if code is running on a Meteor server
- @return {boolean} True if code is running on a Meteor server
- */
+  Find out if code is running on a Meteor server
+  @return {boolean} True if code is running on a Meteor server
+  */
 utils.isMeteorServer = (function () {
 	return utils.isMeteor && Meteor.isServer;
 })();
 
 /**
- Find out code is running in a cordovar enviroment
- @return {boolean} True if code is running in a web worker enviroment
+  Find out code is running in a cordovar enviroment
+  @return {boolean} True if code is running in a web worker enviroment
 
- @todo Find out if this is the best way to do this
- */
+  @todo Find out if this is the best way to do this
+  */
 utils.isCordova = (function () {
 	return typeof cordova === 'object';
 })();
@@ -3453,16 +3453,16 @@ utils.isArray = function (obj) {
 	return '[object Array]' === Object.prototype.toString.call(obj);
 };
 /**
- Load text file from anywhere
- @param {string|object} path File path or HTML event
- @param {boolean} asy True - async call, false - sync call
- @param {function} success Success function
- @param {function} error Error function
- @return {string} Read data
-
- @todo Define Event type
- @todo Smaller if-else structures.
- */
+  Load text file from anywhere
+  @param {string|object} path File path or HTML event
+  @param {boolean} asy True - async call, false - sync call
+  @param {function} success Success function
+  @param {function} error Error function
+  @return {string} Read data
+
+  @todo Define Event type
+  @todo Smaller if-else structures.
+  */
 var loadFile = (utils.loadFile = function (path, asy, success, error) {
 	var data, fs;
 	if (utils.isNode || utils.isMeteorServer) {
@@ -3547,16 +3547,16 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 		if (typeof path === 'string') {
 			// For browser read from tag
 			/*
-                SELECT * FROM TXT('#one') -- read data from HTML element with id="one"
-            */
+				 SELECT * FROM TXT('#one') -- read data from HTML element with id="one"
+			 */
 			if (path.substr(0, 1) === '#' && typeof document !== 'undefined') {
 				data = document.querySelector(path).textContent;
 				success(data);
 			} else {
 				/*
-                    Simply read file from HTTP request, like:
-                    SELECT * FROM TXT('http://alasql.org/README.md');
-                */
+					 Simply read file from HTTP request, like:
+					 SELECT * FROM TXT('http://alasql.org/README.md');
+				 */
 				var xhr = new XMLHttpRequest();
 				xhr.onreadystatechange = function () {
 					if (xhr.readyState === 4) {
@@ -3576,14 +3576,14 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 			}
 		} else if (path instanceof Event) {
 			/*
-                For browser read from files input element
-                <input type="files" onchange="readFile(event)">
-                <script>
-                    function readFile(event) {
-                        alasql('SELECT * FROM TXT(?)',[event])
-                    }
-                </script>
-            */
+				 For browser read from files input element
+				 <input type="files" onchange="readFile(event)">
+				 <script>
+					 function readFile(event) {
+						 alasql('SELECT * FROM TXT(?)',[event])
+					 }
+				 </script>
+			 */
 			/** @type {array} List of files from <input> element */
 			var files = path.target.files;
 			/** type {object} */
@@ -3600,15 +3600,15 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 });
 
 /**
- @function Load binary file from anywhere
- @param {string} path File path
- @param {boolean} asy True - async call, false - sync call
- @param {function} success Success function
- @param {function} error Error function
- @return 1 for Async, data - for sync version
-
- @todo merge functionality from loadFile and LoadBinaryFile
- */
+  @function Load binary file from anywhere
+  @param {string} path File path
+  @param {boolean} asy True - async call, false - sync call
+  @param {function} success Success function
+  @param {function} error Error function
+  @return 1 for Async, data - for sync version
+
+  @todo merge functionality from loadFile and LoadBinaryFile
+  */
 
 var loadBinaryFile = (utils.loadBinaryFile = function (
 	path,
@@ -3808,12 +3808,12 @@ var fileExists = (utils.fileExists = function (path, cb) {
 });
 
 /**
- Save text file from anywhere
- @param {string} path File path
- @param {array} data Data object
- @param {function} cb Callback
- @param {object=} opts
- */
+  Save text file from anywhere
+  @param {string} path File path
+  @param {array} data Data object
+  @param {function} cb Callback
+  @param {object=} opts
+  */
 
 var saveFile = (utils.saveFile = function (path, data, cb, opts) {
 	var res = 1;
@@ -3895,21 +3895,21 @@ var saveFile = (utils.saveFile = function (path, data, cb, opts) {
 });
 
 /**
- @function Is this IE9
- @return {boolean} True for IE9 and false for other browsers
+  @function Is this IE9
+  @return {boolean} True for IE9 and false for other browsers
 
- For IE9 compatibility issues
- */
+  For IE9 compatibility issues
+  */
 function isIE() {
 	var myNav = navigator.userAgent.toLowerCase();
 	return myNav.indexOf('msie') !== -1 ? parseInt(myNav.split('msie')[1]) : false;
 }
 
 /**
- @function Hash a string to signed integer
- @param {string} source string
- @return {integer} hash number
- */
+  @function Hash a string to signed integer
+  @param {string} source string
+  @return {integer} hash number
+  */
 
 // FNV-1a inspired hashing
 var hash = (utils.hash = function (str) {
@@ -3923,12 +3923,12 @@ var hash = (utils.hash = function (str) {
 });
 
 /**
- Union arrays
- @function
- @param {array} a
- @param {array} b
- @return {array}
- */
+  Union arrays
+  @function
+  @param {array} a
+  @param {array} b
+  @return {array}
+  */
 var arrayUnion = (utils.arrayUnion = function (a, b) {
 	var r = b.slice(0);
 	a.forEach(function (i) {
@@ -3940,8 +3940,8 @@ var arrayUnion = (utils.arrayUnion = function (a, b) {
 });
 
 /**
- Array Difference
- */
+  Array Difference
+  */
 var arrayDiff = (utils.arrayDiff = function (a, b) {
 	return a.filter(function (i) {
 		return b.indexOf(i) < 0;
@@ -3949,8 +3949,8 @@ var arrayDiff = (utils.arrayDiff = function (a, b) {
 });
 
 /**
- Arrays deep intersect (with records)
- */
+  Arrays deep intersect (with records)
+  */
 var arrayIntersect = (utils.arrayIntersect = function (a, b) {
 	var r = [];
 	a.forEach(function (ai) {
@@ -3968,8 +3968,8 @@ var arrayIntersect = (utils.arrayIntersect = function (a, b) {
 });
 
 /**
- Arrays deep union (with records)
- */
+  Arrays deep union (with records)
+  */
 var arrayUnionDeep = (utils.arrayUnionDeep = function (a, b) {
 	var r = b.slice(0);
 	a.forEach(function (ai) {
@@ -3988,8 +3988,8 @@ var arrayUnionDeep = (utils.arrayUnionDeep = function (a, b) {
 });
 
 /**
- Arrays deep union (with records)
- */
+  Arrays deep union (with records)
+  */
 var arrayExceptDeep = (utils.arrayExceptDeep = function (a, b) {
 	var r = [];
 	a.forEach(function (ai) {
@@ -4008,8 +4008,8 @@ var arrayExceptDeep = (utils.arrayExceptDeep = function (a, b) {
 });
 
 /**
- Arrays deep intersect (with records)
- */
+  Arrays deep intersect (with records)
+  */
 var arrayIntersectDeep = (utils.arrayIntersectDeep = function (a, b) {
 	var r = [];
 	a.forEach(function (ai) {
@@ -4028,8 +4028,8 @@ var arrayIntersectDeep = (utils.arrayIntersectDeep = function (a, b) {
 });
 
 /**
- Deep clone objects
- */
+  Deep clone objects
+  */
 var cloneDeep = (utils.cloneDeep = function cloneDeep(obj) {
 	if (null === obj || typeof obj !== 'object') {
 		return obj;
@@ -4058,12 +4058,12 @@ var cloneDeep = (utils.cloneDeep = function cloneDeep(obj) {
 });
 
 /**
- Check equality of objects
- */
+  Check equality of objects
+  */
 
 /**
- Compare two objects in deep
- */
+  Compare two objects in deep
+  */
 var deepEqual = (utils.deepEqual = function (x, y) {
 	if (x === y) {
 		return true;
@@ -4084,10 +4084,10 @@ var deepEqual = (utils.deepEqual = function (x, y) {
 	return false;
 });
 /**
- Array with distinct records
- @param {array} data
- @return {array}
- */
+  Array with distinct records
+  @param {array} data
+  @return {array}
+  */
 var distinctArray = (utils.distinctArray = function (data) {
 	var uniq = {};
 	// TODO: Speedup, because Object.keys is slow
@@ -4113,12 +4113,12 @@ var distinctArray = (utils.distinctArray = function (data) {
 });
 
 /**
- Extend object a with properties of b
- @function
- @param {object} a
- @param {object} b
- @return {object}
- */
+  Extend object a with properties of b
+  @function
+  @param {object} a
+  @param {object} b
+  @return {object}
+  */
 var extend = (utils.extend = function extend(a, b) {
 	a = a || {};
 	for (var key in b) {
@@ -4139,8 +4139,8 @@ var getValueOf = (utils.getValueOf = function (val) {
 });
 
 /**
- Flat array by first row
- */
+  Flat array by first row
+  */
 var flatArray = (utils.flatArray = function (a) {
 
 	if (!a || 0 === a.length) {
@@ -4164,8 +4164,8 @@ var flatArray = (utils.flatArray = function (a) {
 });
 
 /**
- Convert array of objects to array of arrays
- */
+  Convert array of objects to array of arrays
+  */
 var arrayOfArrays = (utils.arrayOfArrays = function (a) {
 	return a.map(function (aa) {
 		var ar = [];
@@ -4183,12 +4183,18 @@ if (!Array.isArray) {
 }
 
 /**
- Excel:convert number to Excel column, like 1 => 'A'
- @param {integer} i Column number, starting with 0
- @return {string} Column name, starting with 'A'
- */
+  Excel:convert number to Excel column, like 1 => 'A'
+  @param {integer} i Column number, starting with 0
+  @return {string} Column name, starting with 'A'
+  */
 
 var xlsnc = (utils.xlsnc = function (i) {
+	var first = '';
+	if (i > 701) {
+		let x = (((i - 26) / (26 * 26)) | 0) - 1;
+		first = String.fromCharCode(65 + (x % 26));
+		i = i % (26 * 26);
+	}
 	var addr = String.fromCharCode(65 + (i % 26));
 	if (i >= 26) {
 		i = ((i / 26) | 0) - 1;
@@ -4198,14 +4204,14 @@ var xlsnc = (utils.xlsnc = function (i) {
 			addr = String.fromCharCode(65 + (i % 26)) + addr;
 		}
 	}
-	return addr;
+	return first + addr;
 });
 
 /**
- Excel:conver Excel column name to number
- @param {string} s Column number, like 'A' or 'BE'
- @return {string} Column name, starting with 0
- */
+  Excel:conver Excel column name to number
+  @param {string} s Column number, like 'A' or 'BE'
+  @return {string} Column name, starting with 0
+  */
 var xlscn = (utils.xlscn = function (s) {
 	var n = s.charCodeAt(0) - 65;
 	if (s.length > 1) {
@@ -4226,12 +4232,12 @@ var domEmptyChildren = (utils.domEmptyChildren = function (container) {
 });
 
 /**
- SQL LIKE emulation
- @parameter {string} pattern Search pattern
- @parameter {string} value Searched value
- @parameter {string} escape Escape character (optional)
- @return {boolean} If value LIKE pattern ESCAPE escape
- */
+  SQL LIKE emulation
+  @parameter {string} pattern Search pattern
+  @parameter {string} value Searched value
+  @parameter {string} escape Escape character (optional)
+  @return {boolean} If value LIKE pattern ESCAPE escape
+  */
 
 var like = (utils.like = function (pattern, value, escape) {
 	// Verify escape character
@@ -4302,9 +4308,9 @@ utils.glob = function (value, pattern) {
 };
 
 /**
- Get path of alasql.js
- @todo Rewrite and simplify the code. Review, is this function is required separately
- */
+  Get path of alasql.js
+  @todo Rewrite and simplify the code. Review, is this function is required separately
+  */
 utils.findAlaSQLPath = function () {
 	/** type {string} Path to alasql library and plugins */
 
@@ -6579,8 +6585,10 @@ function queryfn3(query) {
 			if (query.selectGroup.length > 0) {
 
 				query.selectGroup.forEach(function (sg) {
-					if (sg.aggregatorid == 'COUNT' || sg.aggregatorid == 'SUM') {
+					if (sg.aggregatorid == 'COUNT') {
 						g[sg.nick] = 0;
+					} else if (sg.aggregatorid == 'SUM') {
+						g[sg.nick] = 'NULL';
 					} else {
 						g[sg.nick] = undefined;
 					}
@@ -8703,16 +8711,93 @@ yy.Select.prototype.compileGroup = function (query) {
 							",g['$$_VALUES_" + colas + "']={},g['$$_VALUES_" + colas + "'][" + colexp + ']=true';
 					}
 					if (col.aggregatorid === 'SUM') {
-						return "'" + colas + "':(" + colexp + ')||0,';
+						if ('funcid' in col.expression) {
+							let colexpression = col.expression.args[0];
+							let colexp1 = colexpression.toJS('p', tableid, defcols);
+							return "'" + colas + "':(" + colexp1 + ')||null,';
+						}
+						return "'" + colas + "':(" + colexp + ')||null,';
 					} else if (
-						col.aggregatorid === 'MIN' ||
-						col.aggregatorid === 'MAX' ||
 						col.aggregatorid === 'FIRST' ||
 						col.aggregatorid === 'LAST'
 						//					|| col.aggregatorid == 'AVG'
 						//							) { return "'"+col.as+'\':r[\''+col.as+'\'],'; }//f.field.arguments[0].toJS();
 					) {
 						return "'" + colas + "':" + colexp + ','; //f.field.arguments[0].toJS();
+					} else if (col.aggregatorid === 'MIN') {
+						if ('funcid' in col.expression) {
+							let colexpression = col.expression.args[0];
+							let colexp1 = colexpression.toJS('p', tableid, defcols);
+							return (
+								"'" +
+								colas +
+								"': (typeof " +
+								colexp1 +
+								" == 'number' ? " +
+								colexp1 +
+								': typeof ' +
+								colexp1 +
+								" == 'object' ? typeof Number(" +
+								colexp1 +
+								") == 'number' && " +
+								colexp1 +
+								'!== null?  ' +
+								colexp1 +
+								' : null : null),'
+							);
+						}
+						return (
+							"'" +
+							colas +
+							"': (typeof " +
+							colexp +
+							" == 'number' ? " +
+							colexp +
+							': typeof ' +
+							colexp +
+							" == 'object' ? typeof Number(" +
+							colexp +
+							") == 'number' && " +
+							colexp +
+							'!== null?  ' +
+							colexp +
+							' : null : null),'
+						);
+					} else if (col.aggregatorid === 'MAX') {
+						if ('funcid' in col.expression) {
+							let colexpression = col.expression.args[0];
+							let colexp1 = colexpression.toJS('p', tableid, defcols);
+							return (
+								"'" +
+								colas +
+								"': (typeof " +
+								colexp1 +
+								" == 'number' ? " +
+								colexp1 +
+								': typeof ' +
+								colexp1 +
+								" == 'object' ? typeof Number(" +
+								colexp1 +
+								") == 'number' ?  " +
+								colexp1 +
+								' : null : null),'
+							);
+						}
+						return (
+							"'" +
+							colas +
+							"': (typeof " +
+							colexp +
+							" == 'number' ? " +
+							colexp +
+							': typeof ' +
+							colexp +
+							" == 'object' ? typeof Number(" +
+							colexp +
+							") == 'number' ?  " +
+							colexp +
+							' : null : null),'
+						);
 					} else if (col.aggregatorid === 'ARRAY') {
 						return "'" + colas + "':[" + colexp + '],';
 					} else if (col.aggregatorid === 'COUNT') {
@@ -8806,7 +8891,128 @@ yy.Select.prototype.compileGroup = function (query) {
 						var post = "g['$$_VALUES_" + colas + "'][" + colexp + ']=true;}';
 					}
 					if (col.aggregatorid === 'SUM') {
-						return pre + "g['" + colas + "']+=(" + colexp + '||0);' + post; //f.field.arguments[0].toJS();
+						if ('funcid' in col.expression) {
+							let colexpression = col.expression.args[0];
+							let colexp1 = colexpression.toJS('p', tableid, defcols);
+							return (
+								pre +
+								"if(g['" +
+								colas +
+								"'] == null && " +
+								colexp1 +
+								" == null){g['" +
+								colas +
+								"'] = null} else if(typeof g['" +
+								colas +
+								"']!== 'object' && typeof g['" +
+								colas +
+								"'] !== 'number' && typeof " +
+								colexp1 +
+								"!== 'object' && typeof " +
+								colexp1 +
+								"!== 'number'){g['" +
+								colas +
+								"'] = null} else if(typeof g['" +
+								colas +
+								"'] !== 'object' && typeof g['" +
+								colas +
+								"'] !== 'number' && typeof " +
+								colexp1 +
+								" == 'number'){g['" +
+								colas +
+								"'] = " +
+								colexp1 +
+								"} else if(typeof g['" +
+								colas +
+								"'] == 'number' && typeof " +
+								colexp1 +
+								" !== 'number' && typeof " +
+								colexp1 +
+								" !== 'object'){g['" +
+								colas +
+								"'] = g['" +
+								colas +
+								"']} else if((g['" +
+								colas +
+								"'] == null || (typeof g['" +
+								colas +
+								"'] !== 'number' && typeof g['" +
+								colas +
+								"'] !== 'object')) && (" +
+								colexp1 +
+								' == null || (typeof ' +
+								colexp1 +
+								" !== 'number' && typeof " +
+								colexp1 +
+								" !== 'object'))){g['" +
+								colas +
+								"'] = null} else {g['" +
+								colas +
+								"']+=(" +
+								colexp1 +
+								'||0);}' +
+								post
+							);
+						}
+						return (
+							pre +
+							"if(g['" +
+							colas +
+							"'] == null && " +
+							colexp +
+							" == null){g['" +
+							colas +
+							"'] = null} else if(typeof g['" +
+							colas +
+							"']!== 'object' && typeof g['" +
+							colas +
+							"'] !== 'number' && typeof " +
+							colexp +
+							"!== 'object' && typeof " +
+							colexp +
+							"!== 'number'){g['" +
+							colas +
+							"'] = null} else if(typeof g['" +
+							colas +
+							"'] !== 'object' && typeof g['" +
+							colas +
+							"'] !== 'number' && typeof " +
+							colexp +
+							" == 'number'){g['" +
+							colas +
+							"'] = " +
+							colexp +
+							"} else if(typeof g['" +
+							colas +
+							"'] == 'number' && typeof " +
+							colexp +
+							" !== 'number' && typeof " +
+							colexp +
+							" !== 'object'){g['" +
+							colas +
+							"'] = g['" +
+							colas +
+							"']} else if((g['" +
+							colas +
+							"'] == null || (typeof g['" +
+							colas +
+							"'] !== 'number' && typeof g['" +
+							colas +
+							"'] !== 'object')) && (" +
+							colexp +
+							' == null || (typeof ' +
+							colexp +
+							" !== 'number' && typeof " +
+							colexp +
+							" !== 'object'))){g['" +
+							colas +
+							"'] = null} else {g['" +
+							colas +
+							"']+=(" +
+							colexp +
+							'||0);}' +
+							post
+						);
 					} else if (col.aggregatorid === 'COUNT') {
 
 						if (col.expression.columnid === '*') {
@@ -8827,12 +9033,130 @@ yy.Select.prototype.compileGroup = function (query) {
 					} else if (col.aggregatorid === 'ARRAY') {
 						return pre + "g['" + colas + "'].push(" + colexp + ');' + post;
 					} else if (col.aggregatorid === 'MIN') {
+						if ('funcid' in col.expression) {
+							let colexpression = col.expression.args[0];
+							let colexp1 = colexpression.toJS('p', tableid, defcols);
+							return (
+								pre +
+								"if((g['" +
+								colas +
+								"'] == null && " +
+								colexp1 +
+								'!== null) ? y =  ' +
+								colexp1 +
+								" : (g['" +
+								colas +
+								"'] !== null && " +
+								colexp1 +
+								" == null) ? y = g['" +
+								colas +
+								"'] : ((y=" +
+								colexp1 +
+								") < g['" +
+								colas +
+								"'])){ if((typeof y == 'number')) {g['" +
+								colas +
+								"'] = y;} else if(typeof y == 'object' && y instanceof Date){g['" +
+								colas +
+								"'] = y;}else if(typeof y == 'object' && typeof Number(y) == 'number'){g['" +
+								colas +
+								"'] = Number(y);}}else if(g['" +
+								colas +
+								"']!== null && typeof g['" +
+								colas +
+								"'] == 'object' && y instanceof Date){g['" +
+								colas +
+								"'] = g['" +
+								colas +
+								"']}else if(g['" +
+								colas +
+								"']!== null && typeof g['" +
+								colas +
+								"'] == 'object'){g['" +
+								colas +
+								"'] = Number(g['" +
+								colas +
+								"'])}" +
+								post
+							);
+						}
 						return (
-							pre + 'if ((y=' + colexp + ") < g['" + colas + "']) g['" + colas + "'] = y;" + post
+							pre +
+							"if((g['" +
+							colas +
+							"'] == null && " +
+							colexp +
+							'!== null) ? y =  ' +
+							colexp +
+							" : (g['" +
+							colas +
+							"'] !== null && " +
+							colexp +
+							" == null) ? y = g['" +
+							colas +
+							"'] : ((y=" +
+							colexp +
+							") < g['" +
+							colas +
+							"'])){ if((typeof y == 'number')) {g['" +
+							colas +
+							"'] = y;} else if(typeof y == 'object' && y instanceof Date){g['" +
+							colas +
+							"'] = y;}else if(typeof y == 'object' && typeof Number(y) == 'number'){g['" +
+							colas +
+							"'] = Number(y);}}else if(g['" +
+							colas +
+							"']!== null && typeof g['" +
+							colas +
+							"'] == 'object' && y instanceof Date){g['" +
+							colas +
+							"'] = g['" +
+							colas +
+							"']}else if(g['" +
+							colas +
+							"']!== null && typeof g['" +
+							colas +
+							"'] == 'object'){g['" +
+							colas +
+							"'] = Number(g['" +
+							colas +
+							"'])}" +
+							post
 						);
 					} else if (col.aggregatorid === 'MAX') {
+						if ('funcid' in col.expression) {
+							let colexpression = col.expression.args[0];
+							let colexp1 = colexpression.toJS('p', tableid, defcols);
+							return (
+								pre +
+								'if ((y=' +
+								colexp1 +
+								") > g['" +
+								colas +
+								"']){ if((typeof y == 'number')) {g['" +
+								colas +
+								"'] = y;} else if(typeof y == 'object' && y instanceof Date){g['" +
+								colas +
+								"'] = y;} else if(typeof y == 'object' && typeof Number(y) == 'number'){g['" +
+								colas +
+								"'] = Number(y);}}" +
+								post
+							);
+						}
 						return (
-							pre + 'if ((y=' + colexp + ") > g['" + colas + "']) g['" + colas + "'] = y;" + post
+							pre +
+							'if ((y=' +
+							colexp +
+							") > g['" +
+							colas +
+							"']){ if((typeof y == 'number')) {g['" +
+							colas +
+							"'] = y;} else if(typeof y == 'object' && y instanceof Date){g['" +
+							colas +
+							"'] = y;} else if(typeof y == 'object' && typeof Number(y) == 'number'){g['" +
+							colas +
+							"'] = Number(y);}}" +
+							post
 						);
 					} else if (col.aggregatorid === 'FIRST') {
 						return '';
@@ -8903,7 +9227,6 @@ yy.Select.prototype.compileGroup = function (query) {
 		//		s += 'group.count++;';
 		s += '}';
 	});
-
 	return new Function('p,params,alasql', 'var y;' + s);
 };