alasql 4.2.0 → 4.2.2

package/README.md

@@ -97,10 +97,13 @@ var res = alasql("SELECT * FROM example1 ORDER BY b DESC");
 console.log(res); // [{a:2,b:6},{a:1,b:5},{a:3,b:4}]
 ```
 
-
 __If you are familiar with SQL, it should be no surprise that proper use of indexes on your tables is essential for good performance.__
 
+#### Options
+
+AlaSQL has several [configuration options](https://github.com/AlaSQL/alasql/wiki/AlaSQL-Options) which change the behavior. It can be set via SQL statements or via the options object before using `alasql`. 
 
+If you're using `NOW()` in queries often, setting `alasql.options.dateAsString` to `false` speed things up. It will just return a JS Date object instead of a string representation of a date. 
 
 ## Installation
 

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.11 build: develop-6870c00d | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.1 build: develop-37ffe88b | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.11
+@version 4.2.1
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.11 build: develop-6870c00d | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.1 build: develop-37ffe88b | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.11
+@version 4.2.1
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff
@@ -141,8 +141,8 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '4.1.11';
-alasql.build = 'develop-6870c00d';
+alasql.version = '4.2.1';
+alasql.build = 'develop-37ffe88b';
 
 /**
 	Debug flag
@@ -3227,7 +3227,7 @@ function returnTrue() {
   @function
   @return {undefined} Always undefined
   */
-function returnUndefined() { }
+function returnUndefined() {}
 
 /**
   Escape string
@@ -3522,7 +3522,7 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 	} else if (utils.isCordova) {
 		/* If Cordova */
 		utils.global.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function (fileSystem) {
-			fileSystem.root.getFile(path, { create: false }, function (fileEntry) {
+			fileSystem.root.getFile(path, {create: false}, function (fileEntry) {
 				fileEntry.file(function (file) {
 					var fileReader = new FileReader();
 					fileReader.onloadend = function (e) {
@@ -3711,7 +3711,7 @@ var removeFile = (utils.removeFile = function (path, cb) {
 		utils.global.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function (fileSystem) {
 			fileSystem.root.getFile(
 				path,
-				{ create: false },
+				{create: false},
 				function (fileEntry) {
 					fileEntry.remove(cb);
 					cb && cb(); // jshint ignore:line
@@ -3779,7 +3779,7 @@ var fileExists = (utils.fileExists = function (path, cb) {
 		utils.global.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function (fileSystem) {
 			fileSystem.root.getFile(
 				path,
-				{ create: false },
+				{create: false},
 				function (fileEntry) {
 					cb(true);
 				},
@@ -3845,7 +3845,7 @@ var saveFile = (utils.saveFile = function (path, data, cb, opts) {
 		} else if (utils.isCordova) {
 			utils.global.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function (fileSystem) {
 				//                alasql.utils.removeFile(path,function(){
-				fileSystem.root.getFile(path, { create: true }, function (fileEntry) {
+				fileSystem.root.getFile(path, {create: true}, function (fileEntry) {
 					fileEntry.createWriter(function (fileWriter) {
 						fileWriter.onwriteend = function () {
 							if (cb) {
@@ -3866,7 +3866,7 @@ var saveFile = (utils.saveFile = function (path, data, cb, opts) {
 				disableAutoBom: false,
 			};
 			alasql.utils.extend(opt, opts);
-			var blob = new Blob([data], { type: 'text/plain;charset=utf-8' });
+			var blob = new Blob([data], {type: 'text/plain;charset=utf-8'});
 			saveAs(blob, path, opt.disableAutoBom);
 			if (cb) {
 				res = cb(res);
@@ -4543,7 +4543,7 @@ alasql.options = {
 	/** Check for NaN and convert it to undefined */
 	nan: false,
 
-	excel: { cellDates: true },
+	excel: {cellDates: true},
 
 	/** Option for SELECT * FROM a,b */
 	joinstar: 'overwrite',
@@ -4634,7 +4634,7 @@ alasql.autoval = function (tablename, colname, getNext, databaseid) {
 
 	return (
 		db.tables[tablename].identities[colname].value -
-		db.tables[tablename].identities[colname].step || null
+			db.tables[tablename].identities[colname].step || null
 	);
 };
 
@@ -6629,8 +6629,10 @@ function queryfn3(query) {
 				var d = query.selectgfn(g, query.params, alasql);
 
 				for (const key in query.groupColumns) {
-					if (query.groupColumns[key] !== key && d[query.groupColumns[key]])
+					// ony remove columns where the alias is also not a column in the result
+					if (query.groupColumns[key] !== key && d[query.groupColumns[key]] && !query.groupColumns[query.groupColumns[key]]){
 						delete d[query.groupColumns[key]];
+					}
 				}
 				query.data.push(d);
 			}
@@ -10705,17 +10707,28 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))>-1)';
 				} else if (Array.isArray(this.right)) {
-					// Added patch to have a better performance for when you have a lot of entries in an IN statement
-					if (!alasql.sets) {
-						alasql.sets = {};
-					}
-					const allValues = this.right.map((value) => value.value);
-					const allValuesStr = allValues.join(",");
-					if (!alasql.sets[allValuesStr]) {
+					if (!alasql.options.cache || this.right.filter((value) => value instanceof yy.ParamValue).length > 0) {
+						// When not using cache, or when the array contains parameters, we need to re-create the Set
 						// leverage JS Set, which is faster for lookups than arrays
-						alasql.sets[allValuesStr] = new Set(allValues);
+						s =
+							'(new Set([' +
+							this.right.map(ref).join(',') +
+							']).has(alasql.utils.getValueOf(' +
+							leftJS() +
+							')))';
+					} else {
+						// Use a cache to not re-create the Set on every identitical query 
+						if (!alasql.sets) {
+							alasql.sets = {};
+						}
+						const allValues = this.right.map((value) => value.value);
+						const allValuesStr = allValues.join(",");
+						if (!alasql.sets[allValuesStr]) {
+							// leverage JS Set, which is faster for lookups than arrays
+							alasql.sets[allValuesStr] = new Set(allValues);
+						}
+						s = 'alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
 					}
-					s = 'alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
 				} else {
 					s = '(' + rightJS() + '.indexOf(' + leftJS() + ')>-1)';
 
@@ -10731,17 +10744,28 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 				} else if (Array.isArray(this.right)) {
-					// Added patch to have a better performance for when you have a lot of entries in a NOT IN statement
-					if (!alasql.sets) {
-						alasql.sets = {};
-					}
-					const allValues = this.right.map((value) => value.value);
-					const allValuesStr = allValues.join(",");
-					if (!alasql.sets[allValuesStr]) {
+					if (!alasql.options.cache || this.right.filter((value) => value instanceof yy.ParamValue).length > 0) {
+						// When not using cache, or when the array contains parameters, we need to re-create the Set
 						// leverage JS Set, which is faster for lookups than arrays
-						alasql.sets[allValuesStr] = new Set(allValues);
+						s =
+							'(!(new Set([' +
+							this.right.map(ref).join(',') +
+							']).has(alasql.utils.getValueOf(' +
+							leftJS() +
+							'))))';
+					} else {
+						// Use a cache to not re-create the Set on every identitical query 
+						if (!alasql.sets) {
+							alasql.sets = {};
+						}
+						const allValues = this.right.map((value) => value.value);
+						const allValuesStr = allValues.join(",");
+						if (!alasql.sets[allValuesStr]) {
+							// leverage JS Set, which is faster for lookups than arrays
+							alasql.sets[allValuesStr] = new Set(allValues);
+						}
+						s = '!alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
 					}
-					s = '!alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
 				} else {
 					s = '(' + rightJS() + '.indexOf(';
 					s += leftJS() + ')==-1)';
@@ -13019,7 +13043,8 @@ stdfn.OBJECT_ID = function (objid) {
 };
 
 stdfn.DATE = function (d) {
-	if (!isNaN(d) && d.length === 8) return new Date(+d.substr(0, 4), +d.substr(4, 2) - 1, +d.substr(6, 2));
+	if (!isNaN(d) && d.length === 8)
+		return new Date(+d.substr(0, 4), +d.substr(4, 2) - 1, +d.substr(6, 2));
 	return newDate(d);
 };
 

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.11 build: develop-6870c00d | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.1 build: develop-37ffe88b | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.11
+@version 4.2.1
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff
@@ -141,8 +141,8 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '4.1.11';
-alasql.build = 'develop-6870c00d';
+alasql.version = '4.2.1';
+alasql.build = 'develop-37ffe88b';
 
 /**
 	Debug flag
@@ -3227,7 +3227,7 @@ function returnTrue() {
   @function
   @return {undefined} Always undefined
   */
-function returnUndefined() { }
+function returnUndefined() {}
 
 /**
   Escape string
@@ -3522,7 +3522,7 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 	} else if (utils.isCordova) {
 		/* If Cordova */
 		utils.global.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function (fileSystem) {
-			fileSystem.root.getFile(path, { create: false }, function (fileEntry) {
+			fileSystem.root.getFile(path, {create: false}, function (fileEntry) {
 				fileEntry.file(function (file) {
 					var fileReader = new FileReader();
 					fileReader.onloadend = function (e) {
@@ -3711,7 +3711,7 @@ var removeFile = (utils.removeFile = function (path, cb) {
 		utils.global.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function (fileSystem) {
 			fileSystem.root.getFile(
 				path,
-				{ create: false },
+				{create: false},
 				function (fileEntry) {
 					fileEntry.remove(cb);
 					cb && cb(); // jshint ignore:line
@@ -3779,7 +3779,7 @@ var fileExists = (utils.fileExists = function (path, cb) {
 		utils.global.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function (fileSystem) {
 			fileSystem.root.getFile(
 				path,
-				{ create: false },
+				{create: false},
 				function (fileEntry) {
 					cb(true);
 				},
@@ -3845,7 +3845,7 @@ var saveFile = (utils.saveFile = function (path, data, cb, opts) {
 		} else if (utils.isCordova) {
 			utils.global.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function (fileSystem) {
 				//                alasql.utils.removeFile(path,function(){
-				fileSystem.root.getFile(path, { create: true }, function (fileEntry) {
+				fileSystem.root.getFile(path, {create: true}, function (fileEntry) {
 					fileEntry.createWriter(function (fileWriter) {
 						fileWriter.onwriteend = function () {
 							if (cb) {
@@ -3866,7 +3866,7 @@ var saveFile = (utils.saveFile = function (path, data, cb, opts) {
 				disableAutoBom: false,
 			};
 			alasql.utils.extend(opt, opts);
-			var blob = new Blob([data], { type: 'text/plain;charset=utf-8' });
+			var blob = new Blob([data], {type: 'text/plain;charset=utf-8'});
 			saveAs(blob, path, opt.disableAutoBom);
 			if (cb) {
 				res = cb(res);
@@ -4543,7 +4543,7 @@ alasql.options = {
 	/** Check for NaN and convert it to undefined */
 	nan: false,
 
-	excel: { cellDates: true },
+	excel: {cellDates: true},
 
 	/** Option for SELECT * FROM a,b */
 	joinstar: 'overwrite',
@@ -4634,7 +4634,7 @@ alasql.autoval = function (tablename, colname, getNext, databaseid) {
 
 	return (
 		db.tables[tablename].identities[colname].value -
-		db.tables[tablename].identities[colname].step || null
+			db.tables[tablename].identities[colname].step || null
 	);
 };
 
@@ -6629,8 +6629,10 @@ function queryfn3(query) {
 				var d = query.selectgfn(g, query.params, alasql);
 
 				for (const key in query.groupColumns) {
-					if (query.groupColumns[key] !== key && d[query.groupColumns[key]])
+					// ony remove columns where the alias is also not a column in the result
+					if (query.groupColumns[key] !== key && d[query.groupColumns[key]] && !query.groupColumns[query.groupColumns[key]]){
 						delete d[query.groupColumns[key]];
+					}
 				}
 				query.data.push(d);
 			}
@@ -10705,17 +10707,28 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))>-1)';
 				} else if (Array.isArray(this.right)) {
-					// Added patch to have a better performance for when you have a lot of entries in an IN statement
-					if (!alasql.sets) {
-						alasql.sets = {};
-					}
-					const allValues = this.right.map((value) => value.value);
-					const allValuesStr = allValues.join(",");
-					if (!alasql.sets[allValuesStr]) {
+					if (!alasql.options.cache || this.right.filter((value) => value instanceof yy.ParamValue).length > 0) {
+						// When not using cache, or when the array contains parameters, we need to re-create the Set
 						// leverage JS Set, which is faster for lookups than arrays
-						alasql.sets[allValuesStr] = new Set(allValues);
+						s =
+							'(new Set([' +
+							this.right.map(ref).join(',') +
+							']).has(alasql.utils.getValueOf(' +
+							leftJS() +
+							')))';
+					} else {
+						// Use a cache to not re-create the Set on every identitical query 
+						if (!alasql.sets) {
+							alasql.sets = {};
+						}
+						const allValues = this.right.map((value) => value.value);
+						const allValuesStr = allValues.join(",");
+						if (!alasql.sets[allValuesStr]) {
+							// leverage JS Set, which is faster for lookups than arrays
+							alasql.sets[allValuesStr] = new Set(allValues);
+						}
+						s = 'alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
 					}
-					s = 'alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
 				} else {
 					s = '(' + rightJS() + '.indexOf(' + leftJS() + ')>-1)';
 
@@ -10731,17 +10744,28 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 				} else if (Array.isArray(this.right)) {
-					// Added patch to have a better performance for when you have a lot of entries in a NOT IN statement
-					if (!alasql.sets) {
-						alasql.sets = {};
-					}
-					const allValues = this.right.map((value) => value.value);
-					const allValuesStr = allValues.join(",");
-					if (!alasql.sets[allValuesStr]) {
+					if (!alasql.options.cache || this.right.filter((value) => value instanceof yy.ParamValue).length > 0) {
+						// When not using cache, or when the array contains parameters, we need to re-create the Set
 						// leverage JS Set, which is faster for lookups than arrays
-						alasql.sets[allValuesStr] = new Set(allValues);
+						s =
+							'(!(new Set([' +
+							this.right.map(ref).join(',') +
+							']).has(alasql.utils.getValueOf(' +
+							leftJS() +
+							'))))';
+					} else {
+						// Use a cache to not re-create the Set on every identitical query 
+						if (!alasql.sets) {
+							alasql.sets = {};
+						}
+						const allValues = this.right.map((value) => value.value);
+						const allValuesStr = allValues.join(",");
+						if (!alasql.sets[allValuesStr]) {
+							// leverage JS Set, which is faster for lookups than arrays
+							alasql.sets[allValuesStr] = new Set(allValues);
+						}
+						s = '!alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
 					}
-					s = '!alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
 				} else {
 					s = '(' + rightJS() + '.indexOf(';
 					s += leftJS() + ')==-1)';
@@ -13019,7 +13043,8 @@ stdfn.OBJECT_ID = function (objid) {
 };
 
 stdfn.DATE = function (d) {
-	if (!isNaN(d) && d.length === 8) return new Date(+d.substr(0, 4), +d.substr(4, 2) - 1, +d.substr(6, 2));
+	if (!isNaN(d) && d.length === 8)
+		return new Date(+d.substr(0, 4), +d.substr(4, 2) - 1, +d.substr(6, 2));
 	return newDate(d);
 };