alasql 4.1.5 → 4.1.6

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.4 build: develop-b2979cbc | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.1.5 build: develop-794022fb | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.4
+@version 4.1.5
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff
@@ -142,8 +142,8 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '4.1.4';
-alasql.build = 'develop-b2979cbc';
+alasql.version = '4.1.5';
+alasql.build = 'develop-794022fb';
 
 /**
 	Debug flag
@@ -241,8 +241,8 @@ var $0 = $$.length - 1;
 switch (yystate) {
 case 1:
 
-			if (alasql.options.casesensitive) this.$ = $$[$0];
-			else this.$ = $$[$0].toLowerCase();
+			if (alasql.options.casesensitive) this.$ = $$[$0];
+			else this.$ = $$[$0].toLowerCase();
 
 break;
 case 2:
@@ -274,13 +274,13 @@ case 11:
 break;
 case 12:
 
-			this.$ = $$[$0];
+			this.$ = $$[$0];
 
-			// TODO combine exists and queries
-		    if(yy.exists) this.$.exists = yy.exists;
-		    delete yy.exists;
-		    if(yy.queries) this.$.queries = yy.queries;
-			delete yy.queries;
+			// TODO combine exists and queries
+		    if(yy.exists) this.$.exists = yy.exists;
+		    delete yy.exists;
+		    if(yy.queries) this.$.queries = yy.queries;
+			delete yy.queries;
 
 break;
 case 13: case 162: case 172: case 237: case 238: case 240: case 248: case 250: case 259: case 270: case 273: case 380: case 496: case 506: case 508: case 520: case 526: case 527: case 572:
@@ -297,20 +297,20 @@ case 71:
 break;
 case 72:
 
-			yy.extend(this.$,$$[$0-9]); yy.extend(this.$,$$[$0-8]); yy.extend(this.$,$$[$0-7]); yy.extend(this.$,$$[$0-6]);
-		    yy.extend(this.$,$$[$0-5]); yy.extend(this.$,$$[$0-4]);yy.extend(this.$,$$[$0-3]);
-		    yy.extend(this.$,$$[$0-2]); yy.extend(this.$,$$[$0-1]); yy.extend(this.$,$$[$0]);
-		    this.$ = $$[$0-9];
-/*		    if(yy.exists) this.$.exists = yy.exists;
-		    delete yy.exists;
-		    if(yy.queries) this.$.queries = yy.queries;
-			delete yy.queries;
+			yy.extend(this.$,$$[$0-9]); yy.extend(this.$,$$[$0-8]); yy.extend(this.$,$$[$0-7]); yy.extend(this.$,$$[$0-6]);
+		    yy.extend(this.$,$$[$0-5]); yy.extend(this.$,$$[$0-4]);yy.extend(this.$,$$[$0-3]);
+		    yy.extend(this.$,$$[$0-2]); yy.extend(this.$,$$[$0-1]); yy.extend(this.$,$$[$0]);
+		    this.$ = $$[$0-9];
+/*		    if(yy.exists) this.$.exists = yy.exists;
+		    delete yy.exists;
+		    if(yy.queries) this.$.queries = yy.queries;
+			delete yy.queries;
 */		
 break;
 case 73:
 
-			this.$ = new yy.Search({selectors:$$[$0-2], from:$$[$0]});
-			yy.extend(this.$,$$[$0-1]);
+			this.$ = new yy.Search({selectors:$$[$0-2], from:$$[$0]});
+			yy.extend(this.$,$$[$0-1]);
 
 break;
 case 74:
@@ -348,9 +348,9 @@ case 91:
 break;
 case 92:
 
-			var dir = $$[$0-1];
-			if(!dir) dir = 'ASC';
-			this.$ = {srchid:"ORDERBY", args: [{expression: new yy.Column({columnid:'_'}), direction:dir}]};
+			var dir = $$[$0-1];
+			if(!dir) dir = 'ASC';
+			this.$ = {srchid:"ORDERBY", args: [{expression: new yy.Column({columnid:'_'}), direction:dir}]};
 
 break;
 case 93:
@@ -517,11 +517,11 @@ case 150:
 break;
 case 151:
 
-			if(!$$[$0]) {
-				this.$ = new yy.Select({columns:[new yy.Column({columnid:'_',})], modifier:'COLUMN'});
-			} else {
-				this.$ = new yy.Select({ columns:$$[$0] }); yy.extend(this.$, $$[$0-2]);yy.extend(this.$, $$[$0-1]);
-			}
+			if(!$$[$0]) {
+				this.$ = new yy.Select({columns:[new yy.Column({columnid:'_',})], modifier:'COLUMN'});
+			} else {
+				this.$ = new yy.Select({ columns:$$[$0] }); yy.extend(this.$, $$[$0-2]);yy.extend(this.$, $$[$0-1]);
+			}
 
 break;
 case 152:
@@ -562,17 +562,17 @@ this.$ = {into: $$[$0]}
 break;
 case 168:
 
-			var s = $$[$0];
-			s = s.substr(1,s.length-2);
-			var x3 = s.substr(-3).toUpperCase();
-			var x4 = s.substr(-4).toUpperCase();
-			if(s[0] == '#') {
-				this.$ = {into: new yy.FuncValue({funcid: 'HTML', args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]})};
-			} else if(x3=='XLS' || x3 == 'CSV' || x3=='TAB') {
-				this.$ = {into: new yy.FuncValue({funcid: x3, args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]})};
-			} else if(x4=='XLSX' || x4 == 'JSON') {
-				this.$ = {into: new yy.FuncValue({funcid: x4, args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]})};
-			}
+			var s = $$[$0];
+			s = s.substr(1,s.length-2);
+			var x3 = s.substr(-3).toUpperCase();
+			var x4 = s.substr(-4).toUpperCase();
+			if(s[0] == '#') {
+				this.$ = {into: new yy.FuncValue({funcid: 'HTML', args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]})};
+			} else if(x3=='XLS' || x3 == 'CSV' || x3=='TAB') {
+				this.$ = {into: new yy.FuncValue({funcid: x3, args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]})};
+			} else if(x4=='XLSX' || x4 == 'JSON') {
+				this.$ = {into: new yy.FuncValue({funcid: x4, args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]})};
+			}
 
 break;
 case 169:
@@ -634,30 +634,30 @@ case 193:
 break;
 case 200:
 
