alasql 4.1.4 → 4.1.5

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.3 build: develop-04e3bf66 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.1.4 build: develop-b2979cbc | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.3
+@version 4.1.4
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff

package/dist/alasql-worker.min.js

@@ -1,2 +1,2 @@
-//! AlaSQL v4.1.3 build: develop-04e3bf66 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.1.4 build: develop-b2979cbc | © 2014-2023 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.d.ts

@@ -97,6 +97,6 @@ declare module 'alasql' {
 	}
 
 	const alasql: AlaSQL;
-	
+
 	export = alasql;
 }

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.3 build: develop-04e3bf66 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.1.4 build: develop-b2979cbc | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.3
+@version 4.1.4
 
 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.3';
-alasql.build = 'develop-04e3bf66';
+alasql.version = '4.1.4';
+alasql.build = 'develop-b2979cbc';
 
 /**
 	Debug flag
@@ -6481,7 +6481,7 @@ function queryfn(query, oldscope, cb, A, B) {
 
 	// First - refresh data sources
 
-	var result;
+	let result;
 	query.sources.forEach(function (source, idx) {
 		//		source.data = query.database.tables[source.tableid].data;
 
@@ -6502,7 +6502,14 @@ function queryfn(query, oldscope, cb, A, B) {
 		//
 		source.queriesdata = query.queriesdata;
 	});
-	if (query.sources.length == 0 || 0 === slen) result = queryfn3(query);
+	if (query.sources.length == 0 || 0 === slen) {
+		try {
+			result = queryfn3(query);
+		} catch (e) {
+			if (cb) return cb(null, e);
+			else throw e;
+		}
+	}
 
 	return result;
 }
@@ -7551,8 +7558,8 @@ yy.Select = class Select {
 								.intoTable(
 									${JSON.stringify(this.into.databaseid || databaseid)},
 									${JSON.stringify(this.into.tableid)},
-									this.data, 
-									columns, 
+									this.data,
+									columns,
 									cb
 								);`;
 				} else {
@@ -7619,7 +7626,7 @@ yy.Select = class Select {
 			// the (data, err) standard is maintained here.
 			var res1 = queryfn(query, oldscope, function (res, err) {
 				if (err) {
-					return cb(err, null);
+					return cb(null, err);
 				}
 				if (query.rownums.length > 0) {
 					for (var i = 0, ilen = res.length; i < ilen; i++) {
@@ -8625,9 +8632,6 @@ yy.Select.prototype.compileGroup = function (query) {
 	query.allgroups = allgroups;
 
 	query.ingroup = [];
-
-	// Create negative array
-
 	var s = '';
 	//	s+= query.selectfns;
 	allgroup.forEach(function (agroup) {
@@ -8811,14 +8815,6 @@ yy.Select.prototype.compileGroup = function (query) {
 
 		s += '}' + aft + ',g));' + aft2 + '} else {';
 
-		/*
-	// var neggroup = arrayDiff(allgroups,agroup);
-
-	// s += neggroup.map(function(columnid){
-	// 	return "g['"+columnid+"']=null;";
-	// }).join('');
-*/
-
 		//		s += self.columns.map(function(col){
 		s += query.selectGroup
 			.map(function (col) {

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.3 build: develop-04e3bf66 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.1.4 build: develop-b2979cbc | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.3
+@version 4.1.4
 
 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.3';
-alasql.build = 'develop-04e3bf66';
+alasql.version = '4.1.4';
+alasql.build = 'develop-b2979cbc';
 
 /**
 	Debug flag
@@ -6481,7 +6481,7 @@ function queryfn(query, oldscope, cb, A, B) {
 
 	// First - refresh data sources
 
-	var result;
+	let result;
 	query.sources.forEach(function (source, idx) {
 		//		source.data = query.database.tables[source.tableid].data;
 
@@ -6502,7 +6502,14 @@ function queryfn(query, oldscope, cb, A, B) {
 		//
 		source.queriesdata = query.queriesdata;
 	});
-	if (query.sources.length == 0 || 0 === slen) result = queryfn3(query);
+	if (query.sources.length == 0 || 0 === slen) {
+		try {
+			result = queryfn3(query);
+		} catch (e) {
+			if (cb) return cb(null, e);
+			else throw e;
+		}
+	}
 
 	return result;
 }
@@ -7551,8 +7558,8 @@ yy.Select = class Select {
 								.intoTable(
 									${JSON.stringify(this.into.databaseid || databaseid)},
 									${JSON.stringify(this.into.tableid)},
-									this.data, 
-									columns, 
+									this.data,
+									columns,
 									cb
 								);`;
 				} else {
@@ -7619,7 +7626,7 @@ yy.Select = class Select {
 			// the (data, err) standard is maintained here.
 			var res1 = queryfn(query, oldscope, function (res, err) {
 				if (err) {
-					return cb(err, null);
+					return cb(null, err);
 				}
 				if (query.rownums.length > 0) {
 					for (var i = 0, ilen = res.length; i < ilen; i++) {
@@ -8625,9 +8632,6 @@ yy.Select.prototype.compileGroup = function (query) {
 	query.allgroups = allgroups;
 
 	query.ingroup = [];
-
-	// Create negative array
-
 	var s = '';
 	//	s+= query.selectfns;
 	allgroup.forEach(function (agroup) {
@@ -8811,14 +8815,6 @@ yy.Select.prototype.compileGroup = function (query) {
 
 		s += '}' + aft + ',g));' + aft2 + '} else {';
 
-		/*
-	// var neggroup = arrayDiff(allgroups,agroup);
-
-	// s += neggroup.map(function(columnid){
-	// 	return "g['"+columnid+"']=null;";
-	// }).join('');
-*/
-
 		//		s += self.columns.map(function(col){
 		s += query.selectGroup
 			.map(function (col) {