alasql 2.1.4 → 2.1.6

package/dist/alasql.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
@@ -4545,6 +4545,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
@@ -5691,7 +5695,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
@@ -5922,8 +5926,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);
 						}
 					}
 				}
@@ -6103,8 +6107,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;
@@ -6138,8 +6142,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);
 					}
 				}
 
@@ -10498,8 +10502,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) {
@@ -10623,8 +10627,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) {
@@ -10673,8 +10676,6 @@ yy.Join.prototype.toString = function () {
 	return s;
 };
 
-// }
-
 /**
 	Table class
 	@class
@@ -10752,6 +10753,7 @@ yy.Op.prototype.toString = function () {
 
 		return s;
 	}
+
 	return (
 		this.left.toString() +
 		' ' +
@@ -10763,7 +10765,6 @@ yy.Op.prototype.toString = function () {
 };
 
 yy.Op.prototype.findAggregator = function (query) {
-
 	if (this.left && this.left.findAggregator) {
 		this.left.findAggregator(query);
 	}
@@ -10895,17 +10896,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 === '==') {
@@ -10968,7 +10980,6 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 			')' +
 			')' +
 			')';
-
 	}
 
 	if (this.op === 'IN') {
@@ -11004,13 +11015,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 {
@@ -11024,7 +11032,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 (';
@@ -11043,7 +11050,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})';
@@ -11082,12 +11088,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 + ')';
 	}
@@ -11139,8 +11142,6 @@ yy.StringValue.prototype.toType = function () {
 };
 
 yy.StringValue.prototype.toJS = function () {
-
-	//	return "'"+doubleqq(this.value)+"'";
 	return "'" + escapeq(this.value) + "'";
 };
 
@@ -11173,8 +11174,6 @@ yy.ArrayValue.prototype.toType = function () {
 };
 
 yy.ArrayValue.prototype.toJS = function (context, tableid, defcols) {
-
-	//	return "'"+doubleqq(this.value)+"'";
 	return (
 		'[(' +
 		this.value
@@ -11322,7 +11321,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;
@@ -11341,7 +11339,6 @@ yy.Column.prototype.toString = function () {
 };
 
 yy.Column.prototype.toJS = function (context, tableid, defcols) {
-
 	var s = '';
 	if (!this.tableid && tableid === '' && !defcols) {
 		if (this.columnid !== '_') {
@@ -11355,17 +11352,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['_']";
@@ -11388,22 +11378,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 + "']";
@@ -11412,9 +11393,6 @@ yy.Column.prototype.toJS = function (context, tableid, defcols) {
 			}
 		}
 	}
-
-	//	console.trace(new Error());
-
 	return s;
 };
 
@@ -11446,16 +11424,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;
@@ -11472,8 +11442,6 @@ yy.AggrValue.prototype.findAggregator = function (query) {
 		}
 		query.selectGroup.push(this);
 	}
-
-	//		this.reduced = true;
 	return;
 };
 
@@ -11492,11 +11460,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();
@@ -11507,6 +11474,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) {
@@ -11943,42 +11911,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;
 	}
 };