alasql 4.1.11 → 4.2.1

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-1493d57a | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.0 build: develop-67d9f6dd | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.11
+@version 4.2.0
 
 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-1493d57a | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.0 build: develop-67d9f6dd | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.11
+@version 4.2.0
 
 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-1493d57a';
+alasql.version = '4.2.0';
+alasql.build = 'develop-67d9f6dd';
 
 /**
 	Debug flag
@@ -3168,10 +3168,10 @@ alasql.pretty = function (sql, flag) {
 
 /*jshint unused:false*/
 /*
-    Utilities for Alasql.js
+	Utilities for Alasql.js
 
-    @todo Review the list of utilities
-    @todo Find more effective utilities
+	@todo Review the list of utilities
+	@todo Find more effective utilities
 */
 
 /**
@@ -4210,43 +4210,46 @@ var domEmptyChildren = (utils.domEmptyChildren = function (container) {
   @parameter {string} escape Escape character (optional)
   @return {boolean} If value LIKE pattern ESCAPE escape
   */
-
+var patternCache = {};
 var like = (utils.like = function (pattern, value, escape) {
-	// Verify escape character
-	if (!escape) escape = '';
+	if (!patternCache[pattern]) {
+		// Verify escape character
+		if (!escape) escape = '';
 
-	var i = 0;
-	var s = '^';
+		var i = 0;
+		var s = '^';
 
-	while (i < pattern.length) {
-		var c = pattern[i],
-			c1 = '';
-		if (i < pattern.length - 1) c1 = pattern[i + 1];
+		while (i < pattern.length) {
+			var c = pattern[i],
+				c1 = '';
+			if (i < pattern.length - 1) c1 = pattern[i + 1];
 
-		if (c === escape) {
-			s += '\\' + c1;
-			i++;
-		} else if (c === '[' && c1 === '^') {
-			s += '[^';
+			if (c === escape) {
+				s += '\\' + c1;
+				i++;
+			} else if (c === '[' && c1 === '^') {
+				s += '[^';
+				i++;
+			} else if (c === '[' || c === ']') {
+				s += c;
+			} else if (c === '%') {
+				s += '[\\s\\S]*';
+			} else if (c === '_') {
+				s += '.';
+			} else if ('/.*+?|(){}'.indexOf(c) > -1) {
+				s += '\\' + c;
+			} else {
+				s += c;
+			}
 			i++;
-		} else if (c === '[' || c === ']') {
-			s += c;
-		} else if (c === '%') {
-			s += '[\\s\\S]*';
-		} else if (c === '_') {
-			s += '.';
-		} else if ('/.*+?|(){}'.indexOf(c) > -1) {
-			s += '\\' + c;
-		} else {
-			s += c;
 		}
-		i++;
-	}
 
-	s += '$';
-	//    if(value == undefined) return false;
+		s += '$';
+		//    if(value == undefined) return false;
 
-	return ('' + (value ?? '')).search(RegExp(s, 'i')) > -1;
+		patternCache[pattern] = RegExp(s, 'i');
+	}
+	return ('' + (value ?? '')).search(patternCache[pattern]) > -1;
 });
 
 utils.glob = function (value, pattern) {
@@ -4436,32 +4439,32 @@ alasql.parser.parseError = function (str, hash) {
 };
 
 /**
- 	Jison parser
- 	@param {string} sql SQL statement
- 	@return {object} AST (Abstract Syntax Tree)
+	  Jison parser
+	  @param {string} sql SQL statement
+	  @return {object} AST (Abstract Syntax Tree)
 
- 	@todo Create class AST
- 	@todo Add other parsers
+	  @todo Create class AST
+	  @todo Add other parsers
 
- 	@example
- 	alasql.parse = function(sql) {
+	  @example
+	  alasql.parse = function(sql) {
 		// My own parser here
- 	}
+	  }
  */
 alasql.parse = function (sql) {
 	return alasqlparser.parse(alasql.utils.uncomment(sql));
 };
 
 /**
- 	List of engines of external databases
- 	@type {object}
- 	@todo Create collection type
+	  List of engines of external databases
+	  @type {object}
+	  @todo Create collection type
  */
 alasql.engines = {};
 
 /**
- 	List of databases
- 	@type {object}
+	  List of databases
+	  @type {object}
  */
 alasql.databases = {};
 
@@ -4472,7 +4475,7 @@ alasql.databases = {};
 alasql.databasenum = 0;
 
 /**
- 	Alasql options object
+	  Alasql options object
  */
 alasql.options = {
 	/** Log or throw error */
@@ -4546,6 +4549,9 @@ alasql.options = {
 	joinstar: 'overwrite',
 
 	loopbreak: 100000,
+
+	/** Whether GETDATE() and NOW() return dates as string. If false, then a Date object is returned */
+	dateAsString: true,
 };
 
 //alasql.options.worker = false;
@@ -4666,10 +4672,10 @@ alasql.dexec = function (databaseid, sql, params, cb, scope) {
 	var db = alasql.databases[databaseid];
 	//	if(db.databaseid != databaseid) console.trace('got!');
 
-	var hh;
+	var hh = hash(sql);
+
 	// Create hash
 	if (alasql.options.cache) {
-		hh = hash(sql);
 		var statement = db.sqlCache[hh];
 		// If database structure was not changed since last time return cache
 		if (statement && db.dbversion === statement.dbversion) {
@@ -4677,8 +4683,17 @@ alasql.dexec = function (databaseid, sql, params, cb, scope) {
 		}
 	}
 
-	// Create AST
-	var ast = alasql.parse(sql);
+	var ast = db.astCache[hh];
+	if (alasql.options.cache && !ast) {
+		// Create AST cache
+		ast = alasql.parse(sql);
+		if (ast) {
+			// add to AST cache
+			db.astCache[hh] = ast;
+		}
+	} else {
+		ast = alasql.parse(sql);
+	}
 	if (!ast.statements) {
 		return;
 	}
@@ -4991,6 +5006,7 @@ var Database = (alasql.Database = function (databaseid) {
 Database.prototype.resetSqlCache = function () {
 	this.sqlCache = {}; // Cache for compiled SQL statements
 	this.sqlCacheSize = 0;
+	this.astCache = {}; // Cache for AST objects
 };
 
 // Main SQL function
@@ -10689,14 +10705,13 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))>-1)';
 				} else if (Array.isArray(this.right)) {
-					//			if(this.right.length == 0) return 'false';
+					// leverage JS Set, which is faster for lookups than arrays
 					s =
-						'([' +
+						'(new Set([' +
 						this.right.map(ref).join(',') +
-						'].indexOf(alasql.utils.getValueOf(' +
+						']).has(alasql.utils.getValueOf(' +
 						leftJS() +
-						'))>-1)';
-
+						')))';
 				} else {
 					s = '(' + rightJS() + '.indexOf(' + leftJS() + ')>-1)';
 
@@ -10712,8 +10727,13 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 				} else if (Array.isArray(this.right)) {
-					s = '([' + this.right.map(ref).join(',') + '].indexOf(';
-					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
+					// leverage JS Set, which is faster for lookups than arrays
+					s =
+						'(!(new Set([' +
+						this.right.map(ref).join(',') +
+						']).has(alasql.utils.getValueOf(' +
+						leftJS() +
+						'))))';
 				} else {
 					s = '(' + rightJS() + '.indexOf(';
 					s += leftJS() + ')==-1)';
@@ -12991,27 +13011,31 @@ stdfn.OBJECT_ID = function (objid) {
 };
 
 stdfn.DATE = function (d) {
-	if (/\d{8}/.test(d)) 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);
 };
 
 stdfn.NOW = function () {
-	var d = new Date();
-	var s =
-		d.getFullYear() +
-		'-' +
-		('0' + (d.getMonth() + 1)).substr(-2) +
-		'-' +
-		('0' + d.getDate()).substr(-2);
-	s +=
-		' ' +
-		('0' + d.getHours()).substr(-2) +
-		':' +
-		('0' + d.getMinutes()).substr(-2) +
-		':' +
-		('0' + d.getSeconds()).substr(-2);
-	s += '.' + ('00' + d.getMilliseconds()).substr(-3);
-	return s;
+	if (alasql.options.dateAsString) {
+		var d = new Date();
+		var s =
+			d.getFullYear() +
+			'-' +
+			('0' + (d.getMonth() + 1)).substr(-2) +
+			'-' +
+			('0' + d.getDate()).substr(-2);
+		s +=
+			' ' +
+			('0' + d.getHours()).substr(-2) +
+			':' +
+			('0' + d.getMinutes()).substr(-2) +
+			':' +
+			('0' + d.getSeconds()).substr(-2);
+		s += '.' + ('00' + d.getMilliseconds()).substr(-3);
+		return s;
+	}
+	return new Date();
 };
 
 stdfn.GETDATE = stdfn.NOW;

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.11 build: develop-1493d57a | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.0 build: develop-67d9f6dd | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.11
+@version 4.2.0
 
 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-1493d57a';
+alasql.version = '4.2.0';
+alasql.build = 'develop-67d9f6dd';
 
 /**
 	Debug flag
@@ -3168,10 +3168,10 @@ alasql.pretty = function (sql, flag) {
 
 /*jshint unused:false*/
 /*
-    Utilities for Alasql.js
+	Utilities for Alasql.js
 
-    @todo Review the list of utilities
-    @todo Find more effective utilities
+	@todo Review the list of utilities
+	@todo Find more effective utilities
 */
 
 /**
@@ -4210,43 +4210,46 @@ var domEmptyChildren = (utils.domEmptyChildren = function (container) {
   @parameter {string} escape Escape character (optional)
   @return {boolean} If value LIKE pattern ESCAPE escape
   */
-
+var patternCache = {};
 var like = (utils.like = function (pattern, value, escape) {
-	// Verify escape character
-	if (!escape) escape = '';
+	if (!patternCache[pattern]) {
+		// Verify escape character
+		if (!escape) escape = '';
 
-	var i = 0;
-	var s = '^';
+		var i = 0;
+		var s = '^';
 
-	while (i < pattern.length) {
-		var c = pattern[i],
-			c1 = '';
-		if (i < pattern.length - 1) c1 = pattern[i + 1];
+		while (i < pattern.length) {
+			var c = pattern[i],
+				c1 = '';
+			if (i < pattern.length - 1) c1 = pattern[i + 1];
 
-		if (c === escape) {
-			s += '\\' + c1;
-			i++;
-		} else if (c === '[' && c1 === '^') {
-			s += '[^';
+			if (c === escape) {
+				s += '\\' + c1;
+				i++;
+			} else if (c === '[' && c1 === '^') {
+				s += '[^';
+				i++;
+			} else if (c === '[' || c === ']') {
+				s += c;
+			} else if (c === '%') {
+				s += '[\\s\\S]*';
+			} else if (c === '_') {
+				s += '.';
+			} else if ('/.*+?|(){}'.indexOf(c) > -1) {
+				s += '\\' + c;
+			} else {
+				s += c;
+			}
 			i++;
-		} else if (c === '[' || c === ']') {
-			s += c;
-		} else if (c === '%') {
-			s += '[\\s\\S]*';
-		} else if (c === '_') {
-			s += '.';
-		} else if ('/.*+?|(){}'.indexOf(c) > -1) {
-			s += '\\' + c;
-		} else {
-			s += c;
 		}
-		i++;
-	}
 
-	s += '$';
-	//    if(value == undefined) return false;
+		s += '$';
+		//    if(value == undefined) return false;
 
-	return ('' + (value ?? '')).search(RegExp(s, 'i')) > -1;
+		patternCache[pattern] = RegExp(s, 'i');
+	}
+	return ('' + (value ?? '')).search(patternCache[pattern]) > -1;
 });
 
 utils.glob = function (value, pattern) {
@@ -4436,32 +4439,32 @@ alasql.parser.parseError = function (str, hash) {
 };
 
 /**
- 	Jison parser
- 	@param {string} sql SQL statement
- 	@return {object} AST (Abstract Syntax Tree)
+	  Jison parser
+	  @param {string} sql SQL statement
+	  @return {object} AST (Abstract Syntax Tree)
 
- 	@todo Create class AST
- 	@todo Add other parsers
+	  @todo Create class AST
+	  @todo Add other parsers
 
- 	@example
- 	alasql.parse = function(sql) {
+	  @example
+	  alasql.parse = function(sql) {
 		// My own parser here
- 	}
+	  }
  */
 alasql.parse = function (sql) {
 	return alasqlparser.parse(alasql.utils.uncomment(sql));
 };
 
 /**
- 	List of engines of external databases
- 	@type {object}
- 	@todo Create collection type
+	  List of engines of external databases
+	  @type {object}
+	  @todo Create collection type
  */
 alasql.engines = {};
 
 /**
- 	List of databases
- 	@type {object}
+	  List of databases
+	  @type {object}
  */
 alasql.databases = {};
 
@@ -4472,7 +4475,7 @@ alasql.databases = {};
 alasql.databasenum = 0;
 
 /**
- 	Alasql options object
+	  Alasql options object
  */
 alasql.options = {
 	/** Log or throw error */
@@ -4546,6 +4549,9 @@ alasql.options = {
 	joinstar: 'overwrite',
 
 	loopbreak: 100000,
+
+	/** Whether GETDATE() and NOW() return dates as string. If false, then a Date object is returned */
+	dateAsString: true,
 };
 
 //alasql.options.worker = false;
@@ -4666,10 +4672,10 @@ alasql.dexec = function (databaseid, sql, params, cb, scope) {
 	var db = alasql.databases[databaseid];
 	//	if(db.databaseid != databaseid) console.trace('got!');
 
-	var hh;
+	var hh = hash(sql);
+
 	// Create hash
 	if (alasql.options.cache) {
-		hh = hash(sql);
 		var statement = db.sqlCache[hh];
 		// If database structure was not changed since last time return cache
 		if (statement && db.dbversion === statement.dbversion) {
@@ -4677,8 +4683,17 @@ alasql.dexec = function (databaseid, sql, params, cb, scope) {
 		}
 	}
 
-	// Create AST
-	var ast = alasql.parse(sql);
+	var ast = db.astCache[hh];
+	if (alasql.options.cache && !ast) {
+		// Create AST cache
+		ast = alasql.parse(sql);
+		if (ast) {
+			// add to AST cache
+			db.astCache[hh] = ast;
+		}
+	} else {
+		ast = alasql.parse(sql);
+	}
 	if (!ast.statements) {
 		return;
 	}
@@ -4991,6 +5006,7 @@ var Database = (alasql.Database = function (databaseid) {
 Database.prototype.resetSqlCache = function () {
 	this.sqlCache = {}; // Cache for compiled SQL statements
 	this.sqlCacheSize = 0;
+	this.astCache = {}; // Cache for AST objects
 };
 
 // Main SQL function
@@ -10689,14 +10705,13 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))>-1)';
 				} else if (Array.isArray(this.right)) {
-					//			if(this.right.length == 0) return 'false';
+					// leverage JS Set, which is faster for lookups than arrays
 					s =
-						'([' +
+						'(new Set([' +
 						this.right.map(ref).join(',') +
-						'].indexOf(alasql.utils.getValueOf(' +
+						']).has(alasql.utils.getValueOf(' +
 						leftJS() +
-						'))>-1)';
-
+						')))';
 				} else {
 					s = '(' + rightJS() + '.indexOf(' + leftJS() + ')>-1)';
 
@@ -10712,8 +10727,13 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 				} else if (Array.isArray(this.right)) {
-					s = '([' + this.right.map(ref).join(',') + '].indexOf(';
-					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
+					// leverage JS Set, which is faster for lookups than arrays
+					s =
+						'(!(new Set([' +
+						this.right.map(ref).join(',') +
+						']).has(alasql.utils.getValueOf(' +
+						leftJS() +
+						'))))';
 				} else {
 					s = '(' + rightJS() + '.indexOf(';
 					s += leftJS() + ')==-1)';
@@ -12991,27 +13011,31 @@ stdfn.OBJECT_ID = function (objid) {
 };
 
 stdfn.DATE = function (d) {
-	if (/\d{8}/.test(d)) 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);
 };
 
 stdfn.NOW = function () {
-	var d = new Date();
-	var s =
-		d.getFullYear() +
-		'-' +
-		('0' + (d.getMonth() + 1)).substr(-2) +
-		'-' +
-		('0' + d.getDate()).substr(-2);
-	s +=
-		' ' +
-		('0' + d.getHours()).substr(-2) +
-		':' +
-		('0' + d.getMinutes()).substr(-2) +
-		':' +
-		('0' + d.getSeconds()).substr(-2);
-	s += '.' + ('00' + d.getMilliseconds()).substr(-3);
-	return s;
+	if (alasql.options.dateAsString) {
+		var d = new Date();
+		var s =
+			d.getFullYear() +
+			'-' +
+			('0' + (d.getMonth() + 1)).substr(-2) +
+			'-' +
+			('0' + d.getDate()).substr(-2);
+		s +=
+			' ' +
+			('0' + d.getHours()).substr(-2) +
+			':' +
+			('0' + d.getMinutes()).substr(-2) +
+			':' +
+			('0' + d.getSeconds()).substr(-2);
+		s += '.' + ('00' + d.getMilliseconds()).substr(-3);
+		return s;
+	}
+	return new Date();
 };
 
 stdfn.GETDATE = stdfn.NOW;