alasql 1.7.3 → 1.7.5

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v1.7.3-develop-0be167bcundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v1.7.5-v1-hotfix-95227342undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 1.7.3-develop-0be167bcundefined
+@version 1.7.5-v1-hotfix-95227342undefined
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

package/dist/alasql-worker.min.js

@@ -1,2 +1,2 @@
-//! AlaSQL v1.7.3-develop-0be167bcundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v1.7.5-v1-hotfix-95227342undefined | © 2014-2018 Andrey Gershun & Mathias Rangel 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,t){"function"==typeof(e=e||[])&&(scope=t,t=e,e=[]),"object"!=typeof e&&(e=[e]);var o=i.lastid++;i.buffer[o]=t,i.webworker.postMessage({id:o,sql:r,params:e})}var s;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&&(s=function(r,e,n,s){return new Promise(function(t,o){i(r,e,function(r,e){e?o(e):(n&&s&&!1!==i.options.progress&&i.options.progress(n,s),t(r))})})},i.promise=function(r,e){if("undefined"==typeof Promise)throw new Error("Please include a Promise/A+ library");if("string"==typeof r)return s(r,e);if(!isArray(r)||r.length<1||void 0!==e)throw new Error("Error in .promise parameters");return function(r){if(!(r.length<1)){for(var e,t,o=[],n=0;n<r.length;n++){if("string"==typeof(t=r[n])&&(t=[t]),!isArray(t)||t.length<1||2<t.length)throw new Error("Error in .promise parameter");e=t[0],t=t[1]||void 0,o.push(s(e,t,n,r.length))}return Promise.all(o)}}(r)}),!(i=i||!1))throw new Error("alasql was not found");return i.worker=function(){throw new Error("Can find webworker in this enviroment")},"undefined"!=typeof Worker&&(i.worker=function(r,e,t){if(void 0===(r=!0===r?void 0:r))for(var o=document.getElementsByTagName("script"),n=0;n<o.length;n++){if("alasql-worker.js"===o[n].src.substr(-16).toLowerCase()){r=o[n].src.substr(0,o[n].src.length-16)+"alasql.js";break}if("alasql-worker.min.js"===o[n].src.substr(-20).toLowerCase()){r=o[n].src.substr(0,o[n].src.length-20)+"alasql.min.js";break}if("alasql.js"===o[n].src.substr(-9).toLowerCase()){r=o[n].src;break}if("alasql.min.js"===o[n].src.substr(-13).toLowerCase()){r=o[n].src.substr(0,o[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="importScripts('",s+=r,s+="');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(","),[],t)):!1===r&&delete i.webworker}),i.lastid=0,i.buffer={},i.worker(),i});

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v1.7.3-develop-0be167bcundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v1.7.5-v1-hotfix-95227342undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 1.7.3-develop-0be167bcundefined
+@version 1.7.5-v1-hotfix-95227342undefined
 
 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 = '1.7.3-develop-0be167bcundefined';
