alasql 0.6.6 → 0.6.8

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.7.1-develop-a2ccc470undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.6.8 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.7.1-develop-a2ccc470undefined
+@version 0.6.8
 
 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 = '0.7.1-develop-a2ccc470undefined';
+alasql.version = '0.6.8';
 
 /**
 	Debug flag
@@ -240,8 +240,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:
@@ -273,13 +273,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 378: case 494: case 504: case 506: case 518: case 524: case 525: case 570:
@@ -296,20 +296,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:
@@ -347,9 +347,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:
@@ -516,11 +516,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:
@@ -561,17 +561,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:
@@ -633,30 +633,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:
@@ -856,10 +856,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:
@@ -900,18 +900,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:
@@ -955,16 +955,16 @@ case 347:
 break;
 case 348:
 
-			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]=='DISTINCT') });
+		    } else {
+			    this.$ = new yy.FuncValue({funcid: funcid, args: exprlist}); 
+			};
 
 break;
 case 349:
@@ -1017,9 +1017,9 @@ case 365:
 break;
 case 366:
 
-			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 367:
@@ -1030,14 +1030,14 @@ case 368: case 369:
 break;
 case 370:
 
-			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 371:
 
-			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 372:
@@ -1147,43 +1147,43 @@ case 414:
 break;
 case 415:
 
-			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 416:
 
-			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 417:
 
-			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 418:
@@ -1209,16 +1209,16 @@ case 424:
 break;
 case 425:
 
-			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 426:
 
-			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 427:
@@ -1241,17 +1241,17 @@ case 432: case 434:
 break;
 case 435:
 
-/*			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 436:
 
-				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 437:
@@ -1259,14 +1259,14 @@ case 437:
 break;
 case 438:
 
-			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 439:
@@ -1346,20 +1346,20 @@ this.$ = $$[$0-2]; $$[$0-2].push($$[$0])
 break;
 case 492:
 
-			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 493:
 
-			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 495:
@@ -1397,7 +1397,7 @@ case 522:
 break;
 case 528:
 
-			this.$ = {type: 'UNIQUE', columns: $$[$0-1], clustered:($$[$0-3]+'').toUpperCase()};
+			this.$ = {type: 'UNIQUE', columns: $$[$0-1], clustered:($$[$0-3]+'').toUpperCase()};
 
 break;
 case 537:
@@ -1432,7 +1432,7 @@ this.$ = undefined
 break;
 case 550:
 
-			yy.extend($$[$0-1],$$[$0]); this.$ = $$[$0-1];
+			yy.extend($$[$0-1],$$[$0]); this.$ = $$[$0-1];
 
 break;
 case 553:
@@ -1520,7 +1520,7 @@ case 585:
  this.$ = new yy.CreateDatabase({engineid:$$[$0-7].toUpperCase(), databaseid:$$[$0-4], args:$$[$0-2], as:$$[$0] }); yy.extend(this.$,$$[$0-5]); 
 break;
 case 586:
- 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 587:
@@ -1588,16 +1588,16 @@ case 610:
 break;
 case 611:
 
-			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 612:
 
-			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 616:
@@ -1685,25 +1685,25 @@ case 670:
  this.$ = new yy.BeginTransaction(); 
 break;
 case 671:
- 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 672:
 
-			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 673:
 this.$ = $$[$0];
 break;
 case 674:
- 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 675:
@@ -1753,9 +1753,9 @@ case 696:
 break;
 case 697:
 
-			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 698: case 699:
@@ -1814,8 +1814,8 @@ case 724:
 break;
 case 725:
 
-			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 728:
@@ -1829,8 +1829,8 @@ case 730:
 break;
 case 731:
 
-			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 732:
@@ -1841,29 +1841,29 @@ case 733:
 break;
 case 736:
 
-			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 737:
 
-			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 738:
 
-			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 739:
 
-			this.$ = {source:$$[$0-2], target: $$[$0]};
+			this.$ = {source:$$[$0-2], target: $$[$0]};
 
 break;
 case 743:
@@ -1871,25 +1871,25 @@ case 743:
 break;
 case 746: case 747:
 
-			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 748:
 
-			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 749:
 
-			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 750:
 
-			this.$ = {class:$$[$0]}; 
+			this.$ = {class:$$[$0]}; 
 
 break;
 case 756:
@@ -1906,21 +1906,21 @@ case 761:
 break;
 case 764:
 
-			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 765:
 
-			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 766:
 
-			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 767: case 768: case 770:
@@ -2208,17 +2208,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 = ({
@@ -3101,7 +3101,7 @@ case 275:return 'INVALID'
 break;
 }
 },
-rules: [/^(?:``([^\`])+``)/i,/^(?:\[\?\])/i,/^(?:@\[)/i,/^(?:ARRAY\[)/i,/^(?:\[([^\]'])*?\])/i,/^(?:`([^\`'])*?`)/i,/^(?:N(['](\\.|[^']|\\')*?['])+)/i,/^(?:X(['](\\.|[^']|\\')*?['])+)/i,/^(?:(['](\\.|[^']|\\')*?['])+)/i,/^(?:(["](\\.|[^"]|\\")*?["])+)/i,/^(?:--(.*?)($|\r\n|\r|\n))/i,/^(?:\s+)/i,/^(?:\|\|)/i,/^(?:\|)/i,/^(?:VALUE\s+OF\s+SEARCH\b)/i,/^(?:VALUE\s+OF\s+SELECT\b)/i,/^(?:ROW\s+OF\s+SELECT\b)/i,/^(?:COLUMN\s+OF\s+SELECT\b)/i,/^(?:MATRIX\s+OF\s+SELECT\b)/i,/^(?:INDEX\s+OF\s+SELECT\b)/i,/^(?:RECORDSET\s+OF\s+SELECT\b)/i,/^(?:TEXT\s+OF\s+SELECT\b)/i,/^(?:SELECT\b)/i,/^(?:ABSOLUTE\b)/i,/^(?:ACTION\b)/i,/^(?:ADD\b)/i,/^(?:AFTER\b)/i,/^(?:AGGR\b)/i,/^(?:AGGREGATE\b)/i,/^(?:AGGREGATOR\b)/i,/^(?:ALL\b)/i,/^(?:ALTER\b)/i,/^(?:AND\b)/i,/^(?:ANTI\b)/i,/^(?:ANY\b)/i,/^(?:APPLY\b)/i,/^(?:ARRAY\b)/i,/^(?:AS\b)/i,/^(?:ASSERT\b)/i,/^(?:ASC\b)/i,/^(?:ATTACH\b)/i,/^(?:AUTO(_)?INCREMENT\b)/i,/^(?:AVG\b)/i,/^(?:BEFORE\b)/i,/^(?:BEGIN\b)/i,/^(?:BETWEEN\b)/i,/^(?:BREAK\b)/i,/^(?:NOT\s+BETWEEN\b)/i,/^(?:NOT\s+LIKE\b)/i,/^(?:BY\b)/i,/^(?:~~\*)/i,/^(?:!~~\*)/i,/^(?:~~)/i,/^(?:!~~)/i,/^(?:ILIKE\b)/i,/^(?:NOT\s+ILIKE\b)/i,/^(?:CALL\b)/i,/^(?:CASE\b)/i,/^(?:CAST\b)/i,/^(?:CHECK\b)/i,/^(?:CLASS\b)/i,/^(?:CLOSE\b)/i,/^(?:COLLATE\b)/i,/^(?:COLUMN\b)/i,/^(?:COLUMNS\b)/i,/^(?:COMMIT\b)/i,/^(?:CONSTRAINT\b)/i,/^(?:CONTENT\b)/i,/^(?:CONTINUE\b)/i,/^(?:CONVERT\b)/i,/^(?:CORRESPONDING\b)/i,/^(?:COUNT\b)/i,/^(?:CREATE\b)/i,/^(?:CROSS\b)/i,/^(?:CUBE\b)/i,/^(?:CURRENT_TIMESTAMP\b)/i,/^(?:CURSOR\b)/i,/^(?:DATABASE(S)?)/i,/^(?:DATEADD\b)/i,/^(?:DATEDIFF\b)/i,/^(?:DECLARE\b)/i,/^(?:DEFAULT\b)/i,/^(?:DELETE\b)/i,/^(?:DELETED\b)/i,/^(?:DESC\b)/i,/^(?:DETACH\b)/i,/^(?:DISTINCT\b)/i,/^(?:DROP\b)/i,/^(?:ECHO\b)/i,/^(?:EDGE\b)/i,/^(?:END\b)/i,/^(?:ENUM\b)/i,/^(?:ELSE\b)/i,/^(?:ESCAPE\b)/i,/^(?:EXCEPT\b)/i,/^(?:EXEC\b)/i,/^(?:EXECUTE\b)/i,/^(?:EXISTS\b)/i,/^(?:EXPLAIN\b)/i,/^(?:FALSE\b)/i,/^(?:FETCH\b)/i,/^(?:FIRST\b)/i,/^(?:FOR\b)/i,/^(?:FOREIGN\b)/i,/^(?:FROM\b)/i,/^(?:FULL\b)/i,/^(?:FUNCTION\b)/i,/^(?:GLOB\b)/i,/^(?:GO\b)/i,/^(?:GRAPH\b)/i,/^(?:GROUP\b)/i,/^(?:GROUPING\b)/i,/^(?:HAVING\b)/i,/^(?:IF\b)/i,/^(?:IDENTITY\b)/i,/^(?:IS\b)/i,/^(?:IN\b)/i,/^(?:INDEX\b)/i,/^(?:INDEXED\b)/i,/^(?:INNER\b)/i,/^(?:INSTEAD\b)/i,/^(?:INSERT\b)/i,/^(?:INSERTED\b)/i,/^(?:INTERSECT\b)/i,/^(?:INTERVAL\b)/i,/^(?:INTO\b)/i,/^(?:JOIN\b)/i,/^(?:KEY\b)/i,/^(?:LAST\b)/i,/^(?:LET\b)/i,/^(?:LEFT\b)/i,/^(?:LIKE\b)/i,/^(?:LIMIT\b)/i,/^(?:MATCHED\b)/i,/^(?:MATRIX\b)/i,/^(?:MAX(\s+)?(?=\())/i,/^(?:MAX(\s+)?(?=(,|\))))/i,/^(?:MIN(\s+)?(?=\())/i,/^(?:MERGE\b)/i,/^(?:MINUS\b)/i,/^(?:MODIFY\b)/i,/^(?:NATURAL\b)/i,/^(?:NEXT\b)/i,/^(?:NEW\b)/i,/^(?:NOCASE\b)/i,/^(?:NO\b)/i,/^(?:NOT\b)/i,/^(?:NULL\b)/i,/^(?:NULLS\b)/i,/^(?:OFF\b)/i,/^(?:ON\b)/i,/^(?:ONLY\b)/i,/^(?:OF\b)/i,/^(?:OFFSET\b)/i,/^(?:OPEN\b)/i,/^(?:OPTION\b)/i,/^(?:OR\b)/i,/^(?:ORDER\b)/i,/^(?:OUTER\b)/i,/^(?:OVER\b)/i,/^(?:PATH\b)/i,/^(?:PARTITION\b)/i,/^(?:PERCENT\b)/i,/^(?:PIVOT\b)/i,/^(?:PLAN\b)/i,/^(?:PRIMARY\b)/i,/^(?:PRINT\b)/i,/^(?:PRIOR\b)/i,/^(?:QUERY\b)/i,/^(?:READ\b)/i,/^(?:RECORDSET\b)/i,/^(?:REDUCE\b)/i,/^(?:REFERENCES\b)/i,/^(?:REGEXP\b)/i,/^(?:REINDEX\b)/i,/^(?:RELATIVE\b)/i,/^(?:REMOVE\b)/i,/^(?:RENAME\b)/i,/^(?:REPEAT\b)/i,/^(?:REPLACE\b)/i,/^(?:REQUIRE\b)/i,/^(?:RESTORE\b)/i,/^(?:RETURN\b)/i,/^(?:RETURNS\b)/i,/^(?:RIGHT\b)/i,/^(?:ROLLBACK\b)/i,/^(?:ROLLUP\b)/i,/^(?:ROW\b)/i,/^(?:ROWS\b)/i,/^(?:SCHEMA(S)?)/i,/^(?:SEARCH\b)/i,/^(?:SEMI\b)/i,/^(?:SET\b)/i,/^(?:SETS\b)/i,/^(?:SHOW\b)/i,/^(?:SOME\b)/i,/^(?:SOURCE\b)/i,/^(?:STRATEGY\b)/i,/^(?:STORE\b)/i,/^(?:SUM\b)/i,/^(?:TABLE\b)/i,/^(?:TABLES\b)/i,/^(?:TARGET\b)/i,/^(?:TEMP\b)/i,/^(?:TEMPORARY\b)/i,/^(?:TEXTSTRING\b)/i,/^(?:THEN\b)/i,/^(?:TIMEOUT\b)/i,/^(?:TO\b)/i,/^(?:TOP\b)/i,/^(?:TRAN\b)/i,/^(?:TRANSACTION\b)/i,/^(?:TRIGGER\b)/i,/^(?:TRUE\b)/i,/^(?:TRUNCATE\b)/i,/^(?:UNION\b)/i,/^(?:UNIQUE\b)/i,/^(?:UNPIVOT\b)/i,/^(?:UPDATE\b)/i,/^(?:USE\b)/i,/^(?:USING\b)/i,/^(?:VALUE\b)/i,/^(?:VALUES\b)/i,/^(?:VERTEX\b)/i,/^(?:VIEW\b)/i,/^(?:WHEN\b)/i,/^(?:WHERE\b)/i,/^(?:WHILE\b)/i,/^(?:WITH\b)/i,/^(?:WORK\b)/i,/^(?:(\d*[.])?\d+[eE]\d+)/i,/^(?:(\d*[.])?\d+)/i,/^(?:->)/i,/^(?:#)/i,/^(?:\+)/i,/^(?:-)/i,/^(?:\*)/i,/^(?:\/)/i,/^(?:%)/i,/^(?:!===)/i,/^(?:===)/i,/^(?:!==)/i,/^(?:==)/i,/^(?:>=)/i,/^(?:&)/i,/^(?:\|)/i,/^(?:<<)/i,/^(?:>>)/i,/^(?:>)/i,/^(?:<=)/i,/^(?:<>)/i,/^(?:<)/i,/^(?:=)/i,/^(?:!=)/i,/^(?:\()/i,/^(?:\))/i,/^(?:@)/i,/^(?:\{)/i,/^(?:\})/i,/^(?:\])/i,/^(?::-)/i,/^(?:\?-)/i,/^(?:\.\.)/i,/^(?:\.)/i,/^(?:,)/i,/^(?:::)/i,/^(?::)/i,/^(?:;)/i,/^(?:\$)/i,/^(?:\?)/i,/^(?:!)/i,/^(?:\^)/i,/^(?:~)/i,/^(?:[0-9]*[a-zA-Z_]+[a-zA-Z_0-9]*)/i,/^(?:$)/i,/^(?:.)/i],
+rules: [/^(?:``([^\`'])+``)/i,/^(?:\[\?\])/i,/^(?:@\[)/i,/^(?:ARRAY\[)/i,/^(?:\[([^\]'])*?\])/i,/^(?:`([^\`'])*?`)/i,/^(?:N(['](\\.|[^']|\\')*?['])+)/i,/^(?:X(['](\\.|[^']|\\')*?['])+)/i,/^(?:(['](\\.|[^']|\\')*?['])+)/i,/^(?:(["](\\.|[^"]|\\")*?["])+)/i,/^(?:--(.*?)($|\r\n|\r|\n))/i,/^(?:\s+)/i,/^(?:\|\|)/i,/^(?:\|)/i,/^(?:VALUE\s+OF\s+SEARCH\b)/i,/^(?:VALUE\s+OF\s+SELECT\b)/i,/^(?:ROW\s+OF\s+SELECT\b)/i,/^(?:COLUMN\s+OF\s+SELECT\b)/i,/^(?:MATRIX\s+OF\s+SELECT\b)/i,/^(?:INDEX\s+OF\s+SELECT\b)/i,/^(?:RECORDSET\s+OF\s+SELECT\b)/i,/^(?:TEXT\s+OF\s+SELECT\b)/i,/^(?:SELECT\b)/i,/^(?:ABSOLUTE\b)/i,/^(?:ACTION\b)/i,/^(?:ADD\b)/i,/^(?:AFTER\b)/i,/^(?:AGGR\b)/i,/^(?:AGGREGATE\b)/i,/^(?:AGGREGATOR\b)/i,/^(?:ALL\b)/i,/^(?:ALTER\b)/i,/^(?:AND\b)/i,/^(?:ANTI\b)/i,/^(?:ANY\b)/i,/^(?:APPLY\b)/i,/^(?:ARRAY\b)/i,/^(?:AS\b)/i,/^(?:ASSERT\b)/i,/^(?:ASC\b)/i,/^(?:ATTACH\b)/i,/^(?:AUTO(_)?INCREMENT\b)/i,/^(?:AVG\b)/i,/^(?:BEFORE\b)/i,/^(?:BEGIN\b)/i,/^(?:BETWEEN\b)/i,/^(?:BREAK\b)/i,/^(?:NOT\s+BETWEEN\b)/i,/^(?:NOT\s+LIKE\b)/i,/^(?:BY\b)/i,/^(?:~~\*)/i,/^(?:!~~\*)/i,/^(?:~~)/i,/^(?:!~~)/i,/^(?:ILIKE\b)/i,/^(?:NOT\s+ILIKE\b)/i,/^(?:CALL\b)/i,/^(?:CASE\b)/i,/^(?:CAST\b)/i,/^(?:CHECK\b)/i,/^(?:CLASS\b)/i,/^(?:CLOSE\b)/i,/^(?:COLLATE\b)/i,/^(?:COLUMN\b)/i,/^(?:COLUMNS\b)/i,/^(?:COMMIT\b)/i,/^(?:CONSTRAINT\b)/i,/^(?:CONTENT\b)/i,/^(?:CONTINUE\b)/i,/^(?:CONVERT\b)/i,/^(?:CORRESPONDING\b)/i,/^(?:COUNT\b)/i,/^(?:CREATE\b)/i,/^(?:CROSS\b)/i,/^(?:CUBE\b)/i,/^(?:CURRENT_TIMESTAMP\b)/i,/^(?:CURSOR\b)/i,/^(?:DATABASE(S)?)/i,/^(?:DATEADD\b)/i,/^(?:DATEDIFF\b)/i,/^(?:DECLARE\b)/i,/^(?:DEFAULT\b)/i,/^(?:DELETE\b)/i,/^(?:DELETED\b)/i,/^(?:DESC\b)/i,/^(?:DETACH\b)/i,/^(?:DISTINCT\b)/i,/^(?:DROP\b)/i,/^(?:ECHO\b)/i,/^(?:EDGE\b)/i,/^(?:END\b)/i,/^(?:ENUM\b)/i,/^(?:ELSE\b)/i,/^(?:ESCAPE\b)/i,/^(?:EXCEPT\b)/i,/^(?:EXEC\b)/i,/^(?:EXECUTE\b)/i,/^(?:EXISTS\b)/i,/^(?:EXPLAIN\b)/i,/^(?:FALSE\b)/i,/^(?:FETCH\b)/i,/^(?:FIRST\b)/i,/^(?:FOR\b)/i,/^(?:FOREIGN\b)/i,/^(?:FROM\b)/i,/^(?:FULL\b)/i,/^(?:FUNCTION\b)/i,/^(?:GLOB\b)/i,/^(?:GO\b)/i,/^(?:GRAPH\b)/i,/^(?:GROUP\b)/i,/^(?:GROUPING\b)/i,/^(?:HAVING\b)/i,/^(?:IF\b)/i,/^(?:IDENTITY\b)/i,/^(?:IS\b)/i,/^(?:IN\b)/i,/^(?:INDEX\b)/i,/^(?:INDEXED\b)/i,/^(?:INNER\b)/i,/^(?:INSTEAD\b)/i,/^(?:INSERT\b)/i,/^(?:INSERTED\b)/i,/^(?:INTERSECT\b)/i,/^(?:INTERVAL\b)/i,/^(?:INTO\b)/i,/^(?:JOIN\b)/i,/^(?:KEY\b)/i,/^(?:LAST\b)/i,/^(?:LET\b)/i,/^(?:LEFT\b)/i,/^(?:LIKE\b)/i,/^(?:LIMIT\b)/i,/^(?:MATCHED\b)/i,/^(?:MATRIX\b)/i,/^(?:MAX(\s+)?(?=\())/i,/^(?:MAX(\s+)?(?=(,|\))))/i,/^(?:MIN(\s+)?(?=\())/i,/^(?:MERGE\b)/i,/^(?:MINUS\b)/i,/^(?:MODIFY\b)/i,/^(?:NATURAL\b)/i,/^(?:NEXT\b)/i,/^(?:NEW\b)/i,/^(?:NOCASE\b)/i,/^(?:NO\b)/i,/^(?:NOT\b)/i,/^(?:NULL\b)/i,/^(?:NULLS\b)/i,/^(?:OFF\b)/i,/^(?:ON\b)/i,/^(?:ONLY\b)/i,/^(?:OF\b)/i,/^(?:OFFSET\b)/i,/^(?:OPEN\b)/i,/^(?:OPTION\b)/i,/^(?:OR\b)/i,/^(?:ORDER\b)/i,/^(?:OUTER\b)/i,/^(?:OVER\b)/i,/^(?:PATH\b)/i,/^(?:PARTITION\b)/i,/^(?:PERCENT\b)/i,/^(?:PIVOT\b)/i,/^(?:PLAN\b)/i,/^(?:PRIMARY\b)/i,/^(?:PRINT\b)/i,/^(?:PRIOR\b)/i,/^(?:QUERY\b)/i,/^(?:READ\b)/i,/^(?:RECORDSET\b)/i,/^(?:REDUCE\b)/i,/^(?:REFERENCES\b)/i,/^(?:REGEXP\b)/i,/^(?:REINDEX\b)/i,/^(?:RELATIVE\b)/i,/^(?:REMOVE\b)/i,/^(?:RENAME\b)/i,/^(?:REPEAT\b)/i,/^(?:REPLACE\b)/i,/^(?:REQUIRE\b)/i,/^(?:RESTORE\b)/i,/^(?:RETURN\b)/i,/^(?:RETURNS\b)/i,/^(?:RIGHT\b)/i,/^(?:ROLLBACK\b)/i,/^(?:ROLLUP\b)/i,/^(?:ROW\b)/i,/^(?:ROWS\b)/i,/^(?:SCHEMA(S)?)/i,/^(?:SEARCH\b)/i,/^(?:SEMI\b)/i,/^(?:SET\b)/i,/^(?:SETS\b)/i,/^(?:SHOW\b)/i,/^(?:SOME\b)/i,/^(?:SOURCE\b)/i,/^(?:STRATEGY\b)/i,/^(?:STORE\b)/i,/^(?:SUM\b)/i,/^(?:TABLE\b)/i,/^(?:TABLES\b)/i,/^(?:TARGET\b)/i,/^(?:TEMP\b)/i,/^(?:TEMPORARY\b)/i,/^(?:TEXTSTRING\b)/i,/^(?:THEN\b)/i,/^(?:TIMEOUT\b)/i,/^(?:TO\b)/i,/^(?:TOP\b)/i,/^(?:TRAN\b)/i,/^(?:TRANSACTION\b)/i,/^(?:TRIGGER\b)/i,/^(?:TRUE\b)/i,/^(?:TRUNCATE\b)/i,/^(?:UNION\b)/i,/^(?:UNIQUE\b)/i,/^(?:UNPIVOT\b)/i,/^(?:UPDATE\b)/i,/^(?:USE\b)/i,/^(?:USING\b)/i,/^(?:VALUE\b)/i,/^(?:VALUES\b)/i,/^(?:VERTEX\b)/i,/^(?:VIEW\b)/i,/^(?:WHEN\b)/i,/^(?:WHERE\b)/i,/^(?:WHILE\b)/i,/^(?:WITH\b)/i,/^(?:WORK\b)/i,/^(?:(\d*[.])?\d+[eE]\d+)/i,/^(?:(\d*[.])?\d+)/i,/^(?:->)/i,/^(?:#)/i,/^(?:\+)/i,/^(?:-)/i,/^(?:\*)/i,/^(?:\/)/i,/^(?:%)/i,/^(?:!===)/i,/^(?:===)/i,/^(?:!==)/i,/^(?:==)/i,/^(?:>=)/i,/^(?:&)/i,/^(?:\|)/i,/^(?:<<)/i,/^(?:>>)/i,/^(?:>)/i,/^(?:<=)/i,/^(?:<>)/i,/^(?:<)/i,/^(?:=)/i,/^(?:!=)/i,/^(?:\()/i,/^(?:\))/i,/^(?:@)/i,/^(?:\{)/i,/^(?:\})/i,/^(?:\])/i,/^(?::-)/i,/^(?:\?-)/i,/^(?:\.\.)/i,/^(?:\.)/i,/^(?:,)/i,/^(?:::)/i,/^(?::)/i,/^(?:;)/i,/^(?:\$)/i,/^(?:\?)/i,/^(?:!)/i,/^(?:\^)/i,/^(?:~)/i,/^(?:[0-9]*[a-zA-Z_]+[a-zA-Z_0-9]*)/i,/^(?:$)/i,/^(?:.)/i],
 conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275],"inclusive":true}}
 });
 return lexer;
@@ -4027,11 +4027,11 @@ var cloneDeep = (utils.cloneDeep = function cloneDeep(obj) {
 		return +obj;
 	}
 
-	var temp = obj.constructor(); // changed
+	var temp = (Object.prototype.hasOwnProperty.call(obj, 'constructor') ? Object : obj.constructor)(); // changed
 
 	for (var key in obj) {
 		if (obj.hasOwnProperty(key)) {
-			temp[key] = cloneDeep(obj[key]);
+			/* A "__proto__" key from parsed data is copied as data, never as the prototype */ if (key === '__proto__') { Object.defineProperty(temp, key, {value: cloneDeep(obj[key]), writable: true, enumerable: true, configurable: true}); } else { temp[key] = cloneDeep(obj[key]); }
 		}
 	}
 	return temp;
