alasql 2.1.4 → 2.1.6

package/README.md

@@ -1,4 +1,4 @@
-- _AlaSQL is an unfunded open source project installed 95k time each month. [Please donate your time](https://github.com/AlaSQL/alasql/issues?q=is%3Aopen+label%3A%22Help+wanted%22+label%3A%22Good+first+issue%22+sort%3Acreated-desc+). We appreciate any and all contributions we can get._
+- _AlaSQL is an unfunded open source project installed 95k time each month. [Please donate your time](https://github.com/AlaSQL/alasql/issues?q=is%3Aopen+label%3A%22Help+wanted%22+sort%3Acreated-desc). We appreciate any and all contributions we can get._
 
 - _Have a question? Ask on [Stack Overflow](http://stackoverflow.com/questions/ask?tags=AlaSQL) using the "alasql" tag._
 

package/bin/alasql-cli.js

@@ -44,6 +44,14 @@ let yargs = require('yargs')
 	.nargs('f', 1)
 	.normalize('f')
 
+	.boolean('ast')
+	.describe('ast', 'Print AST instead of result')
+	.normalize('ast')
+
+	/*.boolean('comp')
+	.describe('comp', 'Print compiled function instead of result')
+	.normalize('comp')*/
+
 	.help('h')
 	.alias('h', 'help')
 
@@ -115,6 +123,26 @@ function execute(sql, params) {
 		}
 	}
 
+	if (argv.ast) {
+		try {
+			console.log(formatOutput(alasql.parse(sql, params)));
+			process.exit(0);
+		} catch (e) {
+			console.error(e);
+			process.exit(1);
+		}
+	}
+
+	/*if (argv.comp) {
+		try {
+			console.log(alasql.compile(sql, params));
+			process.exit(0);
+		} catch (e) {
+			console.error(e);
+			process.exit(1);
+		}
+	}*/
+
 	alasql
 		.promise(sql, params)
 		.then(function (res) {

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.1.3-develop-dc864f6c | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.1.5-develop-eec33e2f | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 2.1.3-develop-dc864f6c
+@version 2.1.5-develop-eec33e2f
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

package/dist/alasql-worker.min.js

@@ -1,2 +1,2 @@
-//! AlaSQL v2.1.3-develop-dc864f6c | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.1.5-develop-eec33e2f | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
 !function(r,e){"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?module.exports=e():r.alasql=e()}(this,function(){function i(r,e,o){"function"==typeof(e=e||[])&&(scope=o,o=e,e=[]),"object"!=typeof e&&(e=[e]);var t=i.lastid++;i.buffer[t]=o,i.webworker.postMessage({id:t,sql:r,params:e})}var a;if(i.options={},i.options.progress=function(){},isArray=function(r){return"[object Array]"===Object.prototype.toString.call(r)},i.promise=function(){throw new Error("Please include a Promise/A+ library")},"undefined"!=typeof Promise&&(a=function(r,e,n,s){return new Promise(function(o,t){i(r,e,function(r,e){e?t(e):(n&&s&&!1!==i.options.progress&&i.options.progress(n,s),o(r))})})},i.promise=function(r,e){if("undefined"==typeof Promise)throw new Error("Please include a Promise/A+ library");if("string"==typeof r)return a(r,e);if(!isArray(r)||r.length<1||void 0!==e)throw new Error("Error in .promise parameters");var o=r;if(!(o.length<1)){for(var t,n,s=[],i=0;i<o.length;i++){if("string"==typeof(n=o[i])&&(n=[n]),!isArray(n)||n.length<1||2<n.length)throw new Error("Error in .promise parameter");t=n[0],n=n[1]||void 0,s.push(a(t,n,i,o.length))}return Promise.all(s)}}),i=i||!1)return i.worker=function(){throw new Error("Can find webworker in this enviroment")},"undefined"!=typeof Worker&&(i.worker=function(r,e,o){if(void 0===(r=!0===r?void 0:r))for(var t=document.getElementsByTagName("script"),n=0;n<t.length;n++){if("alasql-worker.js"===t[n].src.substr(-16).toLowerCase()){r=t[n].src.substr(0,t[n].src.length-16)+"alasql.js";break}if("alasql-worker.min.js"===t[n].src.substr(-20).toLowerCase()){r=t[n].src.substr(0,t[n].src.length-20)+"alasql.min.js";break}if("alasql.js"===t[n].src.substr(-9).toLowerCase()){r=t[n].src;break}if("alasql.min.js"===t[n].src.substr(-13).toLowerCase()){r=t[n].src.substr(0,t[n].src.length-13)+"alasql.min.js";break}}if(void 0===r)throw new Error("Path to alasql.js is not specified");var s;!1!==r?(s=(s="importScripts('")+r+"');self.onmessage = function(event) {alasql(event.data.sql,event.data.params, function(data){postMessage({id:event.data.id, data:data});});}",s=new Blob([s],{type:"text/plain"}),i.webworker=new Worker(URL.createObjectURL(s)),i.webworker.onmessage=function(r){var e=r.data.id;i.buffer[e](r.data.data),delete i.buffer[e]},i.webworker.onerror=function(r){throw r},1<arguments.length&&i("REQUIRE "+e.map(function(r){return'"'+r+'"'}).join(","),[],o)):!1===r&&delete i.webworker}),i.lastid=0,i.buffer={},i.worker(),i;throw new Error("alasql was not found")});

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.1.3-develop-dc864f6c | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.1.5-develop-eec33e2f | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 2.1.3-develop-dc864f6c
+@version 2.1.5-develop-eec33e2f
 
 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.3-develop-dc864f6c';
+alasql.version = '2.1.5-develop-eec33e2f';
 
 /**
 	Debug flag
@@ -4551,6 +4551,10 @@ alasql.options.excel = {cellDates: true};
 
 alasql.options.joinstar = 'overwrite'; // Option for SELECT * FROM a,b
 
+alasql.options.loopbreak = 100000;
+
+alasql.options;
+
 //alasql.options.worker = false;
 
 // Variables
@@ -5697,7 +5701,7 @@ function doSearch(databaseid, params, cb) {
 		//			throw new Error('Selector "'+sel.srchid+'" not found');
 		//		};
 
-		var SECURITY_BREAK = 100000;
+		var INFINITE_LOOP_BREAK = alasql.options.loopbreak || 100000;
 
 		if (sel.selid) {
 			// TODO Process Selector
@@ -5928,8 +5932,8 @@ function doSearch(databaseid, params, cb) {
 						}
 						// Security brake
 						i++;
-						if (i > SECURITY_BREAK) {
-							throw new Error('Security brake. Number of iterations = ' + i);
+						if (i > INFINITE_LOOP_BREAK) {
+							throw new Error('Infinite loop brake. Number of iterations = ' + i);
 						}
 					}
 				}
@@ -6109,8 +6113,8 @@ function doSearch(databaseid, params, cb) {
 
 					// Security brake
 					i++;
-					if (i > SECURITY_BREAK) {
-						throw new Error('Security brake. Number of iterations = ' + i);
+					if (i > INFINITE_LOOP_BREAK) {
+						throw new Error('Infinite loop brake. Number of iterations = ' + i);
 					}
 				}
 				return retval;
@@ -6144,8 +6148,8 @@ function doSearch(databaseid, params, cb) {
 
 					// Security brake
 					i++;
-					if (i > SECURITY_BREAK) {
-						throw new Error('Loop brake. Number of iterations = ' + i);
+					if (i > INFINITE_LOOP_BREAK) {
+						throw new Error('Infinite loop brake. Number of iterations = ' + i);
 					}
 				}
 
@@ -10504,8 +10508,8 @@ yy.Over.prototype.toString = function () {
 */
 
 /**
-  	Expression statement ( = 2*2; )
-  	@class
+		Expression statement ( = 2*2; )
+		@class
 	@param {object} params Initial parameters
 */
 yy.ExpressionStatement = function (params) {
@@ -10629,8 +10633,7 @@ yy.JavaScript.prototype.toString = function () {
 	return s;
 };
 
-yy.JavaScript.prototype.toJS = function (/* context, tableid, defcols*/) {
-
+yy.JavaScript.prototype.toJS = function () {
 	return '(' + this.value + ')';
 };
 yy.JavaScript.prototype.execute = function (databaseid, params, cb) {
@@ -10679,8 +10682,6 @@ yy.Join.prototype.toString = function () {
 	return s;
 };
 
-// }
-
 /**
 	Table class
 	@class
@@ -10758,6 +10759,7 @@ yy.Op.prototype.toString = function () {
 
 		return s;
 	}
+
 	return (
 		this.left.toString() +
 		' ' +
@@ -10769,7 +10771,6 @@ yy.Op.prototype.toString = function () {
 };
 
 yy.Op.prototype.findAggregator = function (query) {
-
 	if (this.left && this.left.findAggregator) {
 		this.left.findAggregator(query);
 	}
@@ -10901,17 +10902,28 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 	}
 
 	if (this.op === 'IS') {
-		s =
-			'' +
-			'(' +
-			'(' +
-			leftJS() +
-			'==null)' + // Cant be ===
-			' === ' +
-			'(' +
-			rightJS() +
-			'==null)' + // Cant be ===
-			')';
+		const leftOperand = leftJS();
+		const rightOperand = rightJS();
+		if (
+			this.right instanceof yy.NullValue ||
+			(this.right.op === 'NOT' && this.right.right instanceof yy.NullValue)
+		) {
+			s = `(
+					(${leftOperand}==null)   // Cant be ===
+					===
+					(${rightOperand}==null)  // Cant be ===
+				)`;
+		} else {
+			s = `(
+					(${leftOperand} == ${rightOperand})
+					||
+					(
+						${leftOperand}  < 0
+						&& 
+						true == ${rightOperand} 
+					) 
+				)`;
+		}
 	}
 
 	if (this.op === '==') {
@@ -10974,7 +10986,6 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 			')' +
 			')' +
 			')';
-
 	}
 
 	if (this.op === 'IN') {
@@ -11010,13 +11021,10 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 	if (this.op === 'NOT IN') {
 		if (this.right instanceof yy.Select) {
 			s = '(';
-			//this.query.queriesdata['+this.queriesidx+']
-			//			s += 'alasql.utils.flatArray(this.query.queriesfn['+(this.queriesidx)+'](params,null,p))';
 			s += 'alasql.utils.flatArray(this.queriesfn[' + this.queriesidx + '](params,null,p))';
 			s += '.indexOf(';
 			s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 		} else if (Array.isArray(this.right)) {
-			//			if(this.right.length == 0) return 'true';
 			s = '([' + this.right.map(ref).join(',') + '].indexOf(';
 			s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 		} else {
@@ -11030,7 +11038,6 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 	if (this.allsome === 'ALL') {
 		var s;
 		if (this.right instanceof yy.Select) {
-			//			var s = 'this.query.queriesdata['+this.queriesidx+']';
 			s = 'alasql.utils.flatArray(this.query.queriesfn[' + this.queriesidx + '](params,null,p))';
 
 			s += '.every(function(b){return (';
@@ -11049,7 +11056,6 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 	if (this.allsome === 'SOME' || this.allsome === 'ANY') {
 		var s;
 		if (this.right instanceof yy.Select) {
-			//			var s = 'this.query.queriesdata['+this.queriesidx+']';
 			s = 'alasql.utils.flatArray(this.query.queriesfn[' + this.queriesidx + '](params,null,p))';
 			s += '.some(function(b){return (';
 			s += leftJS() + ')' + op + 'b})';
@@ -11088,12 +11094,9 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 	// 	// 		+ ')';
 	// }
 
-	// Change names
-
 	var expr = s || '(' + leftJS() + op + rightJS() + ')';
 
 	var declareRefs = 'y=[(' + refs.join('), (') + ')]';
-
 	if (op === '&&' || op === '||' || op === 'IS' || op === 'IS NULL' || op === 'IS NOT NULL') {
 		return '(' + declareRefs + ', ' + expr + ')';
 	}
@@ -11145,8 +11148,6 @@ yy.StringValue.prototype.toType = function () {
 };
 
 yy.StringValue.prototype.toJS = function () {
-
-	//	return "'"+doubleqq(this.value)+"'";
 	return "'" + escapeq(this.value) + "'";
 };
 
@@ -11179,8 +11180,6 @@ yy.ArrayValue.prototype.toType = function () {
 };
 
 yy.ArrayValue.prototype.toJS = function (context, tableid, defcols) {
-
-	//	return "'"+doubleqq(this.value)+"'";
 	return (
 		'[(' +
 		this.value
@@ -11328,7 +11327,6 @@ yy.Column = function (params) {
 yy.Column.prototype.toString = function () {
 	var s;
 	if (this.columnid == +this.columnid) {
-		// jshint ignore:line
 		s = '[' + this.columnid + ']';
 	} else {
 		s = this.columnid;
@@ -11347,7 +11345,6 @@ yy.Column.prototype.toString = function () {
 };
 
 yy.Column.prototype.toJS = function (context, tableid, defcols) {
-
 	var s = '';
 	if (!this.tableid && tableid === '' && !defcols) {
 		if (this.columnid !== '_') {
@@ -11361,17 +11358,10 @@ yy.Column.prototype.toJS = function (context, tableid, defcols) {
 		}
 	} else {
 		if (context === 'g') {
-			// if(this.columnid == '_') {
-			// } else {
 			s = "g['" + this.nick + "']";
-			// }
 		} else if (this.tableid) {
 			if (this.columnid !== '_') {
-				// if() {
-				// s = context+'[\''+tableid + '\'][\''+this.tableid+'\'][\''+this.columnid+'\']';
-				// } else {
 				s = context + "['" + this.tableid + "']['" + this.columnid + "']";
-				// }
 			} else {
 				if (context === 'g') {
 					s = "g['_']";
@@ -11394,22 +11384,13 @@ yy.Column.prototype.toJS = function (context, tableid, defcols) {
 
 			} else {
 				if (this.columnid !== '_') {
-					// if(defcols['.'][this.tableid]) {
-
-					// 	s = context+'[\''+tableid + '\'][\''+this.tableid + '\'][\''+this.columnid+'\']';
-					// } else {
 					s = context + "['" + (this.tableid || tableid) + "']['" + this.columnid + "']";
-					// }
 				} else {
 					s = context + "['" + (this.tableid || tableid) + "']";
 				}
 			}
 		} else if (tableid === -1) {
-			//			if(this.columnid != '') {
 			s = context + "['" + this.columnid + "']";
-			//			} else {
-			//				s = context;
-			//			}
 		} else {
 			if (this.columnid !== '_') {
 				s = context + "['" + (this.tableid || tableid) + "']['" + this.columnid + "']";
@@ -11418,9 +11399,6 @@ yy.Column.prototype.toJS = function (context, tableid, defcols) {
 			}
 		}
 	}
-
-	//	console.trace(new Error());
-
 	return s;
 };
 
@@ -11452,16 +11430,8 @@ yy.AggrValue.prototype.toString = function () {
 };
 
 yy.AggrValue.prototype.findAggregator = function (query) {
-
-	//	var colas = this.as || this.toString();
-
 	var colas = escapeq(this.toString()) + ':' + query.selectGroup.length;
-
-	//		if(!query.selectColumns[colas]) {
-	//		}
-
 	var found = false;
-
 	if (!found) {
 		if (!this.nick) {
 			this.nick = colas;
@@ -11478,8 +11448,6 @@ yy.AggrValue.prototype.findAggregator = function (query) {
 		}
 		query.selectGroup.push(this);
 	}
-
-	//		this.reduced = true;
 	return;
 };
 
@@ -11498,11 +11466,10 @@ yy.AggrValue.prototype.toType = function () {
 		return this.expression.toType();
 	}
 
-	// todo: implement default;
+	return this.expression.toType();
 };
 
-yy.AggrValue.prototype.toJS = function (/*context, tableid, defcols*/) {
-
+yy.AggrValue.prototype.toJS = function () {
 	var colas = this.nick;
 	if (colas === undefined) {
 		colas = this.toString();
@@ -11513,6 +11480,7 @@ yy.AggrValue.prototype.toJS = function (/*context, tableid, defcols*/) {
 yy.OrderExpression = function (params) {
 	return yy.extend(this, params);
 };
+
 yy.OrderExpression.prototype.toString = yy.Expression.prototype.toString;
 
 yy.GroupExpression = function (params) {
@@ -11949,42 +11917,39 @@ alasql.aggr.GROUP_CONCAT = function (v, s, stage) {
 	return s;
 };
 
-alasql.aggr.MEDIAN = function (v, s, stage) {
+alasql.aggr.median = alasql.aggr.MEDIAN = function (v, s, stage) {
 	if (stage === 2) {
 		if (v !== null) {
 			s.push(v);
 		}
 		return s;
-	} else if (stage === 1) {
+	}
+
+	if (stage === 1) {
 		if (v === null) {
 			return [];
 		}
 		return [v];
-	} else {
-		if (!s.length) {
-			return s;
-		}
+	}
 
-		var r = s.sort(function (a, b) {
-			if (a === b) {
-				return 0;
-			}
-			if (a > b) {
-				return 1;
-			}
-			return -1;
-		});
-		var p = (r.length + 1) / 2;
-		if (Number.isInteger(p)) {
-			return r[p - 1];
-		}
+	if (!s.length) {
+		return null;
+	}
 
-		var value = r[Math.floor(p - 1)];
-		if (typeof value !== 'number' && !(value instanceof Number)) {
-			return value;
-		}
+	var r = s.sort((a, b) => {
+		if (a > b) return 1;
+		if (a < b) return -1;
+		return 0;
+	});
 
-		return (value + r[Math.ceil(p - 1)]) / 2;
+	var middle = (r.length + 1) / 2;
+	var middleFloor = middle | 0;
+	var el = r[middleFloor - 1];
+
+	if (middle === middleFloor || (typeof el !== 'number' && !(el instanceof Number))) {
+		return el;
+	} else {
+		return (el + r[middleFloor]) / 2;
 	}
 };