+alasql.version = '1.7.5-v1-hotfix-95227342undefined';
 
 /**
 	Debug flag
@@ -9349,9 +9349,10 @@ function compileSelectStar(query, aliases, joinstar) {
 
 		if (columns && columns.length > 0) {
 			columns.forEach(function (tcol) {
+				var escapedColumnId = escapeq(tcol.columnid);
 				if (joinstar && alasql.options.joinstar == 'underscore') {
 					ss.push(
-						"'" + alias + '_' + tcol.columnid + "':p['" + alias + "']['" + tcol.columnid + "']"
+						"'" + alias + '_' + escapedColumnId + "':p['" + alias + "']['" + escapedColumnId + "']"
 					);
 				} else if (joinstar && alasql.options.joinstar == 'json') {
 					//				ss.push('\''+alias+'_'+tcol.columnid+'\':p[\''+alias+'\'][\''+tcol.columnid+'\']');
@@ -9359,16 +9360,16 @@ function compileSelectStar(query, aliases, joinstar) {
 						"r['" +
 						alias +
 						"']['" +
-						tcol.columnid +
+						escapedColumnId +
 						"']=p['" +
 						alias +
 						"']['" +
-						tcol.columnid +
+						escapedColumnId +
 						"'];";
 				} else {
-					var value = "p['" + alias + "']['" + tcol.columnid + "']";
+					var value = "p['" + alias + "']['" + escapedColumnId + "']";
 					if (!columnIds[tcol.columnid]) {
-						var key = "'" + tcol.columnid + "':";
+						var key = "'" + escapedColumnId + "':";
 						ss.push(key + value);
 						columnIds[tcol.columnid] = {
 							id: ss.length - 1,
@@ -9407,7 +9408,7 @@ function compileSelectStar(query, aliases, joinstar) {
 
 	});
 
-	return {s: ss.join(','), sp: sp};
+	return { s: ss.join(','), sp: sp };
 }
 
 yy.Select.prototype.compileSelect1 = function (query, params) {
@@ -9458,14 +9459,14 @@ yy.Select.prototype.compileSelect1 = function (query, params) {
 					if (false && tbid && !query.defcols['.'][col.tableid] && !query.defcols[col.columnid]) {
 						ss.push(
 							"'" +
-								escapeq(col.as || col.columnid) +
-								"':p['" +
-								query.defaultTableid +
-								"']['" +
-								col.tableid +
-								"']['" +
-								col.columnid +
-								"']"
+							escapeq(col.as || col.columnid) +
+							"':p['" +
+							query.defaultTableid +
+							"']['" +
+							col.tableid +
+							"']['" +
+							col.columnid +
+							"']"
 						);
 					} else {
 						// workaround for multisheet xlsx export with custom COLUMNS
@@ -9500,12 +9501,12 @@ yy.Select.prototype.compileSelect1 = function (query, params) {
 						} else {
 							ss.push(
 								"'" +
-									escapeq(col.as || col.columnid) +
-									"':p['" +
-									tbid +
-									"']['" +
-									col.columnid +
-									"']"
+								escapeq(col.as || col.columnid) +
+								"':p['" +
+								tbid +
+								"']['" +
+								col.columnid +
+								"']"
 							);
 						}
 					}
@@ -9590,9 +9591,9 @@ yy.Select.prototype.compileSelect1 = function (query, params) {
 			) {
 				ss.push(
 					"'" +
-						escapeq(col.as) +
-						"':" +
-						n2u(col.expression.toJS('p', query.defaultTableid, query.defcols))
+					escapeq(col.as) +
+					"':" +
+					n2u(col.expression.toJS('p', query.defaultTableid, query.defcols))
 				);
 			} else if (col.aggregatorid === 'COUNT') {
 				ss.push("'" + escapeq(col.as) + "':1");
@@ -9622,9 +9623,9 @@ yy.Select.prototype.compileSelect1 = function (query, params) {
 
 			ss.push(
 				"'" +
-					escapeq(col.as || col.columnid || col.toString()) +
-					"':" +
-					n2u(col.toJS('p', query.defaultTableid, query.defcols))
+				escapeq(col.as || col.columnid || col.toString()) +
+				"':" +
+				n2u(col.toJS('p', query.defaultTableid, query.defcols))
 			);
 			//			ss.push('\''+escapeq(col.toString())+'\':'+col.toJS("p",query.defaultTableid));
 			//if(col instanceof yy.Expression) {
@@ -10477,8 +10478,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) {
@@ -10853,7 +10854,7 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 		var ljs = '(' + leftJS() + '||{})';
 
 		if (typeof this.right === 'string') {
-			s = ljs + '["' + this.right + '"]';
+			s = ljs + '["' + escapeq(this.right) + '"]';
 		} else if (typeof this.right === 'number') {
 			s = ljs + '[' + this.right + ']';
 		} else if (this.right instanceof yy.FuncValue) {
@@ -11084,7 +11085,7 @@ yy.VarValue.prototype.toType = function () {
 };
 
 yy.VarValue.prototype.toJS = function () {
-	return "alasql.vars['" + this.variable + "']";
+	return "alasql.vars['" + escapeq(this.variable) + "']";
 };
 
 yy.NumValue = function (params) {
@@ -11478,7 +11479,7 @@ yy.AggrValue.prototype.toJS = function (/*context, tableid, defcols*/) {
 
 	var colas = this.nick;
 	if (colas === undefined) {
-		colas = this.toString();
+		colas = escapeq(this.toString());
 	}
 	return "g['" + colas + "']";
 };

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v1.7.3-develop-0be167bcundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v1.7.5-v1-hotfix-95227342undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 1.7.3-develop-0be167bcundefined
+@version 1.7.5-v1-hotfix-95227342undefined
 
 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 = '1.7.3-develop-0be167bcundefined';