@@ -4103,7 +4103,7 @@ var extend = (utils.extend = function extend(a, b) {
 	a = a || {};
 	for (var key in b) {
 		if (b.hasOwnProperty(key)) {
-			a[key] = b[key];
+			/* A "__proto__" key from parsed data is copied as data, never as the prototype */ if (key === '__proto__') { Object.defineProperty(a, key, {value: b[key], writable: true, enumerable: true, configurable: true}); } else { a[key] = b[key]; }
 		}
 	}
 	return a;
@@ -6954,7 +6954,7 @@ function queryfn3(query) {
 
 	if (query.groupfn) {
 		query.data = [];
-		if (query.groups.length === 0 && query.allgroups.length === 0) {
+		if (0 === query.groups.length) {
 			var g = {};
 			if (query.selectGroup.length > 0) {
 
@@ -9061,7 +9061,7 @@ yy.Select.prototype.compileGroup = function (query) {
 			aft2 = '';
 
 		if (typeof query.groupStar !== 'undefined') {
-			aft2 += "for(var f in p['" + query.groupStar + "']) {g[f]=p['" + query.groupStar + "'][f];};";
+			aft2 += "for(var f in p['" + query.groupStar + "']) {if(/^__proto__$/.test(f))Object.defineProperty(g,f,{writable:true,enumerable:true,configurable:true});g[f]=p['" + query.groupStar + "'][f];};";
 		}
 
 		/*
@@ -9384,7 +9384,7 @@ function compileSelectStar(query, aliases, joinstar) {
 		} else {
 
 			// if column not exist, then copy all
-			sp += 'var w=p["' + alias + '"];for(var k in w){r[k]=w[k]};';
+			sp += 'var w=p["' + alias + '"];for(var k in w){if(/^__proto__$/.test(k))Object.defineProperty(r,k,{writable:true,enumerable:true,configurable:true});r[k]=w[k]};';
 
 			query.dirtyColumns = true;
 		}
@@ -9713,10 +9713,10 @@ yy.Select.prototype.compileSelectGroup1 = function (query) {
 	self.columns.forEach(function (col) {
 
 		if (col instanceof yy.Column && col.columnid === '*') {
-			//			s += 'for(var k in g){r[k]=g[k]};';
+			//			s += 'for(var k in g){if(/^__proto__$/.test(k))Object.defineProperty(r,k,{writable:true,enumerable:true,configurable:true});r[k]=g[k]};';
 			//			s += 'for(var k in this.query.groupColumns){r[k]=g[this.query.groupColumns[k]]};';
 
-			s += 'for(var k in g) {r[k]=g[k]};';
+			s += 'for(var k in g) {if(/^__proto__$/.test(k))Object.defineProperty(r,k,{writable:true,enumerable:true,configurable:true});r[k]=g[k]};';
 			return '';
 
 		} else {
@@ -13022,7 +13022,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 
 			table.update(
 				function (t) {
-					for (var f in r) t[f] = r[f];
+					for (var f in r) {if(/^__proto__$/.test(f))Object.defineProperty(t,f,{writable:true,enumerable:true,configurable:true});t[f] = r[f];}
 				},
 				table.data.indexOf(toreplace),
 				params
@@ -14568,7 +14568,7 @@ yy.Insert.prototype.compile = function (databaseid) {
 					});
 				} else {
 
-					//					sw = 'var w='+JSONtoJS(values)+';for(var k in w){r[k]=w[k]};';
+					//					sw = 'var w='+JSONtoJS(values)+';for(var k in w){if(/^__proto__$/.test(k))Object.defineProperty(r,k,{writable:true,enumerable:true,configurable:true});r[k]=w[k]};';
 					sw = JSONtoJS(values);
 				}
 			}