-			var s = $$[$0];
-			s = s.substr(1,s.length-2);
-			var x3 = s.substr(-3).toUpperCase();
-			var x4 = s.substr(-4).toUpperCase();
-			var r;
-			if(s[0] == '#') {
-				r = new yy.FuncValue({funcid: 'HTML', args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]});
-			} else if(x3=='XLS' || x3 == 'CSV' || x3=='TAB') {
-				r = new yy.FuncValue({funcid: x3, args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]});
-			} else if(x4=='XLSX' || x4 == 'JSON') {
-				r = new yy.FuncValue({funcid: x4, args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]});
-			} else {
-				throw new Error('Unknown string in FROM clause');
-			};
-			this.$ = r;
+			var s = $$[$0];
+			s = s.substr(1,s.length-2);
+			var x3 = s.substr(-3).toUpperCase();
+			var x4 = s.substr(-4).toUpperCase();
+			var r;
+			if(s[0] == '#') {
+				r = new yy.FuncValue({funcid: 'HTML', args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]});
+			} else if(x3=='XLS' || x3 == 'CSV' || x3=='TAB') {
+				r = new yy.FuncValue({funcid: x3, args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]});
+			} else if(x4=='XLSX' || x4 == 'JSON') {
+				r = new yy.FuncValue({funcid: x4, args:[new yy.StringValue({value: s}), new yy.Json({value:{headers:true}})]});
+			} else {
+				throw new Error('Unknown string in FROM clause');
+			};
+			this.$ = r;
 
 break;
 case 201:
 
-			if($$[$0-2] == 'INFORMATION_SCHEMA') {
-				this.$ = new yy.FuncValue({funcid: $$[$0-2], args:[new yy.StringValue({value:$$[$0]})]});
-			} else {
-				this.$ = new yy.Table({databaseid: $$[$0-2], tableid:$$[$0]});
-			}
+			if($$[$0-2] == 'INFORMATION_SCHEMA') {
+				this.$ = new yy.FuncValue({funcid: $$[$0-2], args:[new yy.StringValue({value:$$[$0]})]});
+			} else {
+				this.$ = new yy.Table({databaseid: $$[$0-2], tableid:$$[$0]});
+			}
 
 break;
 case 202:
@@ -857,10 +857,10 @@ case 306:
 break;
 case 309: case 310: case 311:
 
-			if(!yy.queries) yy.queries = [];
-			yy.queries.push($$[$0-1]);
-			$$[$0-1].queriesidx = yy.queries.length;
-			this.$ = $$[$0-1];
+			if(!yy.queries) yy.queries = [];
+			yy.queries.push($$[$0-1]);
+			$$[$0-1].queriesidx = yy.queries.length;
+			this.$ = $$[$0-1];
 
 break;
 case 312:
@@ -901,18 +901,18 @@ case 329:
 break;
 case 330:
 
-		  if($$[$0-2].length > 1 && ($$[$0-4].toUpperCase() == 'MAX' || $$[$0-4].toUpperCase() == 'MIN')) {
-		  	this.$ = new yy.FuncValue({funcid:$$[$0-4],args:$$[$0-2]});
-		  } else {
-			this.$ = new yy.AggrValue({aggregatorid: $$[$0-4].toUpperCase(), expression: $$[$0-2].pop(), over:$$[$0]});
-		  }
+		  if($$[$0-2].length > 1 && ($$[$0-4].toUpperCase() == 'MAX' || $$[$0-4].toUpperCase() == 'MIN')) {
+		  	this.$ = new yy.FuncValue({funcid:$$[$0-4],args:$$[$0-2]});
+		  } else {
+			this.$ = new yy.AggrValue({aggregatorid: $$[$0-4].toUpperCase(), expression: $$[$0-2].pop(), over:$$[$0]});
+		  }
 
 break;
 case 331:
  this.$ = new yy.AggrValue({aggregatorid: $$[$0-5].toUpperCase(), expression: $$[$0-2], distinct:true, over:$$[$0]}); 
 break;
 case 332:
- this.$ = new yy.AggrValue({aggregatorid: $$[$0-5].toUpperCase(), expression: $$[$0-2],
+ this.$ = new yy.AggrValue({aggregatorid: $$[$0-5].toUpperCase(), expression: $$[$0-2],
 		 over:$$[$0]}); 
 break;
 case 334: case 335:
@@ -959,16 +959,16 @@ case 348:
 break;
 case 349:
 
-			var funcid = $$[$0-4];
-			var exprlist = $$[$0-1];
-			if(exprlist.length > 1 && (funcid.toUpperCase() == 'MIN' || funcid.toUpperCase() == 'MAX')) {
-					this.$ = new yy.FuncValue({funcid: funcid, args: exprlist});
-			} else if(alasql.aggr[$$[$0-4]]) {
-		    	this.$ = new yy.AggrValue({aggregatorid: 'REDUCE',
-                      funcid: funcid, expression: exprlist.pop(),distinct:($$[$0-2]=='DISTINCT') });
-		    } else {
-			    this.$ = new yy.FuncValue({funcid: funcid, args: exprlist});
-			};
+			var funcid = $$[$0-4];
+			var exprlist = $$[$0-1];
+			if(exprlist.length > 1 && (funcid.toUpperCase() == 'MIN' || funcid.toUpperCase() == 'MAX')) {
+					this.$ = new yy.FuncValue({funcid: funcid, args: exprlist});
+			} else if(alasql.aggr[$$[$0-4]]) {
+		    	this.$ = new yy.AggrValue({aggregatorid: 'REDUCE',
+                      funcid: funcid, expression: exprlist.pop(),distinct:($$[$0-2]?.toUpperCase()=='DISTINCT') });
+		    } else {
+			    this.$ = new yy.FuncValue({funcid: funcid, args: exprlist});
+			};
 
 break;
 case 350:
@@ -1024,9 +1024,9 @@ case 367:
 break;
 case 368:
 
-			if(!yy.exists) yy.exists = [];
-			this.$ = new yy.ExistsValue({value:$$[$0-1], existsidx:yy.exists.length});
-			yy.exists.push($$[$0-1]);
+			if(!yy.exists) yy.exists = [];
+			this.$ = new yy.ExistsValue({value:$$[$0-1], existsidx:yy.exists.length});
+			yy.exists.push($$[$0-1]);
 
 break;
 case 369:
@@ -1037,14 +1037,14 @@ case 370: case 371:
 break;
 case 372:
 
-			if(typeof yy.question == 'undefined') yy.question = 0;
-			this.$ = new yy.ParamValue({param: yy.question++});
+			if(typeof yy.question == 'undefined') yy.question = 0;
+			this.$ = new yy.ParamValue({param: yy.question++});
 
 break;
 case 373:
 
-			if(typeof yy.question == 'undefined') yy.question = 0;
-			this.$ = new yy.ParamValue({param: yy.question++, array:true});
+			if(typeof yy.question == 'undefined') yy.question = 0;
+			this.$ = new yy.ParamValue({param: yy.question++, array:true});
 
 break;
 case 374:
@@ -1154,43 +1154,43 @@ case 416:
 break;
 case 417:
 
-			if(!yy.queries) yy.queries = [];
-			this.$ = new yy.Op({left:$$[$0-5], op:$$[$0-4] , allsome:$$[$0-3], right:$$[$0-1], queriesidx: yy.queries.length});
-			yy.queries.push($$[$0-1]);
+			if(!yy.queries) yy.queries = [];
+			this.$ = new yy.Op({left:$$[$0-5], op:$$[$0-4] , allsome:$$[$0-3], right:$$[$0-1], queriesidx: yy.queries.length});
+			yy.queries.push($$[$0-1]);
 
 break;
 case 418:
 
-			this.$ = new yy.Op({left:$$[$0-5], op:$$[$0-4] , allsome:$$[$0-3], right:$$[$0-1]});
+			this.$ = new yy.Op({left:$$[$0-5], op:$$[$0-4] , allsome:$$[$0-3], right:$$[$0-1]});
 
 break;
 case 419:
 
-			if($$[$0-2].op == 'BETWEEN1') {
-
-				if($$[$0-2].left.op == 'AND') {
-					this.$ = new yy.Op({left:$$[$0-2].left.left,op:'AND',right:
-						new yy.Op({left:$$[$0-2].left.right, op:'BETWEEN',
-							right1:$$[$0-2].right, right2:$$[$0]})
-					});
-				} else {
-					this.$ = new yy.Op({left:$$[$0-2].left, op:'BETWEEN',
-						right1:$$[$0-2].right, right2:$$[$0]});
-				}
-
-			} else if($$[$0-2].op == 'NOT BETWEEN1') {
-				if($$[$0-2].left.op == 'AND') {
-					this.$ = new yy.Op({left:$$[$0-2].left.left,op:'AND',right:
-						new yy.Op({left:$$[$0-2].left.right, op:'NOT BETWEEN',
-							right1:$$[$0-2].right, right2:$$[$0]})
-					});
-				} else {
-					this.$ = new yy.Op({left:$$[$0-2].left, op:'NOT BETWEEN',
-						right1:$$[$0-2].right, right2:$$[$0]});
-				}
-			} else {
-				this.$ = new yy.Op({left:$$[$0-2], op:'AND', right:$$[$0]});
-			}
+			if($$[$0-2].op == 'BETWEEN1') {
+
+				if($$[$0-2].left.op == 'AND') {
+					this.$ = new yy.Op({left:$$[$0-2].left.left,op:'AND',right:
+						new yy.Op({left:$$[$0-2].left.right, op:'BETWEEN',
+							right1:$$[$0-2].right, right2:$$[$0]})
+					});
+				} else {
+					this.$ = new yy.Op({left:$$[$0-2].left, op:'BETWEEN',
+						right1:$$[$0-2].right, right2:$$[$0]});
+				}
+
+			} else if($$[$0-2].op == 'NOT BETWEEN1') {
+				if($$[$0-2].left.op == 'AND') {
+					this.$ = new yy.Op({left:$$[$0-2].left.left,op:'AND',right:
+						new yy.Op({left:$$[$0-2].left.right, op:'NOT BETWEEN',
+							right1:$$[$0-2].right, right2:$$[$0]})
+					});
+				} else {
+					this.$ = new yy.Op({left:$$[$0-2].left, op:'NOT BETWEEN',
+						right1:$$[$0-2].right, right2:$$[$0]});
+				}
+			} else {
+				this.$ = new yy.Op({left:$$[$0-2], op:'AND', right:$$[$0]});
+			}
 
 break;
 case 420:
@@ -1216,16 +1216,16 @@ case 426:
 break;
 case 427:
 
-			if(!yy.queries) yy.queries = [];
-			this.$ = new yy.Op({left: $$[$0-4], op:'IN', right:$$[$0-1], queriesidx: yy.queries.length});
-			yy.queries.push($$[$0-1]);
+			if(!yy.queries) yy.queries = [];
+			this.$ = new yy.Op({left: $$[$0-4], op:'IN', right:$$[$0-1], queriesidx: yy.queries.length});
+			yy.queries.push($$[$0-1]);
 
 break;
 case 428:
 
-			if(!yy.queries) yy.queries = [];
-			this.$ = new yy.Op({left: $$[$0-5], op:'NOT IN', right:$$[$0-1], queriesidx: yy.queries.length});
-			yy.queries.push($$[$0-1]);
+			if(!yy.queries) yy.queries = [];
+			this.$ = new yy.Op({left: $$[$0-5], op:'NOT IN', right:$$[$0-1], queriesidx: yy.queries.length});
+			yy.queries.push($$[$0-1]);
 
 break;
 case 429:
@@ -1248,17 +1248,17 @@ case 434: case 436:
 break;
 case 437:
 
-/*			var expr = $$[$0];
-			if(expr.left && expr.left.op == 'AND') {
-				this.$ = new yy.Op({left:new yy.Op({left:$$[$0-2], op:'BETWEEN', right:expr.left}), op:'AND', right:expr.right });
-			} else {
-*/
-				this.$ = new yy.Op({left:$$[$0-2], op:'BETWEEN1', right:$$[$0] });
+/*			var expr = $$[$0];
+			if(expr.left && expr.left.op == 'AND') {
+				this.$ = new yy.Op({left:new yy.Op({left:$$[$0-2], op:'BETWEEN', right:expr.left}), op:'AND', right:expr.right });
+			} else {
+*/
+				this.$ = new yy.Op({left:$$[$0-2], op:'BETWEEN1', right:$$[$0] });
 
 break;
 case 438:
 
-				this.$ = new yy.Op({left:$$[$0-2], op:'NOT BETWEEN1', right:$$[$0] });
+				this.$ = new yy.Op({left:$$[$0-2], op:'NOT BETWEEN1', right:$$[$0] });
 
 break;
 case 439:
@@ -1266,14 +1266,14 @@ case 439:
 break;
 case 440:
 
-			this.$ = new yy.Op({
-				op:'IS',
-				left:$$[$0-2],
-				right: new yy.UniOp({
-					op:'NOT',
-					right:new yy.NullValue({value:undefined})
-				})
-			});
+			this.$ = new yy.Op({
+				op:'IS',
+				left:$$[$0-2],
+				right: new yy.UniOp({
+					op:'NOT',
+					right:new yy.NullValue({value:undefined})
+				})
+			});
 
 break;
 case 441:
@@ -1353,20 +1353,20 @@ this.$ = $$[$0-2]; $$[$0-2].push($$[$0])
 break;
 case 494:
 
-			this.$ = new yy.CreateTable({table:$$[$0-4]});
-			yy.extend(this.$,$$[$0-7]);
-			yy.extend(this.$,$$[$0-6]);
-			yy.extend(this.$,$$[$0-5]);
-			yy.extend(this.$,$$[$0-2]);
-			yy.extend(this.$,$$[$0]);
+			this.$ = new yy.CreateTable({table:$$[$0-4]});
+			yy.extend(this.$,$$[$0-7]);
+			yy.extend(this.$,$$[$0-6]);
+			yy.extend(this.$,$$[$0-5]);
+			yy.extend(this.$,$$[$0-2]);
+			yy.extend(this.$,$$[$0]);
 
 break;
 case 495:
 
-			this.$ = new yy.CreateTable({table:$$[$0]});
-			yy.extend(this.$,$$[$0-3]);
-			yy.extend(this.$,$$[$0-2]);
-			yy.extend(this.$,$$[$0-1]);
+			this.$ = new yy.CreateTable({table:$$[$0]});
+			yy.extend(this.$,$$[$0-3]);
+			yy.extend(this.$,$$[$0-2]);
+			yy.extend(this.$,$$[$0-1]);
 
 break;
 case 497:
@@ -1404,7 +1404,7 @@ case 524:
 break;
 case 530:
 
-			this.$ = {type: 'UNIQUE', columns: $$[$0-1], clustered:($$[$0-3]+'').toUpperCase()};
+			this.$ = {type: 'UNIQUE', columns: $$[$0-1], clustered:($$[$0-3]+'').toUpperCase()};
 
 break;
 case 539:
@@ -1439,7 +1439,7 @@ this.$ = undefined
 break;
 case 552:
 
-			yy.extend($$[$0-1],$$[$0]); this.$ = $$[$0-1];
+			yy.extend($$[$0-1],$$[$0]); this.$ = $$[$0-1];
 
 break;
 case 555:
@@ -1527,7 +1527,7 @@ case 587:
  this.$ = new yy.CreateDatabase({engineid:$$[$0-7].toUpperCase(), databaseid:$$[$0-4], args:$$[$0-2], as:$$[$0] }); yy.extend(this.$,$$[$0-5]); 
 break;
 case 588:
- this.$ = new yy.CreateDatabase({engineid:$$[$0-4].toUpperCase(),
+ this.$ = new yy.CreateDatabase({engineid:$$[$0-4].toUpperCase(),
 		    as:$$[$0], args:[$$[$0-1]] }); yy.extend(this.$,$$[$0-2]); 
 break;
 case 589:
@@ -1595,16 +1595,16 @@ case 612:
 break;
 case 613:
 
-			this.$ = new yy.CreateTable({table:$$[$0-6],view:true,select:$$[$0-1],viewcolumns:$$[$0-4]});
-			yy.extend(this.$,$$[$0-9]);
-			yy.extend(this.$,$$[$0-7]);
+			this.$ = new yy.CreateTable({table:$$[$0-6],view:true,select:$$[$0-1],viewcolumns:$$[$0-4]});
+			yy.extend(this.$,$$[$0-9]);
+			yy.extend(this.$,$$[$0-7]);
 
 break;
 case 614:
 
-			this.$ = new yy.CreateTable({table:$$[$0-3],view:true,select:$$[$0-1]});
-			yy.extend(this.$,$$[$0-6]);
-			yy.extend(this.$,$$[$0-4]);
+			this.$ = new yy.CreateTable({table:$$[$0-3],view:true,select:$$[$0-1]});
+			yy.extend(this.$,$$[$0-6]);
+			yy.extend(this.$,$$[$0-4]);
 
 break;
 case 618:
@@ -1692,25 +1692,25 @@ case 672:
  this.$ = new yy.BeginTransaction(); 
 break;
 case 673:
- this.$ = new yy.If({expression:$$[$0-2],thenstat:$$[$0-1], elsestat:$$[$0]});
-			if($$[$0-1].exists) this.$.exists = $$[$0-1].exists;
-			if($$[$0-1].queries) this.$.queries = $$[$0-1].queries;
+ this.$ = new yy.If({expression:$$[$0-2],thenstat:$$[$0-1], elsestat:$$[$0]});
+			if($$[$0-1].exists) this.$.exists = $$[$0-1].exists;
+			if($$[$0-1].queries) this.$.queries = $$[$0-1].queries;
 
 break;
 case 674:
 
-			this.$ = new yy.If({expression:$$[$0-1],thenstat:$$[$0]});
-			if($$[$0].exists) this.$.exists = $$[$0].exists;
-			if($$[$0].queries) this.$.queries = $$[$0].queries;
+			this.$ = new yy.If({expression:$$[$0-1],thenstat:$$[$0]});
+			if($$[$0].exists) this.$.exists = $$[$0].exists;
+			if($$[$0].queries) this.$.queries = $$[$0].queries;
 
 break;
 case 675:
 this.$ = $$[$0];
 break;
 case 676:
- this.$ = new yy.While({expression:$$[$0-1],loopstat:$$[$0]});
-			if($$[$0].exists) this.$.exists = $$[$0].exists;
-			if($$[$0].queries) this.$.queries = $$[$0].queries;
+ this.$ = new yy.While({expression:$$[$0-1],loopstat:$$[$0]});
+			if($$[$0].exists) this.$.exists = $$[$0].exists;
+			if($$[$0].queries) this.$.queries = $$[$0].queries;
 
 break;
 case 677:
@@ -1760,9 +1760,9 @@ case 698:
 break;
 case 699:
 
-			this.$ = new yy.Merge(); yy.extend(this.$,$$[$0-4]); yy.extend(this.$,$$[$0-3]);
-			yy.extend(this.$,$$[$0-2]);
-			yy.extend(this.$,{matches:$$[$0-1]});yy.extend(this.$,$$[$0]);
+			this.$ = new yy.Merge(); yy.extend(this.$,$$[$0-4]); yy.extend(this.$,$$[$0-3]);
+			yy.extend(this.$,$$[$0-2]);
+			yy.extend(this.$,{matches:$$[$0-1]});yy.extend(this.$,$$[$0]);
 
 break;
 case 700: case 701:
@@ -1821,8 +1821,8 @@ case 726:
 break;
 case 727:
 
-			this.$ = new yy.CreateVertex({class:$$[$0-3],sharp:$$[$0-2], name:$$[$0-1]});
-			yy.extend(this.$,$$[$0]);
+			this.$ = new yy.CreateVertex({class:$$[$0-3],sharp:$$[$0-2], name:$$[$0-1]});
+			yy.extend(this.$,$$[$0]);
 
 break;
 case 730:
@@ -1836,8 +1836,8 @@ case 732:
 break;
 case 733:
 
-			this.$ = new yy.CreateEdge({from:$$[$0-3],to:$$[$0-1],name:$$[$0-5]});
-			yy.extend(this.$,$$[$0]);
+			this.$ = new yy.CreateEdge({from:$$[$0-3],to:$$[$0-1],name:$$[$0-5]});
+			yy.extend(this.$,$$[$0]);
 
 break;
 case 734:
@@ -1848,29 +1848,29 @@ case 735:
 break;
 case 738:
 
-			this.$ = $$[$0-2];
-			if($$[$0-1]) this.$.json = new yy.Json({value:$$[$0-1]});
-			if($$[$0]) this.$.as = $$[$0];
+			this.$ = $$[$0-2];
+			if($$[$0-1]) this.$.json = new yy.Json({value:$$[$0-1]});
+			if($$[$0]) this.$.as = $$[$0];
 
 break;
 case 739:
 
-			this.$ = {source:$$[$0-6], target: $$[$0]};
-			if($$[$0-3]) this.$.json = new yy.Json({value:$$[$0-3]});
-			if($$[$0-2]) this.$.as = $$[$0-2];
-			yy.extend(this.$,$$[$0-4]);
+			this.$ = {source:$$[$0-6], target: $$[$0]};
+			if($$[$0-3]) this.$.json = new yy.Json({value:$$[$0-3]});
+			if($$[$0-2]) this.$.as = $$[$0-2];
+			yy.extend(this.$,$$[$0-4]);
 
 break;
 case 740:
 
-			this.$ = {source:$$[$0-5], target: $$[$0]};
-			if($$[$0-2]) this.$.json = new yy.Json({value:$$[$0-3]});
-			if($$[$0-1]) this.$.as = $$[$0-2];
+			this.$ = {source:$$[$0-5], target: $$[$0]};
+			if($$[$0-2]) this.$.json = new yy.Json({value:$$[$0-3]});
+			if($$[$0-1]) this.$.as = $$[$0-2];
 
 break;
 case 741:
 
-			this.$ = {source:$$[$0-2], target: $$[$0]};
+			this.$ = {source:$$[$0-2], target: $$[$0]};
 
 break;
 case 745:
@@ -1878,25 +1878,25 @@ case 745:
 break;
 case 748: case 749:
 
-			var s3 = $$[$0-1];
-			this.$ = {prop:$$[$0-3], sharp:$$[$0-2], name:(typeof s3 == 'undefined')?undefined:s3.substr(1,s3.length-2), class:$$[$0]};
+			var s3 = $$[$0-1];
+			this.$ = {prop:$$[$0-3], sharp:$$[$0-2], name:(typeof s3 == 'undefined')?undefined:s3.substr(1,s3.length-2), class:$$[$0]};
 
 break;
 case 750:
 
-			var s2 = $$[$0-1];
-			this.$ = {sharp:$$[$0-2], name:(typeof s2 == 'undefined')?undefined:s2.substr(1,s2.length-2), class:$$[$0]};
+			var s2 = $$[$0-1];
+			this.$ = {sharp:$$[$0-2], name:(typeof s2 == 'undefined')?undefined:s2.substr(1,s2.length-2), class:$$[$0]};
 
 break;
 case 751:
 
-			var s1 = $$[$0-1];
-			this.$ = {name:(typeof s1 == 'undefined')?undefined:s1.substr(1,s1.length-2), class:$$[$0]};
+			var s1 = $$[$0-1];
+			this.$ = {name:(typeof s1 == 'undefined')?undefined:s1.substr(1,s1.length-2), class:$$[$0]};
 
 break;
 case 752:
 
-			this.$ = {class:$$[$0]};
+			this.$ = {class:$$[$0]};
 
 break;
 case 758:
@@ -1913,21 +1913,21 @@ case 763:
 break;
 case 766:
 
-			this.$ = new yy.CreateTrigger({trigger:$$[$0-6], when:$$[$0-5], action:$$[$0-4], table:$$[$0-2], statement:$$[$0]});
-			if($$[$0].exists) this.$.exists = $$[$0].exists;
-			if($$[$0].queries) this.$.queries = $$[$0].queries;
+			this.$ = new yy.CreateTrigger({trigger:$$[$0-6], when:$$[$0-5], action:$$[$0-4], table:$$[$0-2], statement:$$[$0]});
+			if($$[$0].exists) this.$.exists = $$[$0].exists;
+			if($$[$0].queries) this.$.queries = $$[$0].queries;
 
 break;
 case 767:
 
-			this.$ = new yy.CreateTrigger({trigger:$$[$0-5], when:$$[$0-4], action:$$[$0-3], table:$$[$0-1], funcid:$$[$0]});
+			this.$ = new yy.CreateTrigger({trigger:$$[$0-5], when:$$[$0-4], action:$$[$0-3], table:$$[$0-1], funcid:$$[$0]});
 
 break;
 case 768:
 
-			this.$ = new yy.CreateTrigger({trigger:$$[$0-6], when:$$[$0-4], action:$$[$0-3], table:$$[$0-5], statement:$$[$0]});
-			if($$[$0].exists) this.$.exists = $$[$0].exists;
-			if($$[$0].queries) this.$.queries = $$[$0].queries;
+			this.$ = new yy.CreateTrigger({trigger:$$[$0-6], when:$$[$0-4], action:$$[$0-3], table:$$[$0-5], statement:$$[$0]});
+			if($$[$0].exists) this.$.exists = $$[$0].exists;
+			if($$[$0].queries) this.$.queries = $$[$0].queries;
 
 break;
 case 769: case 770: case 772:
@@ -2215,17 +2215,17 @@ _handle_error:
     return true;
 }};
 
-// from https://www.postgresql.org/docs/current/static/sql-keywords-appendix.html
-// JSON.stringify([].slice.call(document.querySelectorAll('tr')).filter(x => x.children.length == 5 && x.children[2].innerText == 'reserved').map(x => x.children[0].innerText))
+// from https://www.postgresql.org/docs/current/static/sql-keywords-appendix.html
+// JSON.stringify([].slice.call(document.querySelectorAll('tr')).filter(x => x.children.length == 5 && x.children[2].innerText == 'reserved').map(x => x.children[0].innerText))
 
-var nonReserved = ["A","ABSENT","ABSOLUTE","ACCORDING","ACTION","ADA","ADD","ADMIN","AFTER","ALWAYS","ASC","ASSERTION","ASSIGNMENT","ATTRIBUTE","ATTRIBUTES","BASE64","BEFORE","BERNOULLI","BLOCKED","BOM","BREADTH","C","CASCADE","CATALOG","CATALOG_NAME","CHAIN","CHARACTERISTICS","CHARACTERS","CHARACTER_SET_CATALOG","CHARACTER_SET_NAME","CHARACTER_SET_SCHEMA","CLASS_ORIGIN","COBOL","COLLATION","COLLATION_CATALOG","COLLATION_NAME","COLLATION_SCHEMA","COLUMNS","COLUMN_NAME","COMMAND_FUNCTION","COMMAND_FUNCTION_CODE","COMMITTED","CONDITION_NUMBER","CONNECTION","CONNECTION_NAME","CONSTRAINTS","CONSTRAINT_CATALOG","CONSTRAINT_NAME","CONSTRAINT_SCHEMA","CONSTRUCTOR","CONTENT","CONTINUE","CONTROL","CURSOR_NAME","DATA","DATETIME_INTERVAL_CODE","DATETIME_INTERVAL_PRECISION","DB","DEFAULTS","DEFERRABLE","DEFERRED","DEFINED","DEFINER","DEGREE","DEPTH","DERIVED","DESC","DESCRIPTOR","DIAGNOSTICS","DISPATCH","DOCUMENT","DOMAIN","DYNAMIC_FUNCTION","DYNAMIC_FUNCTION_CODE","EMPTY","ENCODING","ENFORCED","EXCLUDE","EXCLUDING","EXPRESSION","FILE","FINAL","FIRST","FLAG","FOLLOWING","FORTRAN","FOUND","FS","G","GENERAL","GENERATED","GO","GOTO","GRANTED","HEX","HIERARCHY","ID","IGNORE","IMMEDIATE","IMMEDIATELY","IMPLEMENTATION","INCLUDING","INCREMENT","INDENT","INITIALLY","INPUT","INSTANCE","INSTANTIABLE","INSTEAD","INTEGRITY","INVOKER","ISOLATION","K","KEY","KEY_MEMBER","KEY_TYPE","LAST","LENGTH","LEVEL","LIBRARY","LIMIT","LINK","LOCATION","LOCATOR","M","MAP","MAPPING","MATCHED","MAXVALUE","MESSAGE_LENGTH","MESSAGE_OCTET_LENGTH","MESSAGE_TEXT","MINVALUE","MORE","MUMPS","NAME","NAMES","NAMESPACE","NESTING","NEXT","NFC","NFD","NFKC","NFKD","NIL","NORMALIZED","NULLABLE","NULLS","NUMBER","OBJECT","OCTETS","OFF","OPTION","OPTIONS","ORDERING","ORDINALITY","OTHERS","OUTPUT","OVERRIDING","P","PAD","PARAMETER_MODE","PARAMETER_NAME","PARAMETER_ORDINAL_POSITION","PARAMETER_SPECIFIC_CATALOG","PARAMETER_SPECIFIC_NAME","PARAMETER_SPECIFIC_SCHEMA","PARTIAL","PASCAL","PASSING","PASSTHROUGH","PATH","PERMISSION","PLACING","PLI","PRECEDING","PRESERVE","PRIOR","PRIVILEGES","PUBLIC","READ","RECOVERY","RELATIVE","REPEATABLE","REQUIRING","RESPECT","RESTART","RESTORE","RESTRICT","RETURNED_CARDINALITY","RETURNED_LENGTH","RETURNED_OCTET_LENGTH","RETURNED_SQLSTATE","RETURNING","ROLE","ROUTINE","ROUTINE_CATALOG","ROUTINE_NAME","ROUTINE_SCHEMA","ROW_COUNT","SCALE","SCHEMA","SCHEMA_NAME","SCOPE_CATALOG","SCOPE_NAME","SCOPE_SCHEMA","SECTION","SECURITY","SELECTIVE","SELF","SEQUENCE","SERIALIZABLE","SERVER","SERVER_NAME","SESSION","SETS","SIMPLE","SIZE","SOURCE","SPACE","SPECIFIC_NAME","STANDALONE","STATE","STATEMENT","STRIP","STRUCTURE","STYLE","SUBCLASS_ORIGIN","T","TABLE_NAME","TEMPORARY","TIES","TOKEN","TOP_LEVEL_COUNT","TRANSACTION","TRANSACTIONS_COMMITTED","TRANSACTIONS_ROLLED_BACK","TRANSACTION_ACTIVE","TRANSFORM","TRANSFORMS","TRIGGER_CATALOG","TRIGGER_NAME","TRIGGER_SCHEMA","TYPE","UNBOUNDED","UNCOMMITTED","UNDER","UNLINK","UNNAMED","UNTYPED","URI","USAGE","USER_DEFINED_TYPE_CATALOG","USER_DEFINED_TYPE_CODE","USER_DEFINED_TYPE_NAME","USER_DEFINED_TYPE_SCHEMA","VALID","VERSION","VIEW","WHITESPACE","WORK","WRAPPER","WRITE","XMLDECLARATION","XMLSCHEMA","YES","ZONE"]
+var nonReserved = ["A","ABSENT","ABSOLUTE","ACCORDING","ACTION","ADA","ADD","ADMIN","AFTER","ALWAYS","ASC","ASSERTION","ASSIGNMENT","ATTRIBUTE","ATTRIBUTES","BASE64","BEFORE","BERNOULLI","BLOCKED","BOM","BREADTH","C","CASCADE","CATALOG","CATALOG_NAME","CHAIN","CHARACTERISTICS","CHARACTERS","CHARACTER_SET_CATALOG","CHARACTER_SET_NAME","CHARACTER_SET_SCHEMA","CLASS_ORIGIN","COBOL","COLLATION","COLLATION_CATALOG","COLLATION_NAME","COLLATION_SCHEMA","COLUMNS","COLUMN_NAME","COMMAND_FUNCTION","COMMAND_FUNCTION_CODE","COMMITTED","CONDITION_NUMBER","CONNECTION","CONNECTION_NAME","CONSTRAINTS","CONSTRAINT_CATALOG","CONSTRAINT_NAME","CONSTRAINT_SCHEMA","CONSTRUCTOR","CONTENT","CONTINUE","CONTROL","CURSOR_NAME","DATA","DATETIME_INTERVAL_CODE","DATETIME_INTERVAL_PRECISION","DB","DEFAULTS","DEFERRABLE","DEFERRED","DEFINED","DEFINER","DEGREE","DEPTH","DERIVED","DESC","DESCRIPTOR","DIAGNOSTICS","DISPATCH","DOCUMENT","DOMAIN","DYNAMIC_FUNCTION","DYNAMIC_FUNCTION_CODE","EMPTY","ENCODING","ENFORCED","EXCLUDE","EXCLUDING","EXPRESSION","FILE","FINAL","FIRST","FLAG","FOLLOWING","FORTRAN","FOUND","FS","G","GENERAL","GENERATED","GO","GOTO","GRANTED","HEX","HIERARCHY","ID","IGNORE","IMMEDIATE","IMMEDIATELY","IMPLEMENTATION","INCLUDING","INCREMENT","INDENT","INITIALLY","INPUT","INSTANCE","INSTANTIABLE","INSTEAD","INTEGRITY","INVOKER","ISOLATION","K","KEY","KEY_MEMBER","KEY_TYPE","LAST","LENGTH","LEVEL","LIBRARY","LIMIT","LINK","LOCATION","LOCATOR","M","MAP","MAPPING","MATCHED","MAXVALUE","MESSAGE_LENGTH","MESSAGE_OCTET_LENGTH","MESSAGE_TEXT","MINVALUE","MORE","MUMPS","NAME","NAMES","NAMESPACE","NESTING","NEXT","NFC","NFD","NFKC","NFKD","NIL","NORMALIZED","NULLABLE","NULLS","NUMBER","OBJECT","OCTETS","OFF","OPTION","OPTIONS","ORDERING","ORDINALITY","OTHERS","OUTPUT","OVERRIDING","P","PAD","PARAMETER_MODE","PARAMETER_NAME","PARAMETER_ORDINAL_POSITION","PARAMETER_SPECIFIC_CATALOG","PARAMETER_SPECIFIC_NAME","PARAMETER_SPECIFIC_SCHEMA","PARTIAL","PASCAL","PASSING","PASSTHROUGH","PATH","PERMISSION","PLACING","PLI","PRECEDING","PRESERVE","PRIOR","PRIVILEGES","PUBLIC","READ","RECOVERY","RELATIVE","REPEATABLE","REQUIRING","RESPECT","RESTART","RESTORE","RESTRICT","RETURNED_CARDINALITY","RETURNED_LENGTH","RETURNED_OCTET_LENGTH","RETURNED_SQLSTATE","RETURNING","ROLE","ROUTINE","ROUTINE_CATALOG","ROUTINE_NAME","ROUTINE_SCHEMA","ROW_COUNT","SCALE","SCHEMA","SCHEMA_NAME","SCOPE_CATALOG","SCOPE_NAME","SCOPE_SCHEMA","SECTION","SECURITY","SELECTIVE","SELF","SEQUENCE","SERIALIZABLE","SERVER","SERVER_NAME","SESSION","SETS","SIMPLE","SIZE","SOURCE","SPACE","SPECIFIC_NAME","STANDALONE","STATE","STATEMENT","STRIP","STRUCTURE","STYLE","SUBCLASS_ORIGIN","T","TABLE_NAME","TEMPORARY","TIES","TOKEN","TOP_LEVEL_COUNT","TRANSACTION","TRANSACTIONS_COMMITTED","TRANSACTIONS_ROLLED_BACK","TRANSACTION_ACTIVE","TRANSFORM","TRANSFORMS","TRIGGER_CATALOG","TRIGGER_NAME","TRIGGER_SCHEMA","TYPE","UNBOUNDED","UNCOMMITTED","UNDER","UNLINK","UNNAMED","UNTYPED","URI","USAGE","USER_DEFINED_TYPE_CATALOG","USER_DEFINED_TYPE_CODE","USER_DEFINED_TYPE_NAME","USER_DEFINED_TYPE_SCHEMA","VALID","VERSION","VIEW","WHITESPACE","WORK","WRAPPER","WRITE","XMLDECLARATION","XMLSCHEMA","YES","ZONE"]
 
-parser.parseError = function(str, hash) {
-	if (hash.expected && hash.expected.indexOf("'LITERAL'") > -1 && /[a-zA-Z_][a-zA-Z_0-9]*/.test(hash.token) && nonReserved.indexOf(hash.token) > -1) {
-		return
-	}
-	throw new SyntaxError(str)
-}
+parser.parseError = function(str, hash) {
+	if (hash.expected && hash.expected.indexOf("'LITERAL'") > -1 && /[a-zA-Z_][a-zA-Z_0-9]*/.test(hash.token) && nonReserved.indexOf(hash.token) > -1) {
+		return
+	}
+	throw new SyntaxError(str)
+}
 /* generated by jison-lex 0.3.4 */
 var lexer = (function(){
 var lexer = ({
@@ -8716,18 +8716,18 @@ yy.Select.prototype.compileGroup = function (query) {
 					if (col.aggregatorid === 'SUM') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
-							return `'${colas}':(${colexp1})|| typeof ${colexp1} == 'number' ? ${colexp1} : null,`;
+							return `'${colas}':(${colexp1})|| typeof ${colexp1} == 'number' ? ${colexp} : null,`;
 						}
 						return `'${colas}':(${colexp})|| typeof ${colexp} == 'number' ? ${colexp} : null,`;
 					} else if (col.aggregatorid === 'TOTAL') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
-							return `'${colas}':(${colexp1}) || typeof ${colexp1} == 'number' ? 
-							${colexp1} : ${colexp1} == 'string' && typeof Number(${colexp1}) == 'number' ? Number(${colexp1}) : 
+							return `'${colas}':(${colexp1}) || typeof ${colexp1} == 'number' ?
+							${colexp1} : ${colexp1} == 'string' && typeof Number(${colexp1}) == 'number' ? Number(${colexp1}) :
 							typeof ${colexp1} == 'boolean' ?  Number(${colexp1}) : 0,`;
 						}
-						return `'${colas}':(${colexp})|| typeof ${colexp} == 'number' ? 
-							${colexp} : ${colexp} == 'string' && typeof Number(${colexp}) == 'number' ? Number(${colexp}) : 
+						return `'${colas}':(${colexp})|| typeof ${colexp} == 'number' ?
+							${colexp} : ${colexp} == 'string' && typeof Number(${colexp}) == 'number' ? Number(${colexp}) :
 							typeof ${colexp} === 'boolean' ?  Number(${colexp}) : 0,`;
 					} else if (
 						col.aggregatorid === 'FIRST' ||
@@ -8739,18 +8739,19 @@ yy.Select.prototype.compileGroup = function (query) {
 					} else if (col.aggregatorid === 'MIN') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
-							return `'${colas}': (typeof ${colexp1} == 'number' ? ${colexp1} : typeof ${colexp1} == 'object' ? 
-							typeof Number(${colexp1}) == 'number' && ${colexp1}!== null? ${colexp1} : null : null),`;
+
+							return(`'${colas}': (typeof ${colexp1} == 'number' ? ${colexp} : typeof ${colexp1} == 'object' ?
+							typeof Number(${colexp1}) == 'number' && ${colexp1}!== null? ${colexp} : null : null),`);
 						}
-						return `'${colas}': (typeof ${colexp} == 'number' ? ${colexp} : typeof ${colexp} == 'object' ? 
+						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 colexp1 = colExpIfFunIdExists(col.expression);
-							return `'${colas}' : (typeof ${colexp1} == 'number' ? ${colexp1} : typeof ${colexp1} == 'object' ? 
-							typeof Number(${colexp1}) == 'number' ? ${colexp1} : null : null),`;
+							return `'${colas}' : (typeof ${colexp1} == 'number' ? ${colexp} : typeof ${colexp1} == 'object' ?
+							typeof Number(${colexp1}) == 'number' ? ${colexp} : null : null),`;
 						}
-						return `'${colas}' : (typeof ${colexp} == 'number' ? ${colexp} : typeof ${colexp} == 'object' ? 
+						return `'${colas}' : (typeof ${colexp} == 'number' ? ${colexp} : typeof ${colexp} == 'object' ?
 							typeof Number(${colexp}) == 'number' ? ${colexp} : null : null),`;
 					} else if (col.aggregatorid === 'ARRAY') {
 						return "'" + colas + "':[" + colexp + '],';
@@ -8846,18 +8847,18 @@ yy.Select.prototype.compileGroup = function (query) {
 								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}']!== 'object' && typeof g['${colas}']!== 'number' && typeof ${colexp1} == 'number'){g['${colas}'] = ${colexp}}
 							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 if(typeof g['${colas}'] == 'number' && typeof ${colexp1} ==null){g['${colas}'] = g['${colas}']}
-							else if(typeof g['${colas}'] == null && typeof ${colexp1} =='number'){g['${colas}'] = ${colexp1}}
-							else{g['${colas}'] += ${colexp1}||0}` +
+							else if(typeof g['${colas}'] == null && typeof ${colexp1} =='number'){g['${colas}'] = ${colexp}}
+							else{g['${colas}'] += ${colexp}||0}` +
 								post
 							);
 						}
 						return (
 							pre +
-							`if(g['${colas}'] == null && ${colexp} == null){g['${colas}'] = null} 
+							`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}']}
@@ -8872,7 +8873,7 @@ yy.Select.prototype.compileGroup = function (query) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
 							return (
 								pre +
-								`if(typeof g['${colas}'] == 'string' && !isNaN(g['${colas}']) && typeof Number(g['${colas}']) == 'number' && 
+								`if(typeof g['${colas}'] == 'string' && !isNaN(g['${colas}']) && typeof Number(g['${colas}']) == 'number' &&
 						typeof ${colexp1} == 'string' && !isNaN(${colexp1}) && typeof Number(${colexp1}) == 'number'){g['${colas}'] = Number(g['${colas}']) + Number(${colexp1})}
 						else if(typeof g['${colas}'] == 'string' && typeof ${colexp1} == 'string'){g['${colas}'] = 0}
 						else if(typeof g['${colas}'] == 'string' && typeof ${colexp1} == 'number'){g['${colas}'] = ${colexp1}}
@@ -8883,7 +8884,7 @@ yy.Select.prototype.compileGroup = function (query) {
 						}
 						return (
 							pre +
-							`if(typeof g['${colas}'] == 'string' && !isNaN(g['${colas}']) && typeof Number(g['${colas}']) == 'number' && 
+							`if(typeof g['${colas}'] == 'string' && !isNaN(g['${colas}']) && typeof Number(g['${colas}']) == 'number' &&
 						typeof ${colexp} == 'string' && !isNaN(${colexp}) && typeof Number(${colexp}) == 'number'){g['${colas}'] = Number(g['${colas}']) + Number(${colexp})}
 						else if(typeof g['${colas}'] == 'string' && typeof ${colexp} == 'string'){g['${colas}'] = 0}
 						else if(typeof g['${colas}'] == 'string' && typeof ${colexp} == 'number'){g['${colas}'] = ${colexp}}
@@ -8913,43 +8914,51 @@ yy.Select.prototype.compileGroup = function (query) {
 					} else if (col.aggregatorid === 'MIN') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
-							return (
+
+							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')
+								`if((g['${colas}'] == null && ${colexp1}!== null) ? y = ${colexp} : (g['${colas}']!== null &&
+							${colexp1} == 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' && 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((g['${colas}'] == null && ${colexp}!== null) ? y = ${colexp} : (g['${colas}']!== null && 
+							`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' && 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 colexp1 = colExpIfFunIdExists(col.expression);
-							return (
+
+							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);}}` +
+								`if((g['${colas}'] == null && ${colexp1}!== null) ? y = ${colexp} : (g['${colas}']!== null &&
+							${colexp1} == 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
 							);
 						}
 						return (
 							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);}}` +
+							`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 === 'FIRST') {