+alasql.version = '1.7.5-v1-hotfix-95227342undefined';
 
 /**
 	Debug flag
@@ -9344,9 +9344,10 @@ function compileSelectStar(query, aliases, joinstar) {
 
 		if (columns && columns.length > 0) {
 			columns.forEach(function (tcol) {
+				var escapedColumnId = escapeq(tcol.columnid);
 				if (joinstar && alasql.options.joinstar == 'underscore') {
 					ss.push(
-						"'" + alias + '_' + tcol.columnid + "':p['" + alias + "']['" + tcol.columnid + "']"
+						"'" + alias + '_' + escapedColumnId + "':p['" + alias + "']['" + escapedColumnId + "']"
 					);
 				} else if (joinstar && alasql.options.joinstar == 'json') {
 					//				ss.push('\''+alias+'_'+tcol.columnid+'\':p[\''+alias+'\'][\''+tcol.columnid+'\']');
@@ -9354,16 +9355,16 @@ function compileSelectStar(query, aliases, joinstar) {
 						"r['" +
 						alias +
 						"']['" +
-						tcol.columnid +
+						escapedColumnId +
 						"']=p['" +
 						alias +
 						"']['" +
-						tcol.columnid +
+						escapedColumnId +
 						"'];";
 				} else {
-					var value = "p['" + alias + "']['" + tcol.columnid + "']";
+					var value = "p['" + alias + "']['" + escapedColumnId + "']";
 					if (!columnIds[tcol.columnid]) {
-						var key = "'" + tcol.columnid + "':";
+						var key = "'" + escapedColumnId + "':";
 						ss.push(key + value);
 						columnIds[tcol.columnid] = {
 							id: ss.length - 1,
@@ -9402,7 +9403,7 @@ function compileSelectStar(query, aliases, joinstar) {
 
 	});
 
-	return {s: ss.join(','), sp: sp};
+	return { s: ss.join(','), sp: sp };
 }
 
 yy.Select.prototype.compileSelect1 = function (query, params) {
@@ -9453,14 +9454,14 @@ yy.Select.prototype.compileSelect1 = function (query, params) {
 					if (false && tbid && !query.defcols['.'][col.tableid] && !query.defcols[col.columnid]) {
 						ss.push(
 							"'" +
-								escapeq(col.as || col.columnid) +
-								"':p['" +
-								query.defaultTableid +
-								"']['" +
-								col.tableid +
-								"']['" +
-								col.columnid +
-								"']"
+							escapeq(col.as || col.columnid) +
+							"':p['" +
+							query.defaultTableid +
+							"']['" +
+							col.tableid +
+							"']['" +
+							col.columnid +
+							"']"
 						);
 					} else {
 						// workaround for multisheet xlsx export with custom COLUMNS
@@ -9495,12 +9496,12 @@ yy.Select.prototype.compileSelect1 = function (query, params) {
 						} else {
 							ss.push(
 								"'" +
-									escapeq(col.as || col.columnid) +
-									"':p['" +
-									tbid +
-									"']['" +
-									col.columnid +
-									"']"
+								escapeq(col.as || col.columnid) +
+								"':p['" +
+								tbid +
+								"']['" +
+								col.columnid +
+								"']"
 							);
 						}
 					}
@@ -9585,9 +9586,9 @@ yy.Select.prototype.compileSelect1 = function (query, params) {
 			) {
 				ss.push(
 					"'" +
-						escapeq(col.as) +
-						"':" +
-						n2u(col.expression.toJS('p', query.defaultTableid, query.defcols))
+					escapeq(col.as) +
+					"':" +
+					n2u(col.expression.toJS('p', query.defaultTableid, query.defcols))
 				);
 			} else if (col.aggregatorid === 'COUNT') {
 				ss.push("'" + escapeq(col.as) + "':1");
@@ -9617,9 +9618,9 @@ yy.Select.prototype.compileSelect1 = function (query, params) {
 
 			ss.push(
 				"'" +
-					escapeq(col.as || col.columnid || col.toString()) +
-					"':" +
-					n2u(col.toJS('p', query.defaultTableid, query.defcols))
+				escapeq(col.as || col.columnid || col.toString()) +
+				"':" +
+				n2u(col.toJS('p', query.defaultTableid, query.defcols))
 			);
 			//			ss.push('\''+escapeq(col.toString())+'\':'+col.toJS("p",query.defaultTableid));
 			//if(col instanceof yy.Expression) {
@@ -10472,8 +10473,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) {
@@ -10848,7 +10849,7 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 		var ljs = '(' + leftJS() + '||{})';
 
 		if (typeof this.right === 'string') {
-			s = ljs + '["' + this.right + '"]';
+			s = ljs + '["' + escapeq(this.right) + '"]';
 		} else if (typeof this.right === 'number') {
 			s = ljs + '[' + this.right + ']';
 		} else if (this.right instanceof yy.FuncValue) {
@@ -11079,7 +11080,7 @@ yy.VarValue.prototype.toType = function () {
 };
 
 yy.VarValue.prototype.toJS = function () {
-	return "alasql.vars['" + this.variable + "']";
+	return "alasql.vars['" + escapeq(this.variable) + "']";
 };
 
 yy.NumValue = function (params) {
@@ -11473,7 +11474,7 @@ yy.AggrValue.prototype.toJS = function (/*context, tableid, defcols*/) {
 
 	var colas = this.nick;
 	if (colas === undefined) {
-		colas = this.toString();
+		colas = escapeq(this.toString());
 	}
 	return "g['" + colas + "']";
 };