alasql 4.2.7 → 4.3.0

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.2.6 build: develop-6db74fcc | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.7 build: develop-993501d9 | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.2.6
+@version 4.2.7
 
 AlaSQL - JavaScript SQL database
 © 2014-2024	Andrey Gershun & Mathias Wulff
@@ -141,8 +141,8 @@ SOFTWARE.
 		Current version of alasql
 		  @constant {string}
 	*/
-	alasql.version = '4.2.6';
-	alasql.build = 'develop-6db74fcc';
+	alasql.version = '4.2.7';
+	alasql.build = 'develop-993501d9';
 
 	/**
 		Debug flag
@@ -6459,26 +6459,9 @@ function queryfn(query, oldscope, cb, A, B) {
 		query.queriesdata = [];
 
 		query.queriesfn.forEach(function (q, idx) {
-			//			if(query.explain) ms = Date.now();
-
-			//			var res = flatArray(q(query.params,null,queryfn2,(-idx-1),query));
-
-			//			var res = flatArray(queryfn(q.query,null,queryfn2,(-idx-1),query));
-
 			q.query.params = query.params;
-			//			query.queriesdata[idx] =
-
-			//	if(false) {
-			//			queryfn(q.query,query.oldscope,queryfn2,(-idx-1),query);
-			//	} else {
 			queryfn2([], -idx - 1, query);
-			//	}
-
-			//			query.explaination.push({explid: query.explid++, description:'Query '+idx,ms:Date.now()-ms});
-			//			query.queriesdata[idx] = res;
-			//			return res;
 		});
-
 	}
 
 	query.scope = oldscope ? cloneDeep(oldscope) : {};
@@ -6487,11 +6470,8 @@ function queryfn(query, oldscope, cb, A, B) {
 
 	let result;
 	query.sources.forEach(function (source, idx) {
-		//		source.data = query.database.tables[source.tableid].data;
-
 		source.query = query;
 		var rs = source.datafn(query, query.params, queryfn2, idx, alasql);
-
 		if (typeof rs !== 'undefined') {
 			// TODO - this is a hack: check if result is array - check all cases and make it more logical
 			if ((query.intofn || query.intoallfn) && Array.isArray(rs)) {
@@ -6519,29 +6499,20 @@ function queryfn(query, oldscope, cb, A, B) {
 
 	return result;
 }
-
 function queryfn2(data, idx, query) {
-
-	//console.trace();
-
 	if (idx >= 0) {
-		var source = query.sources[idx];
+		let source = query.sources[idx];
 		source.data = data;
-		if (typeof source.data == 'function') {
+		if (typeof source.data === 'function') {
 			source.getfn = source.data;
 			source.dontcache = source.getfn.dontcache;
-
-			//			var prevsource = query.sources[h-1];
-			if (source.joinmode == 'OUTER' || source.joinmode == 'RIGHT' || source.joinmode == 'ANTI') {
+			if (['OUTER', 'RIGHT', 'ANTI'].includes(source.joinmode)) {
 				source.dontcache = false;
 			}
 			source.data = {};
 		}
 	} else {
-		// subqueries
-
 		query.queriesdata[-idx - 1] = flatArray(data);
-
 	}
 
 	query.sourceslen--;
@@ -7175,11 +7146,11 @@ function swapSources(query, h) {
 	var source = query.sources[h];
 	var nextsource = query.sources[h + 1];
 
-	var onleftfn = source.onleftfn;
-	var onleftfns = source.onleftfns;
-	var onrightfn = source.onrightfn;
-	var onrightfns = source.onrightfns;
-	var optimization = source.optimization;
+	let onleftfn = source.onleftfn;
+	let onleftfns = source.onleftfns;
+	let onrightfn = source.onrightfn;
+	let onrightfns = source.onrightfns;
+	let optimization = source.optimization;
 
 	source.onleftfn = nextsource.onrightfn;
 	source.onleftfns = nextsource.onrightfns;
@@ -7365,7 +7336,6 @@ yy.Select = class Select {
 		query.explain = this.explain; // Explain
 		query.explaination = [];
 		query.explid = 1;
-
 		query.modifier = this.modifier;
 
 		query.database = db;
@@ -7452,40 +7422,22 @@ yy.Select = class Select {
 		query.corresponding = this.corresponding; // If CORRESPONDING flag exists
 		if (this.union) {
 			query.unionfn = this.union.compile(databaseid);
-			if (this.union.order) {
-				query.orderfn = this.union.compileOrder(query, params);
-			} else {
-				query.orderfn = null;
-			}
+			query.orderfn = this.union.order ? this.union.compileOrder(query, params) : null;
 		} else if (this.unionall) {
 			query.unionallfn = this.unionall.compile(databaseid);
-			if (this.unionall.order) {
-				query.orderfn = this.unionall.compileOrder(query, params);
-			} else {
-				query.orderfn = null;
-			}
+			query.orderfn = this.unionall.order ? this.unionall.compileOrder(query, params) : null;
 		} else if (this.except) {
 			query.exceptfn = this.except.compile(databaseid);
-			if (this.except.order) {
-				query.orderfn = this.except.compileOrder(query, params);
-			} else {
-				query.orderfn = null;
-			}
+			query.orderfn = this.except.order ? this.except.compileOrder(query, params) : null;
 		} else if (this.intersect) {
 			query.intersectfn = this.intersect.compile(databaseid);
-			if (this.intersect.order) {
-				query.intersectfn = this.intersect.compileOrder(query, params);
-			} else {
-				query.orderfn = null;
-			}
+			query.orderfn = this.intersect.order ? this.intersect.compileOrder(query, params) : null;
 		}
 
 		// SELECT INTO
 		if (this.into) {
 			if (this.into instanceof yy.Table) {
-				//
 				// Save into the table in database
-				//
 				if (
 					alasql.options.autocommit &&
 					alasql.databases[this.into.databaseid || databaseid].engineid
@@ -7536,7 +7488,6 @@ yy.Select = class Select {
 					qs += 'undefined, undefined,';
 				}
 				query.intoallfns = qs + 'this.data,columns,cb)';
-
 			} else if (this.into instanceof yy.ParamValue) {
 				//
 				// Save data into parameters array
@@ -7547,11 +7498,9 @@ yy.Select = class Select {
 
 			if (query.intofns) {
 				// Create intofn function
-
 				query.intofn = new Function('r,i,params,alasql', 'var y;' + query.intofns);
 			} else if (query.intoallfns) {
 				// Create intoallfn function
-
 				query.intoallfn = new Function('columns,cb,params,alasql', 'var y;' + query.intoallfns);
 			}
 		}
@@ -7578,16 +7527,11 @@ yy.Select = class Select {
 				if (cb) {
 					cb(res2);
 				}
-
 				return res2;
 			});
-
-			//		if(typeof res1 != 'undefined') res1 =  modify(query,res1);
 			return res1;
 		};
 
-		//	statement.dbversion = ;
-
 		statement.query = query;
 		return statement;
 	}
@@ -7601,8 +7545,6 @@ yy.Select = class Select {
 		if (!this.exists) return;
 		query.existsfn = this.exists.map(function (ex) {
 			var nq = ex.compile(query.database.databaseid);
-
-			//		 if(!nq.query.modifier) nq.query.modifier = 'RECORDSET';
 			nq.query.modifier = 'RECORDSET';
 			return nq;
 		});
@@ -7612,17 +7554,10 @@ yy.Select = class Select {
 		if (!this.queries) return;
 		query.queriesfn = this.queries.map(function (q) {
 			var nq = q.compile(query.database.databaseid);
-
-			//	if(!nq.query) nq.query = {};
 			nq.query.modifier = 'RECORDSET';
-			//		 if(!nq.query.modifier) nq.query.modifier = 'RECORDSET';
 			return nq;
 		});
 	}
-
-	// exec(databaseid) {
-	// 	throw new Error('Select statement should be precompiled');
-	// }
 };
 
 /**
@@ -7665,89 +7600,52 @@ function modify(query, res) {
 		}
 	}
 
-	if (modifier === 'VALUE') {
+	switch (modifier) {
+		case 'VALUE':
+			if (res.length === 0) return undefined;
+			const keyValue = columns && columns.length > 0 ? columns[0].columnid : Object.keys(res[0])[0];
+			return res[0][keyValue];
 
-		if (res.length > 0) {
-			var key;
-			if (columns && columns.length > 0) {
-				key = columns[0].columnid;
-			} else {
-				key = Object.keys(res[0])[0];
-			}
-			res = res[0][key];
-		} else {
-			res = undefined;
-		}
-	} else if (modifier === 'ROW') {
-		if (res.length > 0) {
-			var key;
-			var a = [];
-			for (var key in res[0]) {
-				a.push(res[0][key]);
-			}
-			res = a;
-		} else {
-			res = undefined;
-		}
-	} else if (modifier === 'COLUMN') {
-		var ar = [];
-		if (res.length > 0) {
-			var key;
+		case 'ROW':
+			if (res.length === 0) return undefined;
+			return Object.values(res[0]);
+
+		case 'COLUMN':
+			if (res.length === 0) return [];
+
+			let key;
 			if (columns && columns.length > 0) {
 				key = columns[0].columnid;
 			} else {
 				key = Object.keys(res[0])[0];
 			}
 
+			let ar = [];
 			for (var i = 0, ilen = res.length; i < ilen; i++) {
 				ar.push(res[i][key]);
 			}
-		}
-		res = ar;
-	} else if (modifier === 'MATRIX') {
-		// Returns square matrix of rows
-		var ar = [];
-		for (var i = 0; i < res.length; i++) {
-			var a = [];
-			var r = res[i];
-			for (var j = 0; j < columns.length; j++) {
-				a.push(r[columns[j].columnid]);
-			}
-			ar.push(a);
-		}
-		res = ar;
-	} else if (modifier === 'INDEX') {
-		var ar = {};
-		var key, val;
-		if (columns && columns.length > 0) {
-			key = columns[0].columnid;
-			val = columns[1].columnid;
-		} else {
-			var okeys = Object.keys(res[0]);
-			key = okeys[0];
-			val = okeys[1];
-		}
-		for (var i = 0, ilen = res.length; i < ilen; i++) {
-			ar[res[i][key]] = res[i][val];
-		}
-		res = ar;
-		//		res = arrayOfArrays(res);
-	} else if (modifier === 'RECORDSET') {
-		res = new alasql.Recordset({columns: columns, data: res});
-		//		res = arrayOfArrays(res);
-	} else if (modifier === 'TEXTSTRING') {
-		var key;
-		if (columns && columns.length > 0) {
-			key = columns[0].columnid;
-		} else {
-			key = Object.keys(res[0])[0];
-		}
 
-		for (var i = 0, ilen = res.length; i < ilen; i++) {
-			res[i] = res[i][key];
-		}
-		res = res.join('\n');
-		//		res = arrayOfArrays(res);
+			return ar;
+
+		case 'MATRIX':
+			if (res.length === 0) return undefined;
+			return res.map(row => columns.map(col => row[col.columnid]));
+
+		case 'INDEX':
+			if (res.length === 0) return undefined;
+			const keyIndex = columns && columns.length > 0 ? columns[0].columnid : Object.keys(res[0])[0];
+			const valIndex = columns && columns.length > 1 ? columns[1].columnid : Object.keys(res[0])[1];
+			return res.reduce((acc, row) => ({...acc, [row[keyIndex]]: row[valIndex]}), {});
+
+		case 'RECORDSET':
+			// Assuming alasql.Recordset is available in the scope
+			return new alasql.Recordset({columns: columns, data: res});
+
+		case 'TEXTSTRING':
+			if (res.length === 0) return undefined;
+			const keyTextString =
+				columns && columns.length > 0 ? columns[0].columnid : Object.keys(res[0])[0];
+			return res.map(row => row[keyTextString]).join('\n');
 	}
 	return res;
 }
@@ -7773,8 +7671,7 @@ yy.ExistsValue = class ExistsValue {
 	}
 
 	toJS(context, tableid, defcols) {
-
-		return 'this.existsfn[' + this.existsidx + '](params,null,' + context + ').data.length';
+		return `this.existsfn[${this.existsidx}](params, null, ${context}).data.length`;
 	}
 };
 
@@ -7782,27 +7679,18 @@ yy.ExistsValue = class ExistsValue {
 // Prepare subqueries and exists
 //
 alasql.precompile = function (statement, databaseid, params) {
-
 	if (!statement) return;
 	statement.params = params;
 	if (statement.queries) {
-
 		statement.queriesfn = statement.queries.map(function (q) {
 			var nq = q.compile(databaseid || statement.database.databaseid);
-
-			//			 nq.query.modifier = undefined;
-			//			 if(!nq.query.modifier) nq.query.modifier = 'RECORDSET';
 			nq.query.modifier = 'RECORDSET';
 			return nq;
 		});
 	}
 	if (statement.exists) {
-
 		statement.existsfn = statement.exists.map(function (ex) {
 			var nq = ex.compile(databaseid || statement.database.databaseid);
-
-			//			 if(!nq.query.modifier) nq.query.modifier = 'RECORDSET';
-			//			 if(!nq.query.modifier) nq.query.modifier = 'ARRAY';
 			nq.query.modifier = 'RECORDSET';
 			return nq;
 		});
@@ -7819,24 +7707,15 @@ alasql.precompile = function (statement, databaseid, params) {
 /* global yy, alasql, Mongo, returnTrue */
 
 yy.Select.prototype.compileFrom = function (query) {
-
-	var self = this;
+	const self = this;
 	query.sources = [];
-	//	var tableid = this.from[0].tableid;
-	//	var as = '';
-	//	if(self.from[0].as) as = this.from[0].as;
-
 	query.aliases = {};
-	if (!self.from) return;
 
-	self.from.forEach(function (tq) {
-
-		var ps = '';
-
-		var alias = tq.as || tq.tableid;
+	if (!self.from) return;
 
+	self.from.forEach(tq => {
+		const alias = tq.as || tq.tableid;
 		if (tq instanceof yy.Table) {
-
 			query.aliases[alias] = {
 				tableid: tq.tableid,
 				databaseid: tq.databaseid || query.database.databaseid,
@@ -7862,7 +7741,7 @@ yy.Select.prototype.compileFrom = function (query) {
 			throw new Error('Wrong table at FROM');
 		}
 
-		var source = {
+		const source = {
 			alias: alias,
 			databaseid: tq.databaseid || query.database.databaseid,
 			tableid: tq.tableid,
@@ -7870,21 +7749,16 @@ yy.Select.prototype.compileFrom = function (query) {
 			onmiddlefn: returnTrue,
 			srcwherefns: '', // for optimization
 			srcwherefn: returnTrue,
-			//			columns: []
 		};
 
 		if (tq instanceof yy.Table) {
-			// Get columns from table
 			source.columns = alasql.databases[source.databaseid].tables[source.tableid].columns;
-
 			if (
 				alasql.options.autocommit &&
 				alasql.databases[source.databaseid].engineid &&
 				!alasql.databases[source.databaseid].tables[source.tableid].view
 			) {
-
-				// TODO -- make view for external engine
-				source.datafn = function (query, params, cb, idx, alasql) {
+				source.datafn = (query, params, cb, idx, alasql) => {
 					return alasql.engines[alasql.databases[source.databaseid].engineid].fromTable(
 						source.databaseid,
 						source.tableid,
@@ -7894,87 +7768,66 @@ yy.Select.prototype.compileFrom = function (query) {
 					);
 				};
 			} else if (alasql.databases[source.databaseid].tables[source.tableid].view) {
-				source.datafn = function (query, params, cb, idx, alasql) {
-					var res = alasql.databases[source.databaseid].tables[source.tableid].select(params);
+				source.datafn = (query, params, cb, idx, alasql) => {
+					let res = alasql.databases[source.databaseid].tables[source.tableid].select(params);
 					if (cb) res = cb(res, idx, query);
 					return res;
 				};
 			} else {
-
-				source.datafn = function (query, params, cb, idx, alasql) {
-					/*
-
-*/
-					var res = alasql.databases[source.databaseid].tables[source.tableid].data;
-
+				source.datafn = (query, params, cb, idx, alasql) => {
+					let res = alasql.databases[source.databaseid].tables[source.tableid].data;
 					if (cb) res = cb(res, idx, query);
-
 					return res;
-					//				return alasql.databases[source.databaseid].tables[source.tableid].data;
 				};
 			}
 		} else if (tq instanceof yy.Select) {
 			source.subquery = tq.compile(query.database.databaseid);
 			if (typeof source.subquery.query.modifier === 'undefined') {
-				source.subquery.query.modifier = 'RECORDSET'; // Subqueries always return recordsets
+				source.subquery.query.modifier = 'RECORDSET';
 			}
 			source.columns = source.subquery.query.columns;
 
-			//			tq.columns;
-
-			source.datafn = function (query, params, cb, idx, alasql) {
-				//				return source.subquery(query.params, cb, idx, query);
-				var res;
-				source.subquery(query.params, function (data) {
+			source.datafn = (query, params, cb, idx, alasql) => {
+				let res;
+				source.subquery(query.params, data => {
 					res = data.data;
 					if (cb) res = cb(res, idx, query);
-					return res;
-					//					return data.data;
 				});
-
 				return res;
 			};
 		} else if (tq instanceof yy.Search) {
 			source.subsearch = tq;
 			source.columns = [];
-
-			source.datafn = function (query, params, cb, idx, alasql) {
-				//				return source.subquery(query.params, cb, idx, query);
-				var res;
-				source.subsearch.execute(query.database.databaseid, query.params, function (data) {
+			source.datafn = (query, params, cb, idx, alasql) => {
+				let res;
+				source.subsearch.execute(query.database.databaseid, query.params, data => {
 					res = data;
 					if (cb) res = cb(res, idx, query);
-					return res;
-					//					return data.data;
 				});
-
 				return res;
 			};
 		} else if (tq instanceof yy.ParamValue) {
-			ps = "var res = alasql.prepareFromData(params['" + tq.param + "']";
-
+			let ps = `var res = alasql.prepareFromData(params['${tq.param}']`;
 			if (tq.array) ps += ',true';
 			ps += ');if(cb)res=cb(res,idx,query);return res';
 			source.datafn = new Function('query,params,cb,idx,alasql', ps);
 		} else if (tq.inserted) {
-			ps = 'var res = alasql.prepareFromData(alasql.inserted';
+			let ps = 'var res = alasql.prepareFromData(alasql.inserted';
 			if (tq.array) ps += ',true';
 			ps += ');if(cb)res=cb(res,idx,query);return res';
 			source.datafn = new Function('query,params,cb,idx,alasql', ps);
 		} else if (tq instanceof yy.Json) {
-			ps = 'var res = alasql.prepareFromData(' + tq.toJS();
-
+			let ps = 'var res = alasql.prepareFromData(' + tq.toJS();
 			if (tq.array) ps += ',true';
 			ps += ');if(cb)res=cb(res,idx,query);return res';
 			source.datafn = new Function('query,params,cb,idx,alasql', ps);
 		} else if (tq instanceof yy.VarValue) {
-			ps = "var res = alasql.prepareFromData(alasql.vars['" + tq.variable + "']";
-
+			let ps = `var res = alasql.prepareFromData(alasql.vars['${tq.variable}']`;
 			if (tq.array) ps += ',true';
 			ps += ');if(cb)res=cb(res,idx,query);return res';
 			source.datafn = new Function('query,params,cb,idx,alasql', ps);
 		} else if (tq instanceof yy.FuncValue) {
-			ps = 'var res=alasql.from[' + JSON.stringify(tq.funcid.toUpperCase()) + '](';
+			let ps = 'var res=alasql.from[' + JSON.stringify(tq.funcid.toUpperCase()) + '](';
 
 			if (tq.args && tq.args.length > 0) {
 				if (tq.args[0]) {
@@ -7982,6 +7835,7 @@ yy.Select.prototype.compileFrom = function (query) {
 				} else {
 					ps += 'null,';
 				}
+
 				if (tq.args[1]) {
 					ps += tq.args[1].toJS('query.oldscope') + ',';
 				} else {
@@ -7990,46 +7844,32 @@ yy.Select.prototype.compileFrom = function (query) {
 			} else {
 				ps += 'null,null,';
 			}
-			ps += 'cb,idx,query';
-			ps += ');/*if(cb)res=cb(res,idx,query);*/return res';
-
-			source.datafn = new Function('query, params, cb, idx, alasql', ps);
+			ps += 'cb,idx,query); return res';
+			source.datafn = new Function('query,params,cb,idx,alasql', ps);
 		} else if (tq instanceof yy.FromData) {
-			source.datafn = function (query, params, cb, idx, alasql) {
-				var res = tq.data;
+			source.datafn = (query, params, cb, idx, alasql) => {
+				let res = tq.data;
 				if (cb) res = cb(res, idx, query);
 				return res;
 			};
 		} else {
 			throw new Error('Wrong table at FROM');
 		}
-		//		source.data = alasql.databases[source.databaseid].tables[source.tableid].data;
 		query.sources.push(source);
 	});
-	// TODO Add joins
 	query.defaultTableid = query.sources[0].alias;
-
 };
 
 alasql.prepareFromData = function (data, array) {
-
-	var i, ilen;
-	var res = data;
+	let res = data;
 	if (typeof data === 'string') {
 		res = data.split(/\r?\n/);
 		if (array) {
-			for (i = 0, ilen = res.length; i < ilen; i++) {
-				res[i] = [res[i]];
-			}
+			res = res.map(item => [item]);
 		}
 	} else if (array) {
-		res = [];
-		for (i = 0, ilen = data.length; i < ilen; i++) {
-			res.push([data[i]]);
-		}
-
+		res = data.map(item => [item]);
 	} else if (typeof data === 'object' && !Array.isArray(data)) {
-		//	} else if(typeof data == 'object' && !(typeof data.length == 'undefined')) {
 		if (
 			typeof Mongo !== 'undefined' &&
 			typeof Mongo.Collection !== 'undefined' &&
@@ -8038,13 +7878,11 @@ alasql.prepareFromData = function (data, array) {
 			res = data.find().fetch();
 		} else {
 			res = [];
-			for (var key in data) {
+			for (const key in data) {
 				if (data.hasOwnProperty(key)) res.push([key, data[key]]);
 			}
 		}
-
 	}
-
 	return res;
 };
 /*
@@ -8059,15 +7897,12 @@ alasql.prepareFromData = function (data, array) {
 
 /* global yy, alasql, returnTrue, arrayIntersect */
 
-// Compile JOIN caluese
 yy.Select.prototype.compileJoins = function (query) {
+	const self = this;
 
-	//	debugger;
-	var self = this;
-
-	this.joins.forEach(function (jn) {
+	this.joins.forEach(jn => {
+		let tq, ps, source;
 		// Test CROSS-JOIN
-		var tq, ps, source;
 		if (jn.joinmode === 'CROSS') {
 			if (jn.using || jn.on) {
 				throw new Error('CROSS JOIN cannot have USING or ON clauses');
@@ -8077,7 +7912,6 @@ yy.Select.prototype.compileJoins = function (query) {
 		}
 
 		if (jn instanceof yy.Apply) {
-
 			source = {
 				alias: jn.as,
 				applymode: jn.applymode,
@@ -8090,7 +7924,7 @@ yy.Select.prototype.compileJoins = function (query) {
 			source.columns = source.applyselect.query.columns;
 
 			source.datafn = function (query, params, cb, idx, alasql) {
-				var res;
+				let res;
 				if (cb) res = cb(res, idx, query);
 				return res;
 			};
@@ -8112,7 +7946,6 @@ yy.Select.prototype.compileJoins = function (query) {
 				srcwherefn: returnTrue,
 				columns: [],
 			};
-			//
 
 			if (!alasql.databases[source.databaseid].tables[source.tableid]) {
 				throw new Error(
@@ -8122,11 +7955,8 @@ yy.Select.prototype.compileJoins = function (query) {
 
 			source.columns = alasql.databases[source.databaseid].tables[source.tableid].columns;
 
-			// source.data = query.database.tables[source.tableid].data;
 			if (alasql.options.autocommit && alasql.databases[source.databaseid].engineid) {
-
 				source.datafn = function (query, params, cb, idx, alasql) {
-
 					return alasql.engines[alasql.databases[source.databaseid].engineid].fromTable(
 						source.databaseid,
 						source.tableid,
@@ -8137,31 +7967,26 @@ yy.Select.prototype.compileJoins = function (query) {
 				};
 			} else if (alasql.databases[source.databaseid].tables[source.tableid].view) {
 				source.datafn = function (query, params, cb, idx, alasql) {
-					var res = alasql.databases[source.databaseid].tables[source.tableid].select(params);
+					let res = alasql.databases[source.databaseid].tables[source.tableid].select(params);
 					if (cb) res = cb(res, idx, query);
 					return res;
 				};
 			} else {
 				source.datafn = function (query, params, cb, idx, alasql) {
-					var res = alasql.databases[source.databaseid].tables[source.tableid].data;
+					let res = alasql.databases[source.databaseid].tables[source.tableid].data;
 					if (cb) res = cb(res, idx, query);
 					return res;
 				};
 			}
 
-			//		var alias = jn.as || tq.tableid;
-			//		if(tq) {
 			query.aliases[source.alias] = {
 				tableid: tq.tableid,
 				databaseid: tq.databaseid || query.database.databaseid,
 			};
-			//		}
 		} else if (jn.select) {
 			tq = jn.select;
 			source = {
 				alias: jn.as,
-				//				databaseid: jn.databaseid || query.database.databaseid,
-				//				tableid: tq.tableid,
 				joinmode: jn.joinmode,
 				onmiddlefn: returnTrue,
 				srcwherefns: '', // for optimization
@@ -8175,121 +8000,92 @@ yy.Select.prototype.compileJoins = function (query) {
 			}
 			source.columns = source.subquery.query.columns;
 
-			//			if(jn instanceof yy.Apply) {
 			source.datafn = function (query, params, cb, idx, alasql) {
-				//					return cb(null,idx,alasql);
 				source.data = source.subquery(query.params, null, cb, idx).data;
-				// var res = alasql.prepareFromData(params[idx]);
-				var res = source.data;
+				let res = source.data;
 				// Propogate subquery result
 				if (cb) res = cb(res, idx, query);
 				return res;
 			};
-			// } else {
-			// 	source.datafn = function(query, params, cb, idx, alasql) {
-			// 		return source.subquery(query.params, null, cb, idx);
-			// 	}
-			// }
 			query.aliases[source.alias] = {type: 'subquery'};
 		} else if (jn.param) {
 			source = {
 				alias: jn.as,
-				//				databaseid: jn.databaseid || query.database.databaseid,
-				//				tableid: tq.tableid,
 				joinmode: jn.joinmode,
 				onmiddlefn: returnTrue,
 				srcwherefns: '', // for optimization
 				srcwherefn: returnTrue,
 			};
-			// source.data = ;
-			var jnparam = jn.param.param;
-
-			ps = "var res=alasql.prepareFromData(params['" + jnparam + "']";
+			const jnparam = jn.param.param;
+			ps = "let res=alasql.prepareFromData(params['" + jnparam + "']";
 			if (jn.array) ps += ',true';
-			ps += ');if(cb)res=cb(res, idx, query);return res';
+			ps += '); if(cb) res=cb(res, idx, query); return res';
 
 			source.datafn = new Function('query,params,cb,idx, alasql', ps);
 			query.aliases[source.alias] = {type: 'paramvalue'};
 		} else if (jn.variable) {
 			source = {
 				alias: jn.as,
-				//				databaseid: jn.databaseid || query.database.databaseid,
-				//				tableid: tq.tableid,
 				joinmode: jn.joinmode,
 				onmiddlefn: returnTrue,
 				srcwherefns: '', // for optimization
 				srcwherefn: returnTrue,
 			};
-			// source.data = ;
-			//			var jnparam = jn.param.param;
-
-			ps = "var res=alasql.prepareFromData(alasql.vars['" + jn.variable + "']";
-			if (jn.array) ps += ',true';
-			ps += ');if(cb)res=cb(res, idx, query);return res';
+			ps = "let res=alasql.prepareFromData(alasql.vars['" + jn.variable + "']";
+			if (jn.array) ps += ', true';
+			ps += '); if(cb)res=cb(res, idx, query);return res';
 
 			source.datafn = new Function('query,params,cb,idx, alasql', ps);
 			query.aliases[source.alias] = {type: 'varvalue'};
 		} else if (jn.func) {
 			source = {
 				alias: jn.as,
-				//				databaseid: jn.databaseid || query.database.databaseid,
-				//				tableid: tq.tableid,
 				joinmode: jn.joinmode,
 				onmiddlefn: returnTrue,
 				srcwherefns: '', // for optimization
 				srcwherefn: returnTrue,
 			};
-			// source.data = ;
 
-			var s = 'var res=alasql.from[' + JSON.stringify(jn.func.funcid.toUpperCase()) + '](';
+			let s = 'let res=alasql.from[' + JSON.stringify(jn.func.funcid.toUpperCase()) + '](';
 
-			var args = jn.func.args;
+			const args = jn.func.args;
 			if (args && args.length > 0) {
 				if (args[0]) {
-					s += args[0].toJS('query.oldscope') + ',';
+					s += args[0].toJS('query.oldscope') + ', ';
 				} else {
-					s += 'null,';
+					s += 'null, ';
 				}
 				if (args[1]) {
-					s += args[1].toJS('query.oldscope') + ',';
+					s += args[1].toJS('query.oldscope') + ', ';
 				} else {
-					s += 'null,';
+					s += 'null, ';
 				}
 			} else {
-				s += 'null,null,';
+				s += 'null, null, ';
 			}
-			s += 'cb,idx,query';
-			s += ');/*if(cb)res=cb(res,idx,query);*/return res';
-
+			s += 'cb, idx, query); return res';
 			source.datafn = new Function('query, params, cb, idx, alasql', s);
 
 			query.aliases[source.alias] = {type: 'funcvalue'};
 		}
 
-		var alias = source.alias;
+		const alias = source.alias;
 
 		// Test NATURAL-JOIN
 		if (jn.natural) {
 			if (jn.using || jn.on) {
 				throw new Error('NATURAL JOIN cannot have USING or ON clauses');
 			} else {
-				//				source.joinmode == "INNER";
+				// source.joinmode == "INNER";
 				if (query.sources.length > 0) {
-					var prevSource = query.sources[query.sources.length - 1];
-					var prevTable = alasql.databases[prevSource.databaseid].tables[prevSource.tableid];
-					var table = alasql.databases[source.databaseid].tables[source.tableid];
+					const prevSource = query.sources[query.sources.length - 1];
+					const prevTable = alasql.databases[prevSource.databaseid].tables[prevSource.tableid];
+					const table = alasql.databases[source.databaseid].tables[source.tableid];
 
 					if (prevTable && table) {
-						var c1 = prevTable.columns.map(function (col) {
-							return col.columnid;
-						});
-						var c2 = table.columns.map(function (col) {
-							return col.columnid;
-						});
-						jn.using = arrayIntersect(c1, c2).map(function (colid) {
-							return {columnid: colid};
-						});
-
+						const c1 = prevTable.columns.map(col => col.columnid);
+						const c2 = table.columns.map(col => col.columnid);
+						jn.using = arrayIntersect(c1, c2).map(colid => ({columnid: colid}));
 					} else {
 						throw new Error(
 							'In this version of Alasql NATURAL JOIN ' +
@@ -8301,45 +8097,31 @@ yy.Select.prototype.compileJoins = function (query) {
 		}
 
 		if (jn.using) {
-			prevSource = query.sources[query.sources.length - 1];
-
+			const prevSource = query.sources[query.sources.length - 1];
 			source.onleftfns = jn.using
-				.map(function (col) {
-
-					return "p['" + (prevSource.alias || prevSource.tableid) + "']['" + col.columnid + "']";
-				})
+				.map(col => "p['" + (prevSource.alias || prevSource.tableid) + "']['" + col.columnid + "']")
 				.join('+"`"+');
 
-			source.onleftfn = new Function('p,params,alasql', 'var y;return ' + source.onleftfns);
+			source.onleftfn = new Function('p,params,alasql', 'let y;return ' + source.onleftfns);
 
 			source.onrightfns = jn.using
-				.map(function (col) {
-					return "p['" + (source.alias || source.tableid) + "']['" + col.columnid + "']";
-				})
+				.map(col => "p['" + (source.alias || source.tableid) + "']['" + col.columnid + "']")
 				.join('+"`"+');
-			source.onrightfn = new Function('p,params,alasql', 'var y;return ' + source.onrightfns);
+			source.onrightfn = new Function('p,params,alasql', 'let y;return ' + source.onrightfns);
 			source.optimization = 'ix';
-
 		} else if (jn.on) {
-
 			if (jn.on instanceof yy.Op && jn.on.op === '=' && !jn.on.allsome) {
-
 				source.optimization = 'ix';
-
-				var lefts = '';
-				var rights = '';
-				var middles = '';
-				var middlef = false;
+				let lefts = '';
+				let rights = '';
+				let middles = '';
+				let middlef = false;
 				// Test right and left sides
-				var ls = jn.on.left.toJS('p', query.defaultTableid, query.defcols);
-				var rs = jn.on.right.toJS('p', query.defaultTableid, query.defcols);
+				const ls = jn.on.left.toJS('p', query.defaultTableid, query.defcols);
+				const rs = jn.on.right.toJS('p', query.defaultTableid, query.defcols);
 
 				if (ls.indexOf("p['" + alias + "']") > -1 && !(rs.indexOf("p['" + alias + "']") > -1)) {
-					if (
-						(ls.match(/p\['.*?'\]/g) || []).every(function (s) {
-							return s === "p['" + alias + "']";
-						})
-					) {
+					if ((ls.match(/p\['.*?'\]/g) || []).every(s => s === "p['" + alias + "']")) {
 						rights = ls;
 					} else {
 						middlef = true;
@@ -8348,11 +8130,7 @@ yy.Select.prototype.compileJoins = function (query) {
 					!(ls.indexOf("p['" + alias + "']") > -1) &&
 					rs.indexOf("p['" + alias + "']") > -1
 				) {
-					if (
-						(rs.match(/p\['.*?'\]/g) || []).every(function (s) {
-							return s === "p['" + alias + "']";
-						})
-					) {
+					if ((rs.match(/p\['.*?'\]/g) || []).every(s => s === "p['" + alias + "']")) {
 						lefts = ls;
 					} else {
 						middlef = true;
@@ -8362,11 +8140,7 @@ yy.Select.prototype.compileJoins = function (query) {
 				}
 
 				if (rs.indexOf("p['" + alias + "']") > -1 && !(ls.indexOf("p['" + alias + "']") > -1)) {
-					if (
-						(rs.match(/p\['.*?'\]/g) || []).every(function (s) {
-							return s === "p['" + alias + "']";
-						})
-					) {
+					if ((rs.match(/p\['.*?'\]/g) || []).every(s => s === "p['" + alias + "']")) {
 						rights = rs;
 					} else {
 						middlef = true;
@@ -8375,11 +8149,7 @@ yy.Select.prototype.compileJoins = function (query) {
 					!(rs.indexOf("p['" + alias + "']") > -1) &&
 					ls.indexOf("p['" + alias + "']") > -1
 				) {
-					if (
-						(ls.match(/p\['.*?'\]/g) || []).every(function (s) {
-							return s === "p['" + alias + "']";
-						})
-					) {
+					if ((ls.match(/p\['.*?'\]/g) || []).every(s => s === "p['" + alias + "']")) {
 						lefts = rs;
 					} else {
 						middlef = true;
@@ -8389,47 +8159,31 @@ yy.Select.prototype.compileJoins = function (query) {
 				}
 
 				if (middlef) {
-					//					middles = jn.on.toJS('p',query.defaultTableid);
-					//				} else {
 					rights = '';
 					lefts = '';
 					middles = jn.on.toJS('p', query.defaultTableid, query.defcols);
 					source.optimization = 'no';
-					// What to here?
 				}
 
 				source.onleftfns = lefts;
 				source.onrightfns = rights;
 				source.onmiddlefns = middles || 'true';
 
-				source.onleftfn = new Function('p,params,alasql', 'var y;return ' + source.onleftfns);
-				source.onrightfn = new Function('p,params,alasql', 'var y;return ' + source.onrightfns);
-				source.onmiddlefn = new Function('p,params,alasql', 'var y;return ' + source.onmiddlefns);
-
-				//			} else if(jn.on instanceof yy.Op && jn.on.op == 'AND') {
-
+				source.onleftfn = new Function('p,params,alasql', 'let y;return ' + source.onleftfns);
+				source.onrightfn = new Function('p,params,alasql', 'let y;return ' + source.onrightfns);
+				source.onmiddlefn = new Function('p,params,alasql', 'let y;return ' + source.onmiddlefns);
 			} else {
-
 				source.optimization = 'no';
-				//				source.onleftfn = returnTrue;
-				//				source.onleftfns = "true";
 				source.onmiddlefns = jn.on.toJS('p', query.defaultTableid, query.defcols);
 				source.onmiddlefn = new Function(
 					'p,params,alasql',
-					'var y;return ' + jn.on.toJS('p', query.defaultTableid, query.defcols)
+					'let y;return ' + jn.on.toJS('p', query.defaultTableid, query.defcols)
 				);
 			}
-
-			// Optimization function
 		}
 
-		//		source.data = alasql.databases[source.databaseid].tables[source.tableid].data;
-
-		// TODO SubQueries
-
 		query.sources.push(source);
 	});
-
 };
 yy.Select.prototype.compileWhere = function (query) {
 	if (this.where) {
@@ -8551,15 +8305,10 @@ yy.Select.prototype.compileGroup = function (query) {
 		var tableid = '';
 	}
 	var defcols = query.defcols;
-
 	var allgroup = [[]];
 	if (this.group) {
 		allgroup = decartes(this.group, query);
 	}
-
-	// Prepare groups
-	//var allgroup = [['a'], ['a','b'], ['a', 'b', 'c']];
-
 	// Union all arrays to get a maximum
 	var allgroups = [];
 	allgroup.forEach(function (a) {
@@ -8570,12 +8319,10 @@ yy.Select.prototype.compileGroup = function (query) {
 
 	query.ingroup = [];
 	var s = '';
-	//	s+= query.selectfns;
 	allgroup.forEach(function (agroup) {
 		// Start of group function
 		s += 'var g=this.xgroups[';
 
-		//	var gcols = this.group.map(function(col){return col.columnid}); // Group fields with r
 		// Array with group columns from record
 		var rg = agroup.map(function (col2) {
 			var columnid = col2.split('\t')[0];
@@ -8584,9 +8331,7 @@ yy.Select.prototype.compileGroup = function (query) {
 			if (columnid === '') {
 				return '1'; // Create fictive grouping column for fictive GROUP BY
 			}
-			//			else return "r['"+columnid+"']";
 			query.ingroup.push(columnid);
-
 			return coljs;
 		});
 
@@ -8598,7 +8343,6 @@ yy.Select.prototype.compileGroup = function (query) {
 		s += '];if(!g) {this.groups.push((g=this.xgroups[';
 		s += rg.join('+"`"+');
 		s += '] = {';
-		//		s += ']=r';
 		s += agroup
 			.map(function (col2) {
 				var columnid = col2.split('\t')[0];
@@ -8610,17 +8354,14 @@ yy.Select.prototype.compileGroup = function (query) {
 				return "'" + columnid + "':" + coljs + ',';
 			})
 			.join('');
-
 		var neggroup = arrayDiff(allgroups, agroup);
 
 		s += neggroup
 			.map(function (col2) {
 				var columnid = col2.split('\t')[0];
-				//	var coljs = col2.split('\t')[1]
 				return "'" + columnid + "':null,";
 			})
 			.join('');
-
 		var aft = '',
 			aft2 = '';
 
@@ -8628,19 +8369,10 @@ yy.Select.prototype.compileGroup = function (query) {
 			aft2 += "for(var f in p['" + query.groupStar + "']) {g[f]=p['" + query.groupStar + "'][f];};";
 		}
 
-		/*
-		 */
-		//		s += self.columns.map(function(col){
-
 		s += query.selectGroup
 			.map(function (col) {
-
 				var colexp = col.expression.toJS('p', tableid, defcols);
 				var colas = col.nick;
-				// if(typeof colas == 'undefined') {
-				// 	if(col instanceof yy.Column) colas = col.columnid;
-				// 	else colas = col.toString();
-				// };
 				let colExpIfFunIdExists = expression => {
 					let colexpression = expression.args[0];
 					return colexpression.toJS('p', tableid, defcols);
@@ -8666,12 +8398,7 @@ yy.Select.prototype.compileGroup = function (query) {
 						return `'${colas}':(${colexp})|| typeof ${colexp} == 'number' ?
 							${colexp} : ${colexp} == 'string' && typeof Number(${colexp}) == 'number' ? Number(${colexp}) :
 							typeof ${colexp} === 'boolean' ?  Number(${colexp}) : 0,`;
-					} else if (
-						col.aggregatorid === 'FIRST' ||
-						col.aggregatorid === 'LAST'
-						//					|| col.aggregatorid == 'AVG'
-						//							) { return "'"+col.as+'\':r[\''+col.as+'\'],'; }//f.field.arguments[0].toJS();
-					) {
+					} else if (col.aggregatorid === 'FIRST' || col.aggregatorid === 'LAST') {
 						return "'" + colas + "':" + colexp + ','; //f.field.arguments[0].toJS();
 					} else if (col.aggregatorid === 'MIN') {
 						if ('funcid' in col.expression) {
@@ -8691,58 +8418,24 @@ yy.Select.prototype.compileGroup = function (query) {
 						return `'${colas}' : (typeof ${colexp} == 'number' ? ${colexp} : typeof ${colexp} == 'object' ?
 							typeof Number(${colexp}) == 'number' ? ${colexp} : null : null),`;
 					} else if (col.aggregatorid === 'ARRAY') {
-						return "'" + colas + "':[" + colexp + '],';
+						return `'${colas}':[${colexp}],`;
 					} else if (col.aggregatorid === 'COUNT') {
 						if (col.expression.columnid === '*') {
-							return "'" + colas + "':1,";
+							return `'${colas}':1,`;
 						} else {
-							//						return "'"+colas+'\':(typeof '+colexp+' != "undefined")?1:0,';
-							//					} else {
-							return (
-								"'" +
-								colas +
-								"':(typeof " +
-								colexp +
-								' == "undefined" || ' +
-								colexp +
-								' === null) ? 0 : 1,'
-							);
+							return `'${colas}':(typeof ${colexp} == "undefined" || ${colexp} === null) ? 0 : 1,`;
 						}
-
-						//				else if(col.aggregatorid == 'MIN') { return "'"+col.as+'\':r[\''+col.as+'\'],'; }
-						//				else if(col.aggregatorid == 'MAX') { return "'"+col.as+'\':r[\''+col.as+'\'],'; }
 					} else if (col.aggregatorid === 'AVG') {
-						query.removeKeys.push('_SUM_' + colas);
-						query.removeKeys.push('_COUNT_' + colas);
+						query.removeKeys.push(`_SUM_${colas}`);
+						query.removeKeys.push(`_COUNT_${colas}`);
 
-						return (
-							'' +
-							"'" +
-							colas +
-							"':" +
-							colexp +
-							",'_SUM_" +
-							colas +
-							"':(" +
-							colexp +
-							")||0,'_COUNT_" +
-							colas +
-							"':(typeof " +
-							colexp +
-							' == "undefined" || ' +
-							colexp +
-							' === null) ? 0 : 1,'
-						);
+						return `'${colas}':${colexp},'_SUM_${colas}':(${colexp})||0,'_COUNT_${colas}':(typeof ${colexp} == "undefined" || ${colexp} === null) ? 0 : 1,`;
 					} else if (col.aggregatorid === 'AGGR') {
-						aft += ",g['" + colas + "']=" + col.expression.toJS('g', -1);
+						aft += `,g['${colas}']=${col.expression.toJS('g', -1)}`;
 						return '';
 					} else if (col.aggregatorid === 'REDUCE') {
-						//					query.removeKeys.push('_REDUCE_'+colas);
 						query.aggrKeys.push(col);
-
-						//					return "'"+colas+'\':alasql.aggr[\''+col.funcid+'\']('+colexp+',undefined,(acc={}),1),'
-						//					+'\'__REDUCE__'+colas+'\':acc,';
-						return "'" + colas + "':alasql.aggr['" + col.funcid + "'](" + colexp + ',undefined,1),';
+						return `'${colas}':alasql.aggr['${col.funcid}'](${colexp},undefined,1),`;
 					}
 					return '';
 				}
@@ -8752,12 +8445,9 @@ yy.Select.prototype.compileGroup = function (query) {
 			.join('');
 
 		s += '}' + aft + ',g));' + aft2 + '} else {';
-
-		//		s += self.columns.map(function(col){
 		s += query.selectGroup
 			.map(function (col) {
 				var colas = col.nick;
-
 				var colexp = col.expression.toJS('p', tableid, defcols);
 				let colExpIfFunIdExists = expression => {
 					let colexpression = expression.args[0];
@@ -8767,28 +8457,22 @@ yy.Select.prototype.compileGroup = function (query) {
 					var pre = '',
 						post = '';
 					if (col.distinct) {
-						var pre =
-							'if(typeof ' +
-							colexp +
-							'!="undefined" && (!g[\'$$_VALUES_' +
-							colas +
-							"'][" +
-							colexp +
-							'])) {';
-						var post = "g['$$_VALUES_" + colas + "'][" + colexp + ']=true;}';
+						pre = `if(typeof ${colexp}!="undefined" && (!g['$$_VALUES_${colas}'][${colexp}])) {`;
+						post = `g['$$_VALUES_${colas}'][${colexp}]=true;}`;
 					}
+
 					if (col.aggregatorid === 'SUM') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
 							return (
 								pre +
 								`if(g['${colas}'] == null && ${colexp1} == null){g['${colas}'] = null}
-							else if(typeof g['${colas}']!== 'object' && typeof g['${colas}']!== 'number' && typeof ${colexp1}!== 'object' && typeof ${colexp1}!== 'number'){g['${colas}'] = null}
-							else if(typeof g['${colas}']!== 'object' && typeof g['${colas}']!== 'number' && typeof ${colexp1} == 'number'){g['${colas}'] = ${colexp}}
-							else if(typeof g['${colas}']!== 'number' && typeof ${colexp1}!== 'number' && typeof ${colexp1}!== 'object'){g['${colas}'] = g['${colas}']}
-							else if((g['${colas}'] == null || (typeof g['${colas}']!== 'number' && typeof g['${colas}']!== 'object')) && (${colexp1} == null || (typeof ${colexp1}!== 'number' && typeof ${colexp1}!== 'object'))){g['${colas}'] = null}
-							else if(typeof g['${colas}'] == 'number' && typeof ${colexp1} ==null){g['${colas}'] = g['${colas}']}
-							else if(typeof g['${colas}'] == null && typeof ${colexp1} =='number'){g['${colas}'] = ${colexp}}
+							else if(typeof g['${colas}']!== 'object' && typeof g['${colas}']!== 'number' && typeof ${colexp1}!== 'object' && typeof ${colexp1}!== 'number'){ g['${colas}'] = null }
+							else if(typeof g['${colas}']!== 'object' && typeof g['${colas}']!== 'number' && typeof ${colexp1} == 'number'){ g['${colas}'] = ${colexp} }
+							else if(typeof g['${colas}']!== 'number' && typeof ${colexp1}!== 'number' && typeof ${colexp1}!== 'object'){ g['${colas}'] = g['${colas}'] }
+							else if((g['${colas}'] == null || (typeof g['${colas}']!== 'number' && typeof g['${colas}']!== 'object')) && (${colexp1} == null || (typeof ${colexp1}!== 'number' && typeof ${colexp1}!== 'object'))){ g['${colas}'] = null }
+							else if(typeof g['${colas}'] == 'number' && typeof ${colexp1} ==null){ g['${colas}'] = g['${colas}'] }
+							else if(typeof g['${colas}'] == null && typeof ${colexp1} =='number'){ g['${colas}'] = ${colexp} }
 							else{g['${colas}'] += ${colexp}||0}` +
 								post
 							);
@@ -8830,28 +8514,20 @@ yy.Select.prototype.compileGroup = function (query) {
 							post
 						);
 					} else if (col.aggregatorid === 'COUNT') {
-
 						if (col.expression.columnid === '*') {
-							return pre + "g['" + colas + "']++;" + post;
+							return `${pre}
+								g['${colas}']++;
+								${post}`;
 						} else {
-							return (
-								pre +
-								'if(typeof ' +
-								colexp +
-								'!="undefined" && ' +
-								colexp +
-								" !== null) g['" +
-								colas +
-								"']++;" +
-								post
-							);
+							return `${pre}
+							if(typeof ${colexp}!="undefined" && ${colexp} !== null) g['${colas}']++;
+							${post}`;
 						}
 					} else if (col.aggregatorid === 'ARRAY') {
 						return pre + "g['" + colas + "'].push(" + colexp + ');' + post;
 					} else if (col.aggregatorid === 'MIN') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
-
 							return (
 								pre +
 								`if((g['${colas}'] == null && ${colexp1}!== null) ? y = ${colexp} : (g['${colas}']!== null &&
@@ -8901,47 +8577,21 @@ yy.Select.prototype.compileGroup = function (query) {
 					} else if (col.aggregatorid === 'FIRST') {
 						return '';
 					} else if (col.aggregatorid === 'LAST') {
-						return pre + "g['" + colas + "']=" + colexp + ';' + post;
+						return `${pre}g['${colas}']=${colexp};${post}`;
 					} else if (col.aggregatorid === 'AVG') {
-						return (
-							'' +
-							pre +
-							"g['_SUM_" +
-							colas +
-							"']+=(y=" +
-							colexp +
-							')||0;' +
-							"g['_COUNT_" +
-							colas +
-							'\']+=(typeof y == "undefined" || y === null) ? 0 : 1;' +
-							"g['" +
-							colas +
-							"']=g['_SUM_" +
-							colas +
-							"']/g['_COUNT_" +
-							colas +
-							"'];" +
-							post
-						);
-						//					 }
-						//			else if(col.aggregatorid == 'AVG') { srg.push(colas+':0'); }
+						return `${pre}
+							g['_SUM_${colas}'] += (y=${colexp})||0;
+							g['_COUNT_${colas}'] += (typeof y == "undefined" || y === null) ? 0 : 1;
+							g['${colas}']=g['_SUM_${colas}'] / g['_COUNT_${colas}'];
+							${post}`;
 					} else if (col.aggregatorid === 'AGGR') {
-						return '' + pre + "g['" + colas + "']=" + col.expression.toJS('g', -1) + ';' + post;
+						return `${pre}
+							g['${colas}']=${col.expression.toJS('g', -1)};
+							${post}`;
 					} else if (col.aggregatorid === 'REDUCE') {
-						return (
-							'' +
-							pre +
-							"g['" +
-							colas +
-							"']=alasql.aggr." +
-							col.funcid +
-							'(' +
-							colexp +
-							",g['" +
-							colas +
-							"'],2);" +
-							post
-						);
+						return `${pre}
+							g['${colas}'] = alasql.aggr.${col.funcid}(${colexp},g['${colas}'],2);
+							${post}`;
 					}
 
 					return '';
@@ -8951,24 +8601,8 @@ yy.Select.prototype.compileGroup = function (query) {
 			})
 			.join('');
 
-		//		s += selectFields.map(function(f){
-
-		//			if(f.constructor.name == 'LiteralValue') return '';
-		//			if (f.field instanceof SQLParser.nodes.FunctionValue
-		//				&& (f.field.name.toUpperCase() == 'SUM' || f.field.name.toUpperCase() == 'COUNT')) {
-		//				return 'group.'+f.name.value+'=+(+group.'+f.name.value+'||0)+'+f.field.arguments[0].toJS('rec','')+';'; //f.field.arguments[0].toJS();
-		//				return 'group.'+f.name.value+'+='+f.field.arguments[0].toJS('rec','')+';'; //f.field.arguments[0].toJS();
-		//				return 'group.'+f.name.value+'+=rec.'+f.name.value+';'; //f.field.arguments[0].toJS();
-		//			};
-		//			return '';
-		//		}).join('');
-
-		//		s += '	group.amt += rec.emplid;';
-		//		s += 'group.count++;';
-
 		s += '}';
 	});
-
 	return new Function('p,params,alasql', 'var y;' + s);
 };
 /*
@@ -9857,22 +9491,22 @@ yy.Select.prototype.compileUnpivot = function (query) {
  Calculate ROLLUP() combination
  */
 
-var rollup = function (a, query) {
-	var rr = [];
-	var mask = 0;
-	var glen = a.length;
-	for (var g = 0; g < glen + 1; g++) {
-		var ss = [];
-		for (var i = 0; i < glen; i++) {
+const rollup = (a, query) => {
+	const rr = [];
+	let mask = 0;
+	const glen = a.length;
+
+	for (let g = 0; g < glen + 1; g++) {
+		const ss = [];
+		for (let i = 0; i < glen; i++) {
+			let aaa;
 			if (a[i] instanceof yy.Column) {
 				a[i].nick = escapeq(a[i].columnid);
-
 				query.groupColumns[escapeq(a[i].columnid)] = a[i].nick;
-				var aaa = a[i].nick + '\t' + a[i].toJS('p', query.sources[0].alias, query.defcols);
+				aaa = `${a[i].nick}\t${a[i].toJS('p', query.sources[0].alias, query.defcols)}`;
 			} else {
 				query.groupColumns[escapeq(a[i].toString())] = escapeq(a[i].toString());
-				var aaa =
-					escapeq(a[i].toString()) + '\t' + a[i].toJS('p', query.sources[0].alias, query.defcols);
+				aaa = `${escapeq(a[i].toString())}\t${a[i].toJS('p', query.sources[0].alias, query.defcols)}`;
 			}
 
 			if (mask & (1 << i)) ss.push(aaa);
@@ -9886,22 +9520,17 @@ var rollup = function (a, query) {
 /**
  Calculate CUBE()
  */
-var cube = function (a, query) {
-	var rr = [];
-	var glen = a.length;
-	var glenCube = 1 << glen;
-	for (var g = 0; g < glenCube; g++) {
-		var ss = [];
-		for (var i = 0; i < glen; i++) {
-			if (g & (1 << i))
-				//ss.push(a[i]);
-				//ss = cartes(ss,decartes(a[i]));
-
-				//				var aaa = a[i].toString()+'\t'
-				//					+a[i].toJS('p',query.sources[0].alias,query.defcols);
-
+const cube = (a, query) => {
+	const rr = [];
+	const glen = a.length;
+	const glenCube = 1 << glen;
+
+	for (let g = 0; g < glenCube; g++) {
+		let ss = [];
+		for (let i = 0; i < glen; i++) {
+			if (g & (1 << i)) {
 				ss = ss.concat(decartes(a[i], query));
-			//
+			}
 		}
 		rr.push(ss);
 	}
@@ -9909,22 +9538,21 @@ var cube = function (a, query) {
 };
 
 /**
- GROUPING SETS()
+ * GROUPING SETS()
  */
-var groupingsets = function (a, query) {
-	return a.reduce(function (acc, d) {
+const groupingsets = (a, query) =>
+	a.reduce((acc, d) => {
 		acc = acc.concat(decartes(d, query));
 		return acc;
 	}, []);
-};
 
 /**
- Cartesian production
+ * Cartesian production
  */
-var cartes = function (a1, a2) {
-	var rrr = [];
-	for (var i1 = 0; i1 < a1.length; i1++) {
-		for (var i2 = 0; i2 < a2.length; i2++) {
+const cartes = (a1, a2) => {
+	const rrr = [];
+	for (let i1 = 0; i1 < a1.length; i1++) {
+		for (let i2 = 0; i2 < a2.length; i2++) {
 			rrr.push(a1[i1].concat(a2[i2]));
 		}
 	}
@@ -9933,72 +9561,54 @@ var cartes = function (a1, a2) {
 
 /**
  Prepare groups function
- */
-function decartes(gv, query) {
-
+ */ function decartes(gv, query) {
 	if (Array.isArray(gv)) {
-		var res = [[]];
-		for (var t = 0; t < gv.length; t++) {
+		let res = [[]];
+		for (let t = 0; t < gv.length; t++) {
 			if (gv[t] instanceof yy.Column) {
-
 				gv[t].nick = gv[t].nick ? escapeq(gv[t].nick) : escapeq(gv[t].columnid);
 				query.groupColumns[gv[t].nick] = gv[t].nick;
-				res = res.map(function (r) {
-					return r.concat(
-						gv[t].nick + '\t' + gv[t].toJS('p', query.sources[0].alias, query.defcols)
-					);
-				});
-				//		 		res = res.map(function(r){return r.concat(gv[t].columnid)});
+				res = res.map(r =>
+					r.concat(`${gv[t].nick}\t${gv[t].toJS('p', query.sources[0].alias, query.defcols)}`)
+				);
 			} else if (gv[t] instanceof yy.FuncValue) {
 				query.groupColumns[escapeq(gv[t].toString())] = escapeq(gv[t].toString());
-				res = res.map(function (r) {
-					return r.concat(
-						escapeq(gv[t].toString()) +
-							'\t' +
-							gv[t].toJS('p', query.sources[0].alias, query.defcols)
-					);
-				});
-				// to be defined
+				res = res.map(r =>
+					r.concat(
+						`${escapeq(gv[t].toString())}\t${gv[t].toJS('p', query.sources[0].alias, query.defcols)}`
+					)
+				);
 			} else if (gv[t] instanceof yy.GroupExpression) {
 				if (gv[t].type == 'ROLLUP') res = cartes(res, rollup(gv[t].group, query));
 				else if (gv[t].type == 'CUBE') res = cartes(res, cube(gv[t].group, query));
 				else if (gv[t].type == 'GROUPING SETS') res = cartes(res, groupingsets(gv[t].group, query));
 				else throw new Error('Unknown grouping function');
 			} else if (gv[t] === '') {
-
 				res = [['1\t1']];
 			} else {
-				//				if(gv[t])
-
-				res = res.map(function (r) {
-					query.groupColumns[escapeq(gv[t].toString())] = escapeq(gv[t].toString());
-					return r.concat(
-						escapeq(gv[t].toString()) +
-							'\t' +
-							gv[t].toJS('p', query.sources[0].alias, query.defcols)
-					);
-				});
-				//				res = res.concat(gv[t]);
+				res = res.map(r =>
+					r.concat(
+						`${escapeq(gv[t].toString())}\t${gv[t].toJS('p', query.sources[0].alias, query.defcols)}`
+					)
+				);
 			}
-
 		}
 		return res;
-	} else if (gv instanceof yy.FuncValue) {
+	}
 
+	if (gv instanceof yy.FuncValue) {
 		query.groupColumns[escapeq(gv.toString())] = escapeq(gv.toString());
-		return [gv.toString() + '\t' + gv.toJS('p', query.sources[0].alias, query.defcols)];
-	} else if (gv instanceof yy.Column) {
+		return [`${gv.toString()}\t${gv.toJS('p', query.sources[0].alias, query.defcols)}`];
+	}
+
+	if (gv instanceof yy.Column) {
 		gv.nick = escapeq(gv.columnid);
 		query.groupColumns[gv.nick] = gv.nick;
-		return [gv.nick + '\t' + gv.toJS('p', query.sources[0].alias, query.defcols)]; // Is this ever happened?
-		// } else if(gv instanceof yy.Expression) {
-		// 	return [gv.columnid]; // Is this ever happened?
-	} else {
-		query.groupColumns[escapeq(gv.toString())] = escapeq(gv.toString());
-		return [escapeq(gv.toString()) + '\t' + gv.toJS('p', query.sources[0].alias, query.defcols)];
-		//			throw new Error('Single argument in the group without array');
+		return [`${gv.nick}\t${gv.toJS('p', query.sources[0].alias, query.defcols)}`];
 	}
 
+	query.groupColumns[escapeq(gv.toString())] = escapeq(gv.toString());
+	return [`${escapeq(gv.toString())}\t${gv.toJS('p', query.sources[0].alias, query.defcols)}`];
 }
 /*
 //
@@ -10052,10 +9662,19 @@ yy.Select.prototype.compileDefCols = function (query, databaseid) {
 			defcols['.'][jn.as || jn.table.tableid] = true;
 
 			if (jn.table) {
-				var alias = jn.table.tableid;
-				if (jn.as) alias = jn.as;
 				var alias = jn.as || jn.table.tableid;
-				var table = alasql.databases[jn.table.databaseid || databaseid].tables[jn.table.tableid];
+				var databaseId = jn.table.databaseid || databaseid;
+				var database = alasql.databases[databaseId];
+
+				if (database === undefined) {
+					throw new Error('Database does not exist: ' + databaseId);
+				}
+
+				var table = database.tables[jn.table.tableid];
+
+				if (table === undefined) {
+					throw new Error('Table does not exist: ' + jn.table.tableid);
+				}
 
 				if (table.columns) {
 					table.columns.forEach(function (col) {
@@ -10117,9 +9736,11 @@ yy.Apply = class Apply {
 	}
 
 	toString() {
-		var s = this.applymode + ' APPLY (' + this.select.toString() + ')';
+		let s = `${this.applymode} APPLY (${this.select.toString()})`;
 
-		if (this.as) s += ' AS ' + this.as;
+		if (this.as) {
+			s += ` AS ${this.as}`;
+		}
 
 		return s;
 	}
@@ -10138,13 +9759,13 @@ yy.Over = class Over {
 	}
 
 	toString() {
-		var s = 'OVER (';
+		let s = 'OVER (';
 		if (this.partition) {
-			s += 'PARTITION BY ' + this.partition.toString();
+			s += `PARTITION BY ${this.partition.toString()}`;
 			if (this.order) s += ' ';
 		}
 		if (this.order) {
-			s += 'ORDER BY ' + this.order.toString();
+			s += `ORDER BY ${this.order.toString()}`;
 		}
 		s += ')';
 		return s;
@@ -10176,7 +9797,6 @@ yy.Over = class Over {
 		*/
 		execute(databaseid, params, cb) {
 			if (this.expression) {
-
 				alasql.precompile(this, databaseid, params); // Precompile queries
 				var exprfn = new Function(
 					'params,alasql,p',
@@ -10433,20 +10053,15 @@ yy.Over = class Over {
 		}
 
 		toJS(context, tableid, defcols) {
-
 			var s;
-			var refs = [];
-			var op = this.op;
-			var _this = this;
-			//var leftJS = function(){return _this.left.toJS(context,tableid, defcols)};
-			//var rightJS = function(){return _this.right.toJS(context,tableid, defcols)};
-			var accessedLeft = false,
-				accessedRight = false;
-			var ref = function (expr) {
+			let refs = [];
+			let op = this.op;
+			let _this = this;
+			let ref = function (expr) {
 				if (expr.toJS) {
 					expr = expr.toJS(context, tableid, defcols);
 				}
-				var i = refs.push(expr) - 1;
+				let i = refs.push(expr) - 1;
 				return 'y[' + i + ']';
 			};
 			var leftJS = function () {
@@ -10462,201 +10077,91 @@ yy.Over = class Over {
 				op = '!=';
 			} else if (this.op === 'OR') {
 				op = '||';
-			}
-
-			// Arrow operator
-			if (this.op === '->') {
+			} else if (this.op === '->') {
 				// Expression to prevent error if object is empty (#344)
-				var ljs = '(' + leftJS() + '||{})';
+				const ljs = `(${leftJS()} || {})`;
 
 				if (typeof this.right === 'string') {
-					s = ljs + '["' + escapeq(this.right) + '"]';
+					s = `${ljs}["${escapeq(this.right)}"]`;
 				} else if (typeof this.right === 'number') {
-					s = ljs + '[' + this.right + ']';
+					s = `${ljs}[${this.right}]`;
 				} else if (this.right instanceof yy.FuncValue) {
-					var ss = [];
-					if (!(!this.right.args || 0 === this.right.args.length)) {
-						var ss = this.right.args.map(ref);
+					let ss = [];
+					if (this.right.args && this.right.args.length > 0) {
+						ss = this.right.args.map(ref);
 					}
-					s = '' + ljs + '[' + JSON.stringify(this.right.funcid) + '](' + ss.join(',') + ')';
+					s = `${ljs}[${JSON.stringify(this.right.funcid)}](${ss.join(',')})`;
 				} else {
-					s = '' + ljs + '[' + rightJS() + ']';
+					s = `${ljs}[${rightJS()}]`;
 				}
-			}
-
-			if (this.op === '!') {
+			} else if (this.op === '!') {
 				if (typeof this.right === 'string') {
-					s = '' + 'alasql.databases[alasql.useid].objects[' + leftJS() + ']["' + this.right + '"]';
+					s = `alasql.databases[alasql.useid].objects[${leftJS()}]["${this.right}"]`;
 				}
 				// TODO - add other cases
-			}
-
-			if (this.op === 'IS') {
+			} else if (this.op === 'IS') {
 				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) === (${rightOperand} == null))`; // == null cant be ===
+					s = `((${leftOperand} == null) === (${rightOperand} == null))`; // == null can't be ===
 				} else {
-					s = `((${leftOperand} == ${rightOperand}) || (${leftOperand}  < 0 && true == ${rightOperand}))`;
+					s = `((${leftOperand} == ${rightOperand}) || (${leftOperand} < 0 && true == ${rightOperand}))`;
 				}
-			}
-
-			if (this.op === '==') {
-				s = '' + 'alasql.utils.deepEqual(' + leftJS() + ',' + rightJS() + ')';
-			}
-
-			if (this.op === '===' || this.op === '!===') {
-				s =
-					'' +
-					'(' +
-					(this.op === '!===' ? '!' : '') +
-					'(' +
-					'(' +
-					leftJS() +
-					').valueOf()' +
-					'===' +
-					'(' +
-					rightJS() +
-					').valueOf()' +
-					')' +
-					')';
-			}
-
-			if (this.op === '!==') {
-				s = '' + '(!alasql.utils.deepEqual(' + leftJS() + ',' + rightJS() + '))';
-			}
-			if (this.op === '||') {
-				s = '' + "(''+(" + leftJS() + "||'')+(" + rightJS() + '||""))';
-			}
-			if (this.op === 'LIKE' || this.op === 'NOT LIKE') {
-				var s =
-					'(' +
-					(this.op === 'NOT LIKE' ? '!' : '') +
-					'alasql.utils.like(' +
-					rightJS() +
-					',' +
-					leftJS();
-				if (this.escape) {
-					s += ',' + ref(this.escape);
-				}
-				s += '))';
-			}
-			if (this.op === 'REGEXP') {
-				s = 'alasql.stdfn.REGEXP_LIKE(' + leftJS() + ',' + rightJS() + ')';
-			}
-			if (this.op === 'GLOB') {
-				s = 'alasql.utils.glob(' + leftJS() + ',' + rightJS() + ')';
-			}
-
-			if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
-				var left = leftJS();
-				s =
-					'' +
-					'(' +
-					(this.op === 'NOT BETWEEN' ? '!' : '') +
-					'(' +
-					'(' +
-					ref(this.right1) +
-					'<=' +
-					left +
-					') && (' +
-					left +
-					'<=' +
-					ref(this.right2) +
-					')' +
-					')' +
-					')';
-			}
-
-			if (this.op === 'IN') {
+			} else if (this.op === '==') {
+				s = `alasql.utils.deepEqual(${leftJS()}, ${rightJS()})`;
+			} else if (this.op === '===' || this.op === '!===') {
+				s = `(${this.op === '!===' ? '!' : ''}((${leftJS()}).valueOf() === (${rightJS()}).valueOf()))`;
+			} else if (this.op === '!==') {
+				s = `(!alasql.utils.deepEqual(${leftJS()}, ${rightJS()}))`;
+			} else if (this.op === '||') {
+				s = `(''+(${leftJS()} || '') + (${rightJS()} || ''))`;
+			} else if (this.op === 'LIKE' || this.op === 'NOT LIKE') {
+				s = `(${this.op === 'NOT LIKE' ? '!' : ''}alasql.utils.like(${rightJS()}, ${leftJS()}${this.escape ? `, ${ref(this.escape)}` : ''}))`;
+			} else if (this.op === 'REGEXP') {
+				s = `alasql.stdfn.REGEXP_LIKE(${leftJS()}, ${rightJS()})`;
+			} else if (this.op === 'GLOB') {
+				s = `alasql.utils.glob(${leftJS()}, ${rightJS()})`;
+			} else if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
+				const left = leftJS();
+				s = `(${this.op === 'NOT BETWEEN' ? '!' : ''}((${ref(this.right1)} <= ${left}) && (${left} <= ${ref(this.right2)})))`;
+			} else if (this.op === 'IN') {
 				if (this.right instanceof yy.Select) {
-					s = '(';
-					//			s += 'this.query.queriesdata['+this.queriesidx+']';
-					//			s += 'alasql.utils.flatArray(this.query.queriesfn['+(this.queriesidx)+'](params,null,context))';
-					s +=
-						'alasql.utils.flatArray(this.queriesfn[' +
-						this.queriesidx +
-						'](params,null,' +
-						context +
-						'))';
-					s += '.indexOf(';
-					s += 'alasql.utils.getValueOf(' + leftJS() + '))>-1)';
+					s = `alasql.utils.flatArray(this.queriesfn[${this.queriesidx}](params, null, ${context})).indexOf(alasql.utils.getValueOf(${leftJS()})) > -1`;
 				} else if (Array.isArray(this.right)) {
-					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
-						s =
-							'(new Set([' +
-							this.right.map(ref).join(',') +
-							']).has(alasql.utils.getValueOf(' +
-							leftJS() +
-							')))';
+					if (!alasql.options.cache || this.right.some(value => value instanceof yy.ParamValue)) {
+						// Leverage JS Set for faster lookups than arrays
+						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 = {};
-						}
+						// Use a cache to avoid re-creating the Set on every identical query
+						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() + '))';
+						alasql.sets[allValuesStr] = alasql.sets[allValuesStr] || new Set(allValues);
+						s = `alasql.sets["${allValuesStr}"].has(alasql.utils.getValueOf(${leftJS()}))`;
 					}
 				} else {
-					s = '(' + rightJS() + '.indexOf(' + leftJS() + ')>-1)';
-
-					//		} else {
-					//			throw new Error('Wrong IN operator without SELECT part');
+					s = `(${rightJS()}.indexOf(${leftJS()}) > -1)`;
 				}
-			}
-
-			if (this.op === 'NOT IN') {
+			} else if (this.op === 'NOT IN') {
 				if (this.right instanceof yy.Select) {
-					s = '(';
-					s += 'alasql.utils.flatArray(this.queriesfn[' + this.queriesidx + '](params,null,p))';
-					s += '.indexOf(';
-					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
+					s = `alasql.utils.flatArray(this.queriesfn[${this.queriesidx}](params, null, p)).indexOf(alasql.utils.getValueOf(${leftJS()})) < 0`;
 				} else if (Array.isArray(this.right)) {
-					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
-						s =
-							'(!(new Set([' +
-							this.right.map(ref).join(',') +
-							']).has(alasql.utils.getValueOf(' +
-							leftJS() +
-							'))))';
+					if (!alasql.options.cache || this.right.some(value => value instanceof yy.ParamValue)) {
+						// Leverage JS Set for faster lookups than arrays
+						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 = {};
-						}
+						// Use a cache to avoid re-creating the Set on every identical query
+						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() + '))';
+						alasql.sets[allValuesStr] = alasql.sets[allValuesStr] || new Set(allValues);
+						s = `!alasql.sets["${allValuesStr}"].has(alasql.utils.getValueOf(${leftJS()}))`;
 					}
 				} else {
-					s = '(' + rightJS() + '.indexOf(';
-					s += leftJS() + ')==-1)';
-
-					//			throw new Error('Wrong NOT IN operator without SELECT part');
+					s = `(${rightJS()}.indexOf(${leftJS()}) === -1)`;
 				}
 			}
 
@@ -10724,9 +10229,7 @@ yy.Over = class Over {
 				return '(' + declareRefs + ', ' + expr + ')';
 			}
 
-			return (
-				'(' + declareRefs + ', ' + 'y.some(function(e){return e == null}) ? void 0 : ' + expr + ')'
-			);
+			return `(${declareRefs}, y.some(e => e == null) ? void 0 : ${expr})`;
 		}
 	}
 
@@ -10798,8 +10301,6 @@ yy.Over = class Over {
 		}
 
 		toJS(context, tableid, defcols) {
-
-			//	return "'"+doubleqq(this.value)+"'";
 			return context;
 		}
 	}
@@ -11351,7 +10852,6 @@ yy.FuncValue.prototype.toJS = function (context, tableid, defcols) {
 	} else if (!alasql.fn[funcid] && alasql.stdfn[funcid.toUpperCase()]) {
 		if (this.newid) s += 'new ';
 		s += 'alasql.stdfn[' + JSON.stringify(this.funcid.toUpperCase()) + '](';
-		//		if(this.args) s += this.args.toJS(context, tableid);
 		if (this.args && this.args.length > 0) {
 			s += this.args
 				.map(function (arg) {
@@ -11366,7 +10866,6 @@ yy.FuncValue.prototype.toJS = function (context, tableid, defcols) {
 		//		var s = '';
 		if (this.newid) s += 'new ';
 		s += 'alasql.fn[' + JSON.stringify(this.funcid) + '](';
-		//		if(this.args) s += this.args.toJS(context, tableid);
 		if (this.args && this.args.length > 0) {
 			s += this.args
 				.map(function (arg) {
@@ -11376,9 +10875,18 @@ yy.FuncValue.prototype.toJS = function (context, tableid, defcols) {
 		}
 		s += ')';
 	}
-
 	return s;
 };
+/*
+//
+// SQL FUNCTIONS COMPILERS
+// Based on SQLite functions
+
+// IMPORTANT: These are compiled functions
+
+//alasql.fn = {}; // Keep for compatibility
+//alasql.userlib = alasql.fn;
+*/
 
 var stdlib = (alasql.stdlib = {});
 var stdfn = (alasql.stdfn = {});
@@ -11399,16 +10907,16 @@ stdlib.EXP = function (a) {
 
 stdlib.IIF = function (a, b, c) {
 	if (arguments.length === 3) {
-		return '((' + a + ')?(' + b + '):(' + c + '))';
+		return `((${a}) ? (${b}) : (${c}))`;
 	} else {
 		throw new Error('Number of arguments of IFF is not equals to 3');
 	}
 };
 stdlib.IFNULL = function (a, b) {
-	return '((typeof ' + a + ' ==="undefined" || null ===  ' + a + ')?' + b + ':' + a + ')';
+	return `((typeof ${a} === "undefined" || ${a} === null) ? ${b} : ${a})`;
 };
 stdlib.INSTR = function (s, p) {
-	return '((' + s + ').indexOf(' + p + ')+1)';
+	return `((${s}).indexOf(${p}) + 1)`;
 };
 
 //stdlib.LEN = stdlib.LENGTH = function(s) {return '('+s+'+"").length';};
@@ -11560,15 +11068,15 @@ alasql.aggr.median = alasql.aggr.MEDIAN = function (v, s, stage) {
 		return null;
 	}
 
-	var r = s.sort((a, b) => {
+	let r = s.sort((a, b) => {
 		if (a > b) return 1;
 		if (a < b) return -1;
 		return 0;
 	});
 
-	var middle = (r.length + 1) / 2;
-	var middleFloor = middle | 0;
-	var el = r[middleFloor - 1];
+	let middle = (r.length + 1) / 2;
+	let middleFloor = middle | 0;
+	let el = r[middleFloor - 1];
 
 	if (middle === middleFloor || (typeof el !== 'number' && !(el instanceof Number))) {
 		return el;
@@ -11584,32 +11092,34 @@ alasql.aggr.QUART = function (v, s, stage, nth) {
 			s.push(v);
 		}
 		return s;
-	} else if (stage === 1) {
+	}
+
+	if (stage === 1) {
 		if (v === null) {
 			return [];
 		}
 		return [v];
-	} else {
-		if (!s.length) {
-			return s;
-		}
+	}
+	if (!s.length) {
+		return s;
+	}
 
-		nth = !nth ? 1 : nth;
-		var r = s.sort(function (a, b) {
-			if (a === b) {
-				return 0;
-			}
-			if (a > b) {
-				return 1;
-			}
-			return -1;
-		});
-		var p = (nth * (r.length + 1)) / 4;
-		if (Number.isInteger(p)) {
-			return r[p - 1]; //Integer value
-		}
-		return r[Math.floor(p)]; //Math.ceil -1 or Math.floor
+	nth = !nth ? 1 : nth;
+	var r = s.sort(function (a, b) {
+		if (a === b) return 0;
+
+		if (a > b) return 1;
+
+		return -1;
+	});
+
+	let p = (nth * (r.length + 1)) / 4;
+
+	if (Number.isInteger(p)) {
+		return r[p - 1]; //Integer value
 	}
+
+	return r[Math.floor(p)]; //Math.ceil -1 or Math.floor
 };
 
 alasql.aggr.QUART2 = function (v, s, stage) {
@@ -11624,26 +11134,25 @@ alasql.aggr.QUART3 = function (v, s, stage) {
 // Standard deviation
 alasql.aggr.VAR = function (v, s, stage) {
 	if (stage === 1) {
-		if (v === null) {
-			return {arr: [], sum: 0};
-		}
-		return {arr: [v], sum: v};
+		// Initialise sum, sum of squares, and count
+		return v === null ? {sum: 0, sumSq: 0, count: 0} : {sum: v, sumSq: v * v, count: 1};
 	} else if (stage === 2) {
-		if (v === null) {
-			return s;
+		// Update sum, sum of squares, and count
+		if (v !== null) {
+			s.sum += v;
+			s.sumSq += v * v;
+			s.count++;
 		}
-		s.arr.push(v);
-		s.sum += v;
 		return s;
 	} else {
-		var N = s.arr.length;
-		var avg = s.sum / N;
-		var std = 0;
-		for (var i = 0; i < N; i++) {
-			std += (s.arr[i] - avg) * (s.arr[i] - avg);
+		// Calculate variance using the formula: variance = (sumSq - (sum^2 / count)) / (count - 1)
+		// This avoids the need to store and iterate over all values
+		if (s.count > 1) {
+			return (s.sumSq - (s.sum * s.sum) / s.count) / (s.count - 1);
+		} else {
+			// Handling for cases with less than 2 values (variance is undefined or zero)
+			return 0;
 		}
-		std = std / (N - 1);
-		return std;
 	}
 };
 
@@ -11655,27 +11164,33 @@ alasql.aggr.STDEV = function (v, s, stage) {
 	}
 };
 
-// Standard deviation
-// alasql.aggr.VARP = function(v,s,acc){
-
-// };
+alasql.aggr.STDEV = function (v, s, stage) {
+	if (stage === 1 || stage === 2) {
+		return alasql.aggr.VAR(v, s, stage);
+	} else {
+		return Math.sqrt(alasql.aggr.VAR(v, s, stage));
+	}
+};
 
-alasql.aggr.VARP = function (v, s, stage) {
-	if (stage == 1) {
-		return {arr: [v], sum: v};
-	} else if (stage == 2) {
-		s.arr.push(v);
-		s.sum += v;
-		return s;
+alasql.aggr.VARP = function (value, accumulator, stage) {
+	if (stage === 1) {
+		// Initialise accumulator with count, sum, and sum of squares
+		return {count: 1, sum: value, sumSq: value * value};
+	} else if (stage === 2) {
+		// Update accumulator
+		accumulator.count++;
+		accumulator.sum += value;
+		accumulator.sumSq += value * value;
+		return accumulator;
 	} else {
-		var N = s.arr.length;
-		var avg = s.sum / N;
-		var std = 0;
-		for (var i = 0; i < N; i++) {
-			std += (s.arr[i] - avg) * (s.arr[i] - avg);
+		// Final stage: Calculate variance
+		if (accumulator.count > 0) {
+			const mean = accumulator.sum / accumulator.count;
+			const variance = accumulator.sumSq / accumulator.count - mean * mean;
+			return variance;
+		} else {
+			return 0; // Return 0 variance if no values were aggregated
 		}
-		std = std / N;
-		return std;
 	}
 };
 
@@ -11779,38 +11294,32 @@ yy.CaseValue.prototype.findAggregator = function (query) {
 };
 
 yy.CaseValue.prototype.toJS = function (context, tableid, defcols) {
-	var s = '((function(' + context + ',params,alasql){var y,r;';
-	if (this.expression) {
-		//			this.expression.toJS(context, tableid)
-		s += 'v=' + this.expression.toJS(context, tableid, defcols) + ';';
-		s += (this.whens || [])
-			.map(function (w) {
-				return (
-					' if(v==' +
-					w.when.toJS(context, tableid, defcols) +
-					') {r=' +
-					w.then.toJS(context, tableid, defcols) +
-					'}'
-				);
-			})
-			.join(' else ');
-		if (this.elses) s += ' else {r=' + this.elses.toJS(context, tableid, defcols) + '}';
+	let s = `(((${context}, params, alasql) => {
+        let y, r;`;
+
+	if (this.expression) {
+		// If there's an expression, evaluate it and store in `v`, then compare in `when` clauses
+		s += `let v = ${this.expression.toJS(context, tableid, defcols)};`;
+		this.whens.forEach((w, index) => {
+			const condition = `v === ${w.when.toJS(context, tableid, defcols)}`;
+			const assignment = `r = ${w.then.toJS(context, tableid, defcols)}`;
+			s += `${index === 0 ? 'if' : ' else if'} (${condition}) { ${assignment}; }`;
+		});
 	} else {
-		s += (this.whens || [])
-			.map(function (w) {
-				return (
-					' if(' +
-					w.when.toJS(context, tableid, defcols) +
-					') {r=' +
-					w.then.toJS(context, tableid, defcols) +
-					'}'
-				);
-			})
-			.join(' else ');
-		if (this.elses) s += ' else {r=' + this.elses.toJS(context, tableid, defcols) + '}';
+		// Directly evaluate `when` conditions without an initial expression
+		this.whens.forEach((w, index) => {
+			const condition = w.when.toJS(context, tableid, defcols);
+			const assignment = `r = ${w.then.toJS(context, tableid, defcols)}`;
+			s += `${index === 0 ? 'if' : ' else if'} (${condition}) { ${assignment}; }`;
+		});
+	}
+
+	// Handle the `else` case
+	if (this.elses) {
+		s += ` else { r = ${this.elses.toJS(context, tableid, defcols)}; }`;
 	}
-	// TODO remove bind from CASE
-	s += ';return r;}).bind(this))(' + context + ',params,alasql)';
+
+	s += '; return r; }))(' + context + ', params, alasql)';
 
 	return s;
 };
@@ -11832,47 +11341,31 @@ yy.Json.prototype.toString = function () {
 	return s;
 };
 
-var JSONtoString = (alasql.utils.JSONtoString = function (obj) {
-	var s = '';
-	if (typeof obj == 'string') s = '"' + obj + '"';
-	else if (typeof obj == 'number') s = obj;
-	else if (typeof obj == 'boolean') s = obj;
-	else if (typeof obj == 'object') {
-		if (Array.isArray(obj)) {
-			s +=
-				'[' +
-				obj
-					.map(function (b) {
-						return JSONtoString(b);
-					})
-					.join(',') +
-				']';
-		} else if (!obj.toJS || obj instanceof yy.Json) {
-			// to prevent recursion
-			s = '{';
-			var ss = [];
-			for (var k in obj) {
-				var s1 = '';
-				if (typeof k == 'string') s1 += '"' + k + '"';
-				else if (typeof k == 'number') s1 += k;
-				else if (typeof k == 'boolean') s1 += k;
-				else {
-					throw new Error('THis is not ES6... no expressions on left side yet');
-				}
-				s1 += ':' + JSONtoString(obj[k]);
-				ss.push(s1);
+const JSONtoString = (alasql.utils.JSONtoString = function (obj) {
+	if (typeof obj === 'string') return `"${obj}"`;
+	if (typeof obj === 'number' || typeof obj === 'boolean') return String(obj);
+
+	if (Array.isArray(obj)) {
+		return `[${obj.map(b => JSONtoString(b)).join(',')}]`;
+	}
+
+	if (typeof obj === 'object') {
+		if (!obj.toJS || obj instanceof yy.Json) {
+			const ss = [];
+			for (const k in obj) {
+				const keyStr = typeof k === 'string' ? `"${k}"` : String(k);
+				const valueStr = JSONtoString(obj[k]);
+				ss.push(`${keyStr}:${valueStr}`);
 			}
-			s += ss.join(',') + '}';
+			return `{${ss.join(',')}}`;
 		} else if (obj.toString) {
-			s = obj.toString();
+			return obj.toString();
 		} else {
-			throw new Error('1Can not show JSON object ' + JSON.stringify(obj));
+			throw new Error(`1: Cannot show JSON object ${JSON.stringify(obj)}`);
 		}
 	} else {
-		throw new Error('2Can not show JSON object ' + JSON.stringify(obj));
+		throw new Error(`2: Cannot show JSON object ${JSON.stringify(obj)}`);
 	}
-
-	return s;
 });
 
 function JSONtoJS(obj, context, tableid, defcols) {
@@ -11880,36 +11373,21 @@ function JSONtoJS(obj, context, tableid, defcols) {
 	if (typeof obj == 'string') s = '"' + obj + '"';
 	else if (typeof obj == 'number') s = '(' + obj + ')';
 	else if (typeof obj == 'boolean') s = obj;
-	else if (typeof obj == 'object') {
+	else if (typeof obj === 'object') {
 		if (Array.isArray(obj)) {
-			s +=
-				'[' +
-				obj
-					.map(function (b) {
-						return JSONtoJS(b, context, tableid, defcols);
-					})
-					.join(',') +
-				']';
+			s += `[${obj.map(b => JSONtoJS(b, context, tableid, defcols)).join(',')}]`;
 		} else if (!obj.toJS || obj instanceof yy.Json) {
-			// to prevent recursion
-			s = '{';
-			var ss = [];
-			for (var k in obj) {
-				var s1 = '';
-				if (typeof k == 'string') s1 += '"' + k + '"';
-				else if (typeof k == 'number') s1 += k;
-				else if (typeof k == 'boolean') s1 += k;
-				else {
-					throw new Error('THis is not ES6... no expressions on left side yet');
-				}
-				s1 += ':' + JSONtoJS(obj[k], context, tableid, defcols);
-				ss.push(s1);
+			let ss = [];
+			for (const k in obj) {
+				let keyStr = typeof k === 'string' ? `"${k}"` : k.toString();
+				let valueStr = JSONtoJS(obj[k], context, tableid, defcols);
+				ss.push(`${keyStr}:${valueStr}`);
 			}
-			s += ss.join(',') + '}';
+			s = `{${ss.join(',')}}`;
 		} else if (obj.toJS) {
 			s = obj.toJS(context, tableid, defcols);
 		} else {
-			throw new Error('1Can not parse JSON object ' + JSON.stringify(obj));
+			throw new Error(`Cannot parse JSON object ${JSON.stringify(obj)}`);
 		}
 	} else {
 		throw new Error('2Can not parse JSON object ' + JSON.stringify(obj));
@@ -11947,23 +11425,12 @@ yy.Convert.prototype.toString = function () {
 	return s;
 };
 yy.Convert.prototype.toJS = function (context, tableid, defcols) {
-	//	if(this.style) {
-	return (
-		'alasql.stdfn.CONVERT(' +
-		this.expression.toJS(context, tableid, defcols) +
-		',{dbtypeid:"' +
-		this.dbtypeid +
-		'",dbsize:' +
-		this.dbsize +
-		',dbprecision:' +
-		this.dbprecision +
-		',style:' +
-		this.style +
-		'})'
-	);
-	//	}
-
-	throw new Error('There is not such type conversion for ' + this.toString());
+	return `alasql.stdfn.CONVERT(${this.expression.toJS(context, tableid, defcols)}, {
+        dbtypeid: "${this.dbtypeid}",
+        dbsize: ${this.dbsize},
+        dbprecision: ${this.dbprecision},
+        style: ${this.style}
+    })`;
 };
 
 function structuredDate(unFormattedDate) {
@@ -12159,7 +11626,7 @@ yy.ColumnDef = function (params) {
 	return Object.assign(this, params);
 };
 yy.ColumnDef.prototype.toString = function () {
-	var s = this.columnid;
+	let s = this.columnid;
 	if (this.dbtypeid) {
 		s += ' ' + this.dbtypeid;
 	}
@@ -12187,41 +11654,20 @@ yy.CreateTable = function (params) {
 	return Object.assign(this, params);
 };
 yy.CreateTable.prototype.toString = function () {
-	var s = 'CREATE';
-	if (this.temporary) {
-		s += ' TEMPORARY';
-	}
+	let s = `CREATE${this.temporary ? ' TEMPORARY' : ''}${this.view ? ' VIEW' : ` ${this.class ? 'CLASS' : 'TABLE'}`}${this.ifnotexists ? ' IF NOT EXISTS' : ''} ${this.table.toString()}`;
 
-	if (this.view) {
-		s += ' VIEW';
-	} else {
-		s += ' ' + (this.class ? 'CLASS' : 'TABLE');
-	}
-	if (this.ifnotexists) {
-		s += ' IF  NOT EXISTS';
-	}
-	s += ' ' + this.table.toString();
 	if (this.viewcolumns) {
-		s +=
-			'(' +
-			this.viewcolumns
-				.map(function (vcol) {
-					return vcol.toString();
-				})
-				.join(',') +
-			')';
+		s += `(${this.viewcolumns.map(vcol => vcol.toString()).join(',')})`;
 	}
+
 	if (this.as) {
-		s += ' AS ' + this.as;
+		s += ` AS ${this.as}`;
 	} else {
-		var ss = this.columns.map(function (col) {
-			return col.toString();
-		});
-		s += ' (' + ss.join(',') + ')';
+		s += ` (${this.columns.map(col => col.toString()).join(',')})`;
 	}
 
 	if (this.view && this.select) {
-		s += ' AS ' + this.select.toString();
+		s += ` AS ${this.select.toString()}`;
 	}
 
 	return s;
@@ -12238,13 +11684,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 		throw new Error('Table name is not defined');
 	}
 
-	//	var ifnotexists = this.ifnotexists;
 	var columns = this.columns;
-	// if(false) {
-	// 	if(!columns) {
-	// 		throw new Error('Columns are not defined');
-	// 	}
-	// }
 	var constraints = this.constraints || [];
 
 	// IF NOT EXISTS
@@ -12295,8 +11735,6 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 					value: +col.identity.value,
 					step: +col.identity.step,
 				};
-				//				ss.push('\''+col.columnid+'\':(alasql.databases[\''+db.databaseid+'\'].tables[\''
-				//					+tableid+'\'].identities[\''+col.columnid+'\'].value)');
 			}
 			if (col.check) {
 				table.checks.push({
@@ -12333,7 +11771,6 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 
 			// UNIQUE clause
 			if (col.foreignkey) {
-
 				var fk = col.foreignkey.table;
 				var fktable = alasql.databases[fk.databaseid || databaseid].tables[fk.tableid];
 				if (typeof fk.columnid === 'undefined') {
@@ -12343,7 +11780,6 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 						throw new Error('FOREIGN KEY allowed only to tables with PRIMARY KEYs');
 					}
 				}
-
 				var fkfn = function (r) {
 					var rr = {};
 					if (typeof r[col.columnid] === 'undefined') {
@@ -12351,7 +11787,6 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 					}
 					rr[fk.columnid] = r[col.columnid];
 					var addr = fktable.pk.onrightfn(rr);
-
 					if (!fktable.uniqs[fktable.pk.hh][addr]) {
 						throw new Error(
 							'Foreign key violation' //changed error message
@@ -12360,7 +11795,6 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 					return true;
 				};
 				table.checks.push({fn: fkfn});
-
 			}
 
 			if (col.onupdate) {
@@ -12374,9 +11808,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 	table.defaultfns = ss.join(',');
 	table.onupdatefns = uss.join(';');
 
-	//	if(constraints) {
 	constraints.forEach(function (con) {
-
 		var checkfn;
 
 		if (con.type === 'PRIMARY KEY') {
@@ -12394,10 +11826,8 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			pk.hh = hash(pk.onrightfns);
 			table.uniqs[pk.hh] = {};
 		} else if (con.type === 'CHECK') {
-
 			checkfn = new Function('r', 'var y;return ' + con.expression.toJS('r', ''));
 		} else if (con.type === 'UNIQUE') {
-
 			var uk = {};
 			table.uk = table.uk || [];
 			table.uk.push(uk);
@@ -12475,25 +11905,18 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 	//Used in 420from queryfn when table.view = true!
 	if (this.view && this.select) {
 		table.view = true;
-
 		table.select = this.select.compile(this.table.databaseid || databaseid);
 	}
 
 	if (db.engineid) {
-
 		return alasql.engines[db.engineid].createTable(
 			this.table.databaseid || databaseid,
 			tableid,
 			this.ifnotexists,
 			cb
 		);
-
-		//		return res1;
 	}
 
-	//	}
-	//			if(table.pk) {
-
 	table.insert = function (r, orreplace) {
 		var oldinserted = alasql.inserted;
 		alasql.inserted = [r];
@@ -13238,53 +12661,34 @@ yy.CreateEdge.prototype.compile = function (databaseid) {
 		var setfn = new Function('x,params,alasql', 'var y;' + s);
 	}
 
-	/*
-	todo: handle content, select and default
-	else if(this.content) {
-
-	} else if(this.select) {
-
-	} else {
-	}
-	*/
+	const statement = (params, cb) => {
+		let res = 0;
+		let db = alasql.databases[dbid];
+		let edge = {$id: db.counter++, $node: 'EDGE'};
+		let v1 = fromfn(params, alasql);
+		let v2 = tofn(params, alasql);
 
-	var statement = function (params, cb) {
-		var res = 0;
-		// CREATE VERTEX without parameters
-		var db = alasql.databases[dbid];
-		var edge = {$id: db.counter++, $node: 'EDGE'};
-		var v1 = fromfn(params, alasql);
-		var v2 = tofn(params, alasql);
 		// Set link
 		edge.$in = [v1.$id];
 		edge.$out = [v2.$id];
-		// Set sides
-		if (v1.$out === undefined) {
-			v1.$out = [];
-		}
+
+		// Initialize and set sides
+		v1.$out = v1.$out || [];
 		v1.$out.push(edge.$id);
 
-		if (typeof v2.$in === undefined) {
-			v2.$in = [];
-		}
+		v2.$in = v2.$in || [];
 		v2.$in.push(edge.$id);
 
 		// Save in objects
 		db.objects[edge.$id] = edge;
 		res = edge;
-		if (namefn) {
-			namefn(edge);
-		}
-
-		if (setfn) {
-			setfn(edge, params, alasql);
-		}
 
-		if (cb) {
-			res = cb(res);
-		}
+		// Optional functions
+		namefn?.(edge);
+		setfn?.(edge, params, alasql);
 
-		return res;
+		// Callback
+		return cb ? cb(res) : res;
 	};
 	return statement;
 };
@@ -13309,122 +12713,77 @@ yy.CreateGraph.prototype.execute = function (databaseid, params, cb) {
 	}
 
 	//	stop;
-	this.graph.forEach(function (g) {
-		if (g.source) {
-			// GREATE EDGE
-			var e = {};
-			if (typeof g.as !== 'undefined') {
-				alasql.vars[g.as] = e;
-			}
-
-			if (typeof g.prop !== 'undefined') {
-				//				e[g.prop] = e;
-				//				v.$id = g.prop; // We do not create $id for edge automatically
-				e.name = g.prop;
-			}
-			if (typeof g.sharp !== 'undefined') {
-				e.$id = g.sharp;
-			}
-			if (typeof g.name !== 'undefined') {
-				e.name = g.name;
-			}
-			if (typeof g.class !== 'undefined') {
-				e.$class = g.class;
-			}
-
-			var db = alasql.databases[databaseid];
-			if (typeof e.$id === 'undefined') {
-				e.$id = db.counter++;
-			}
+	this.graph.forEach(g => {
+		if (!g.source) {
+			createVertex(g);
+		} else {
+			// CREATE EDGE
+			let e = {};
+			if (g.as !== undefined) alasql.vars[g.as] = e;
+			if (g.prop !== undefined) e.name = g.prop;
+			if (g.sharp !== undefined) e.$id = g.sharp;
+			if (g.name !== undefined) e.name = g.name;
+			if (g.class !== undefined) e.$class = g.class;
+
+			let db = alasql.databases[databaseid];
+			e.$id = e.$id !== undefined ? e.$id : db.counter++;
 			e.$node = 'EDGE';
-			if (typeof g.json !== 'undefined') {
-				extend(e, new Function('params,alasql', 'var y;return ' + g.json.toJS())(params, alasql));
-			}
 
-			var v1;
-			if (g.source.vars) {
-				var vo = alasql.vars[g.source.vars];
-				if (typeof vo === 'object') {
-					v1 = vo;
-				} else {
-					v1 = db.objects[vo];
-				}
-			} else {
-				var av1 = g.source.sharp;
-				if (typeof av1 === 'undefined') {
-					av1 = g.source.prop;
-				}
-				v1 = alasql.databases[databaseid].objects[av1];
-				if (
-					typeof v1 === 'undefined' &&
-					alasql.options.autovertex &&
-					(typeof g.source.prop !== 'undefined' || typeof g.source.name !== 'undefined')
-				) {
-					v1 = findVertex(g.source.prop || g.source.name);
-					if (typeof v1 === 'undefined') {
-						v1 = createVertex(g.source);
-					}
-				}
+			if (g.json !== undefined) {
+				Object.assign(e, new Function('params, alasql', `return ${g.json.toJS()}`)(params, alasql));
 			}
 
-			var v2;
-			if (g.source.vars) {
-				var vo = alasql.vars[g.target.vars];
-				if (typeof vo === 'object') {
-					v2 = vo;
+			const resolveVertex = (sourceOrTarget, isSource) => {
+				let vertex, vo;
+				if (sourceOrTarget.vars) {
+					vo = alasql.vars[sourceOrTarget.vars];
+					vertex = typeof vo === 'object' ? vo : db.objects[vo];
 				} else {
-					v2 = db.objects[vo];
-				}
-			} else {
-				var av2 = g.target.sharp;
-				if (typeof av2 === 'undefined') {
-					av2 = g.target.prop;
-				}
-				v2 = alasql.databases[databaseid].objects[av2];
-				if (
-					typeof v2 === 'undefined' &&
-					alasql.options.autovertex &&
-					(typeof g.target.prop !== 'undefined' || typeof g.target.name !== 'undefined')
-				) {
-					v2 = findVertex(g.target.prop || g.target.name);
-					if (typeof v2 === 'undefined') {
-						v2 = createVertex(g.target);
+					let av = sourceOrTarget.sharp || sourceOrTarget.prop;
+					vertex = db.objects[av];
+					if (
+						vertex === undefined &&
+						alasql.options.autovertex &&
+						(sourceOrTarget.prop || sourceOrTarget.name)
+					) {
+						vertex =
+							findVertex(sourceOrTarget.prop || sourceOrTarget.name) ||
+							createVertex(sourceOrTarget);
 					}
 				}
-			}
+				if (isSource && vertex && typeof vertex.$out === 'undefined') vertex.$out = [];
+				if (!isSource && vertex && typeof vertex.$in === 'undefined') vertex.$in = [];
+				return vertex;
+			};
 
-			// Set link
+			let v1 = resolveVertex(g.source, true);
+			let v2 = resolveVertex(g.target, false);
+
+			// Set link and sides
 			e.$in = [v1.$id];
 			e.$out = [v2.$id];
-			// Set sides
-			if (typeof v1.$out === 'undefined') {
-				v1.$out = [];
-			}
 			v1.$out.push(e.$id);
-			if (typeof v2.$in === 'undefined') {
-				v2.$in = [];
-			}
 			v2.$in.push(e.$id);
 
 			db.objects[e.$id] = e;
-			if (typeof e.$class !== 'undefined') {
-				if (typeof alasql.databases[databaseid].tables[e.$class] === 'undefined') {
-					throw new Error('No such class. Pleace use CREATE CLASS');
+
+			if (e.$class !== undefined) {
+				let classTable = alasql.databases[databaseid].tables[e.$class];
+				if (classTable === undefined) {
+					throw new Error('No such class. Please use CREATE CLASS');
 				} else {
-					// TODO - add insert()
-					alasql.databases[databaseid].tables[e.$class].data.push(e);
+					classTable.data.push(e);
 				}
 			}
 
 			res.push(e.$id);
-		} else {
-			createVertex(g);
 		}
 	});
 
 	if (cb) {
 		res = cb(res);
 	}
+
 	return res;
 
 	// Find vertex by name
@@ -13483,52 +12842,50 @@ yy.CreateGraph.prototype.execute = function (databaseid, params, cb) {
 		return v;
 	}
 };
-
 yy.CreateGraph.prototype.compile1 = function (databaseid) {
-	var dbid = databaseid;
-	var fromfn = new Function('params,alasql', 'var y;return ' + this.from.toJS());
-	var tofn = new Function('params,alasql', 'var y;return ' + this.to.toJS());
+	const dbid = databaseid;
+	const fromfn = new Function('params, alasql', `return ${this.from.toJS()}`);
+	const tofn = new Function('params, alasql', `return ${this.to.toJS()}`);
+
+	let namefn, setfn;
 
 	// CREATE VERTEX "Name"
-	if (typeof this.name !== 'undefined') {
-		var s = 'x.name=' + this.name.toJS();
-		var namefn = new Function('x', s);
+	if (this.name !== undefined) {
+		const s = `x.name = ${this.name.toJS()}`;
+		namefn = new Function('x', s);
 	}
 
 	if (this.sets && this.sets.length > 0) {
-		var s = this.sets
-			.map(function (st) {
-				return `x[${JSON.stringify(st.column.columnid)}]=` + st.expression.toJS('x', '');
-			})
+		const s = this.sets
+			.map(st => `x[${JSON.stringify(st.column.columnid)}] = ${st.expression.toJS('x', '')}`)
 			.join(';');
-		var setfn = new Function('x,params,alasql', 'var y;' + s);
+		setfn = new Function('x, params, alasql', `var y; ${s}`);
 	}
 
 	// Todo: handle content, select and default
 
-	var statement = function (params, cb) {
-		var res = 0;
-		// CREATE VERTEX without parameters
-		var db = alasql.databases[dbid];
-		var edge = {$id: db.counter++, $node: 'EDGE'};
-		var v1 = fromfn(params, alasql);
-		var v2 = tofn(params, alasql);
+	const statement = (params, cb) => {
+		let res = 0;
+		const db = alasql.databases[dbid];
+		const edge = {$id: db.counter++, $node: 'EDGE'};
+		const v1 = fromfn(params, alasql);
+		const v2 = tofn(params, alasql);
+
 		// Set link
 		edge.$in = [v1.$id];
 		edge.$out = [v2.$id];
+
 		// Set sides
-		if (typeof v1.$out === 'undefined') {
-			v1.$out = [];
-		}
+		v1.$out = v1.$out || [];
 		v1.$out.push(edge.$id);
 
-		if (typeof v2.$in === 'undefined') {
-			v2.$in = [];
-		}
+		v2.$in = v2.$in || [];
 		v2.$in.push(edge.$id);
+
 		// Save in objects
 		db.objects[edge.$id] = edge;
 		res = edge;
+
 		if (namefn) {
 			namefn(edge);
 		}
@@ -13557,13 +12914,13 @@ yy.AlterTable = function (params) {
 	return Object.assign(this, params);
 };
 yy.AlterTable.prototype.toString = function () {
-	var s = 'ALTER TABLE ' + this.table.toString();
+	let s = 'ALTER TABLE ' + this.table.toString();
 	if (this.renameto) s += ' RENAME TO ' + this.renameto;
 	return s;
 };
 
 yy.AlterTable.prototype.execute = function (databaseid, params, cb) {
-	var db = alasql.databases[databaseid];
+	let db = alasql.databases[databaseid];
 	db.dbversion = Date.now();
 
 	if (this.renameto) {
@@ -13583,7 +12940,9 @@ yy.AlterTable.prototype.execute = function (databaseid, params, cb) {
 		}
 		if (cb) cb(res);
 		return res;
-	} else if (this.addcolumn) {
+	}
+
+	if (this.addcolumn) {
 		db = alasql.databases[this.table.databaseid || databaseid];
 		db.dbversion++;
 		var tableid = this.table.tableid;
@@ -13609,15 +12968,15 @@ yy.AlterTable.prototype.execute = function (databaseid, params, cb) {
 		table.columns.push(col);
 		table.xcolumns[columnid] = col;
 
-		for (var i = 0, ilen = table.data.length; i < ilen; i++) {
-
+		for (let i = 0, ilen = table.data.length; i < ilen; i++) {
 			table.data[i][columnid] = defaultfn();
 		}
 
-		// TODO
 		return cb ? cb(1) : 1;
-	} else if (this.modifycolumn) {
-		var db = alasql.databases[this.table.databaseid || databaseid];
+	}
+
+	if (this.modifycolumn) {
+		let db = alasql.databases[this.table.databaseid || databaseid];
 		db.dbversion++;
 		var tableid = this.table.tableid;
 		var table = db.tables[tableid];
@@ -13635,10 +12994,11 @@ yy.AlterTable.prototype.execute = function (databaseid, params, cb) {
 		col.dbprecision = this.dbprecision;
 		col.dbenum = this.dbenum;
 
-		// TODO
 		return cb ? cb(1) : 1;
-	} else if (this.renamecolumn) {
-		var db = alasql.databases[this.table.databaseid || databaseid];
+	}
+
+	if (this.renamecolumn) {
+		let db = alasql.databases[this.table.databaseid || databaseid];
 		db.dbversion++;
 
 		var tableid = this.table.tableid;
@@ -13665,16 +13025,16 @@ yy.AlterTable.prototype.execute = function (databaseid, params, cb) {
 			delete table.xcolumns[columnid];
 
 			for (var i = 0, ilen = table.data.length; i < ilen; i++) {
-
 				table.data[i][tocolumnid] = table.data[i][columnid];
 				delete table.data[i][columnid];
 			}
 			return table.data.length;
-		} else {
-			return cb ? cb(0) : 0;
 		}
-	} else if (this.dropcolumn) {
-		var db = alasql.databases[this.table.databaseid || databaseid];
+		return cb ? cb(0) : 0;
+	}
+
+	if (this.dropcolumn) {
+		let db = alasql.databases[this.table.databaseid || databaseid];
 		db.dbversion++;
 		var tableid = this.table.tableid;
 		var table = db.tables[tableid];
@@ -13700,10 +13060,11 @@ yy.AlterTable.prototype.execute = function (databaseid, params, cb) {
 		for (i = 0, ilen = table.data.length; i < ilen; i++) {
 			delete table.data[i][columnid];
 		}
+
 		return cb ? cb(table.data.length) : table.data.length;
-	} else {
-		throw Error('Unknown ALTER TABLE method');
 	}
+
+	throw Error('Unknown ALTER TABLE method');
 };
 /*
 //
@@ -14303,40 +13664,41 @@ yy.CreateTrigger.prototype.toString = function () {
 	return s;
 };
 
+const validTriggers = [
+	'beforeinsert',
+	'afterinsert',
+	'insteadofinsert',
+	'beforedelete',
+	'afterdelete',
+	'insteadofdelete',
+	'beforeupdate',
+	'afterupdate',
+	'insteadofupdate',
+];
+
 yy.CreateTrigger.prototype.execute = function (databaseid, params, cb) {
-	var res = 1; // No tables removed
-	var triggerid = this.trigger;
+	let res = 1; // No tables removed
+	const triggerid = this.trigger;
 	databaseid = this.table.databaseid || databaseid;
-	var db = alasql.databases[databaseid];
-	var tableid = this.table.tableid;
+	const db = alasql.databases[databaseid];
+	const {tableid} = this.table;
 
-	var trigger = {
+	const trigger = {
 		action: this.action,
 		when: this.when,
 		statement: this.statement,
 		funcid: this.funcid,
-		tableid: this.table.tableid,
+		tableid,
 	};
 
 	db.triggers[triggerid] = trigger;
-	if (trigger.action == 'INSERT' && trigger.when == 'BEFORE') {
-		db.tables[tableid].beforeinsert[triggerid] = trigger;
-	} else if (trigger.action == 'INSERT' && trigger.when == 'AFTER') {
-		db.tables[tableid].afterinsert[triggerid] = trigger;
-	} else if (trigger.action == 'INSERT' && trigger.when == 'INSTEADOF') {
-		db.tables[tableid].insteadofinsert[triggerid] = trigger;
-	} else if (trigger.action == 'DELETE' && trigger.when == 'BEFORE') {
-		db.tables[tableid].beforedelete[triggerid] = trigger;
-	} else if (trigger.action == 'DELETE' && trigger.when == 'AFTER') {
-		db.tables[tableid].afterdelete[triggerid] = trigger;
-	} else if (trigger.action == 'DELETE' && trigger.when == 'INSTEADOF') {
-		db.tables[tableid].insteadofdelete[triggerid] = trigger;
-	} else if (trigger.action == 'UPDATE' && trigger.when == 'BEFORE') {
-		db.tables[tableid].beforeupdate[triggerid] = trigger;
-	} else if (trigger.action == 'UPDATE' && trigger.when == 'AFTER') {
-		db.tables[tableid].afterupdate[triggerid] = trigger;
-	} else if (trigger.action == 'UPDATE' && trigger.when == 'INSTEADOF') {
-		db.tables[tableid].insteadofupdate[triggerid] = trigger;
+	const actionKey = `${this.when}${this.action}`.toLowerCase();
+
+	if (validTriggers.includes(actionKey)) {
+		// Ensure the existence of db.tables[tableid] and db.tables[tableid][actionKey]
+		db.tables[tableid] = db.tables[tableid] || {};
+		db.tables[tableid][actionKey] = db.tables[tableid][actionKey] || {};
+		db.tables[tableid][actionKey][triggerid] = trigger;
 	}
 
 	if (cb) res = cb(res);
@@ -14361,28 +13723,26 @@ yy.DropTrigger.prototype.toString = function () {
 	DROP TRIGGER one;
 */
 yy.DropTrigger.prototype.execute = function (databaseid, params, cb) {
-	var res = 0; // No tables removed
-	var db = alasql.databases[databaseid];
-	var triggerid = this.trigger;
+	let res = 0; // No tables removed
+	const db = alasql.databases[databaseid];
+	const triggerid = this.trigger;
 
-	// get the trigger
-	var trigger = db.triggers[triggerid];
+	// Get the trigger
+	const trigger = db.triggers[triggerid];
 
-	//  if the trigger exists
+	// If the trigger exists
 	if (trigger) {
-		var tableid = db.triggers[triggerid].tableid;
+		const {tableid} = trigger;
 
 		if (tableid) {
 			res = 1;
-			delete db.tables[tableid].beforeinsert[triggerid];
-			delete db.tables[tableid].afterinsert[triggerid];
-			delete db.tables[tableid].insteadofinsert[triggerid];
-			delete db.tables[tableid].beforedelete[triggerid];
-			delete db.tables[tableid].afterdelete[triggerid];
-			delete db.tables[tableid].insteadofdelete[triggerid];
-			delete db.tables[tableid].beforeupdate[triggerid];
-			delete db.tables[tableid].afterupdate[triggerid];
-			delete db.tables[tableid].insteadofupdate[triggerid];
+
+			// Delete the trigger from all trigger points
+			validTriggers.forEach(point => {
+				delete db.tables[tableid][point][triggerid];
+			});
+
+			// Finally, delete the trigger itself
 			delete db.triggers[triggerid];
 		} else {
 			throw new Error('Trigger Table not found');
@@ -14390,6 +13750,7 @@ yy.DropTrigger.prototype.execute = function (databaseid, params, cb) {
 	} else {
 		throw new Error('Trigger not found');
 	}
+
 	if (cb) res = cb(res);
 	return res;
 };
@@ -14411,16 +13772,12 @@ yy.Delete.prototype.toString = function () {
 };
 
 yy.Delete.prototype.compile = function (databaseid) {
-
 	databaseid = this.table.databaseid || databaseid;
 	var tableid = this.table.tableid;
 	var statement;
 	var db = alasql.databases[databaseid];
 
 	if (this.where) {
-
-		//		this.query = {};
-
 		if (this.exists) {
 			this.existsfn = this.exists.map(function (ex) {
 				var nq = ex.compile(databaseid);
@@ -14428,6 +13785,7 @@ yy.Delete.prototype.compile = function (databaseid) {
 				return nq;
 			});
 		}
+
 		if (this.queries) {
 			this.queriesfn = this.queries.map(function (q) {
 				var nq = q.compile(databaseid);
@@ -14436,10 +13794,6 @@ yy.Delete.prototype.compile = function (databaseid) {
 			});
 		}
 
-		//		try {
-
-		//		var query = {};
-
 		var wherefn = new Function(
 			'r,params,alasql',
 			'var y;return (' + this.where.toJS('r', '') + ')'
@@ -14465,7 +13819,6 @@ yy.Delete.prototype.compile = function (databaseid) {
 			}
 
 			var table = db.tables[tableid];
-			//			table.dirty = true;
 			var orignum = table.data.length;
 
 			var newtable = [];
@@ -14477,9 +13830,10 @@ yy.Delete.prototype.compile = function (databaseid) {
 					} else {
 						// Simply do not push
 					}
-				} else newtable.push(table.data[i]);
+				} else {
+					newtable.push(table.data[i]);
+				}
 			}
-			//			table.data = table.data.filter(function(r){return !;});
 			table.data = newtable;
 
 			// Trigger prevent functionality
@@ -14503,15 +13857,10 @@ yy.Delete.prototype.compile = function (databaseid) {
 				alasql.engines[db.engineid].saveTableData(databaseid, tableid);
 			}
 
-			if (cb) cb(res);
+			if (cb) res = cb(res);
+
 			return res;
 		};
-		//  .bind(query);
-
-		// 		if(!this.queries) return;
-		// 			query.queriesfn = this.queries.map(function(q) {
-		// 			return q.compile(alasql.useid);
-		// 		});
 	} else {
 		statement = function (params, cb) {
 			if (alasql.options.autocommit && db.engineid) {
@@ -14521,7 +13870,6 @@ yy.Delete.prototype.compile = function (databaseid) {
 			var table = db.tables[tableid];
 			table.dirty = true;
 			var orignum = db.tables[tableid].data.length;
-			//table.deleteall();
 			// Delete all records from the array
 			db.tables[tableid].data.length = 0;
 
@@ -14674,35 +14022,30 @@ yy.Merge = function (params) {
 	return Object.assign(this, params);
 };
 yy.Merge.prototype.toString = function () {
-	var s = 'MERGE ';
-	s += this.into.tableid + ' ';
-	if (this.into.as) s += 'AS ' + this.into.as + ' ';
-	s += 'USING ' + this.using.tableid + ' ';
-	if (this.using.as) s += 'AS ' + this.using.as + ' ';
-	s += 'ON ' + this.on.toString() + ' ';
-	this.matches.forEach(function (m) {
+	let s = `MERGE ${this.into.tableid} `;
+	if (this.into.as) s += `AS ${this.into.as} `;
+	s += `USING ${this.using.tableid} `;
+	if (this.using.as) s += `AS ${this.using.as} `;
+	s += `ON ${this.on.toString()} `;
+
+	this.matches.forEach(m => {
 		s += 'WHEN ';
 		if (!m.matched) s += 'NOT ';
 		s += 'MATCHED ';
 		if (m.bytarget) s += 'BY TARGET ';
 		if (m.bysource) s += 'BY SOURCE ';
-		if (m.expr) s += 'AND' + ' ' + m.expr.toString() + ' ';
+		if (m.expr) s += `AND ${m.expr.toString()} `;
 		s += 'THEN ';
 		if (m.action.delete) s += 'DELETE ';
 		if (m.action.insert) {
 			s += 'INSERT ';
-			if (m.action.columns) s += '(' + m.action.columns.toString() + ') ';
-			if (m.action.values) s += 'VALUES (' + m.action.values.toString() + ') ';
+			if (m.action.columns) s += `(${m.action.columns.toString()}) `;
+			if (m.action.values) s += `VALUES (${m.action.values.toString()}) `;
 			if (m.action.defaultvalues) s += 'DEFAULT VALUES ';
 		}
 		if (m.action.update) {
 			s += 'UPDATE ';
-			s +=
-				m.action.update
-					.map(function (u) {
-						return u.toString();
-					})
-					.join(',') + ' ';
+			s += m.action.update.map(u => u.toString()).join(', ') + ' ';
 		}
 	});
 
@@ -14731,25 +14074,19 @@ yy.CreateDatabase = function (params) {
 	return Object.assign(this, params);
 };
 yy.CreateDatabase.prototype.toString = function () {
-	var s = 'CREATE';
-	if (this.engineid) s += ' ' + this.engineid;
-	s += ' DATABASE';
-	if (this.ifnotexists) s += ' IF NOT EXISTS';
-	s += ' ' + this.databaseid;
+	let s = 'CREATE '; // Ensure there's a space after CREATE
+	if (this.engineid) s += `${this.engineid} `;
+	s += 'DATABASE ';
+	if (this.ifnotexists) s += 'IF NOT EXISTS ';
+	s += `${this.databaseid} `;
+
 	if (this.args && this.args.length > 0) {
-		s +=
-			'(' +
-			this.args
-				.map(function (arg) {
-					return arg.toString();
-				})
-				.join(', ') +
-			')';
+		s += `(${this.args.map(arg => arg.toString()).join(', ')}) `;
 	}
-	if (this.as) s += ' AS ' + this.as;
+	if (this.as) s += `AS ${this.as}`;
 	return s;
 };
-//yy.CreateDatabase.prototype.compile = returnUndefined;
+
 yy.CreateDatabase.prototype.execute = function (databaseid, params, cb) {
 	var args;
 	if (this.args && this.args.length > 0) {
@@ -14784,25 +14121,21 @@ yy.AttachDatabase = function (params) {
 	return Object.assign(this, params);
 };
 yy.AttachDatabase.prototype.toString = function (args) {
-	var s = 'ATTACH';
-	if (this.engineid) s += ' ' + this.engineid;
-	s += ' DATABASE' + ' ' + this.databaseid;
+	let s = 'ATTACH';
+	if (this.engineid) s += ` ${this.engineid}`;
+	s += ` DATABASE ${this.databaseid}`;
 	// TODO add params
 	if (args) {
 		s += '(';
 		if (args.length > 0) {
-			s += args
-				.map(function (arg) {
-					return arg.toString();
-				})
-				.join(', ');
+			s += args.map(arg => arg.toString()).join(', ');
 		}
 		s += ')';
 	}
-	if (this.as) s += ' AS' + ' ' + this.as;
+	if (this.as) s += ` AS ${this.as}`;
 	return s;
 };
-//yy.CreateDatabase.prototype.compile = returnUndefined;
+
 yy.AttachDatabase.prototype.execute = function (databaseid, params, cb) {
 	if (!alasql.engines[this.engineid]) {
 		throw new Error('Engine "' + this.engineid + '" is not defined.');
@@ -14873,8 +14206,6 @@ yy.DetachDatabase.prototype.execute = function (databaseid, params, cb) {
 	}
 	if (cb) cb(res);
 	return res;
-	//	var res = alasql.engines[this.engineid].attachDatabase(this.databaseid, this.as, cb);
-	//	return res;
 };
 
 // USE DATABSE databaseid
@@ -14912,22 +14243,22 @@ yy.DropDatabase.prototype.execute = function (databaseid, params, cb) {
 	if (this.engineid) {
 		return alasql.engines[this.engineid].dropDatabase(this.databaseid, this.ifexists, cb);
 	}
-	var res;
+	let res;
 
-	var dbid = this.databaseid;
+	const dbid = this.databaseid;
 
 	if (dbid === alasql.DEFAULTDATABASEID) {
 		throw new Error('Drop of default database is prohibited');
 	}
 	if (!alasql.databases[dbid]) {
 		if (!this.ifexists) {
-			throw new Error("Database '" + dbid + "' does not exist");
+			throw new Error(`Database '${dbid}' does not exist`);
 		} else {
 			res = 0;
 		}
 	} else {
 		if (alasql.databases[dbid].engineid) {
-			throw new Error("Cannot drop database '" + dbid + "', because it is attached. Detach it.");
+			throw new Error(`Cannot drop database '${dbid}', because it is attached. Detach it.`);
 		}
 
 		delete alasql.databases[dbid];
@@ -14951,24 +14282,22 @@ yy.Declare = function (params) {
 	return Object.assign(this, params);
 };
 yy.Declare.prototype.toString = function () {
-	var s = 'DECLARE ';
+	let s = 'DECLARE ';
 	if (this.declares && this.declares.length > 0) {
-		s = this.declares
-			.map(function (declare) {
-				var s = '';
-				s += '@' + declare.variable + ' ';
-				s += declare.dbtypeid;
-				if (this.dbsize) {
-					s += '(' + this.dbsize;
-					if (this.dbprecision) {
-						s += ',' + this.dbprecision;
+		s += this.declares
+			.map(declare => {
+				let declareStr = `@${declare.variable} ${declare.dbtypeid}`;
+				if (declare.dbsize) {
+					declareStr += `(${declare.dbsize}`;
+					if (declare.dbprecision) {
+						declareStr += `,${declare.dbprecision}`;
 					}
-					s += ')';
+					declareStr += ')';
 				}
 				if (declare.expression) {
-					s += ' = ' + declare.expression.toString();
+					declareStr += ` = ${declare.expression.toString()}`;
 				}
-				return s;
+				return declareStr;
 			})
 			.join(',');
 	}
@@ -15177,76 +14506,67 @@ yy.SetVariable.prototype.toString = function () {
 };
 
 yy.SetVariable.prototype.execute = function (databaseid, params, cb) {
-
-	if (typeof this.value != 'undefined') {
-		var val = this.value;
-		if (val == 'ON') val = true;
-		else if (val == 'OFF') val = false;
-		//		if(this.method == '@') {
+	if (typeof this.value !== 'undefined') {
+		let val = this.value;
+		if (val === 'ON') val = true;
+		else if (val === 'OFF') val = false;
 		alasql.options[this.variable] = val;
-		//		} else {
-		//			params[this.variable] = val;
-		//		}
 	} else if (this.expression) {
 		if (this.exists) {
-			this.existsfn = this.exists.map(function (ex) {
-				var nq = ex.compile(databaseid);
+			this.existsfn = this.exists.map(ex => {
+				let nq = ex.compile(databaseid);
 				if (nq.query && !nq.query.modifier) nq.query.modifier = 'RECORDSET';
 				return nq;
-				//				return ex.compile(databaseid);
-				// TODO Include modifier
 			});
 		}
 		if (this.queries) {
-			this.queriesfn = this.queries.map(function (q) {
-				var nq = q.compile(databaseid);
+			this.queriesfn = this.queries.map(q => {
+				let nq = q.compile(databaseid);
 				if (nq.query && !nq.query.modifier) nq.query.modifier = 'RECORDSET';
 				return nq;
-				// TODO Include modifier
 			});
 		}
 
-		var res = new Function(
-			'params,alasql',
+		let res = new Function(
+			'params, alasql',
 			'return ' + this.expression.toJS('({})', '', null)
 		).bind(this)(params, alasql);
+
 		if (alasql.declares[this.variable]) {
 			res = alasql.stdfn.CONVERT(res, alasql.declares[this.variable]);
 		}
+
 		if (this.props && this.props.length > 0) {
-			if (this.method == '@') {
-				var fs = "alasql.vars['" + this.variable + "']";
+			let fs;
+			if (this.method === '@') {
+				fs = `alasql.vars['${this.variable}']`;
 			} else {
-				var fs = "params['" + this.variable + "']";
-			}
-			fs += this.props
-				.map(function (prop) {
-					if (typeof prop == 'string') {
-						return "['" + prop + "']";
-					} else if (typeof prop == 'number') {
-						return '[' + prop + ']';
-					} else {
-
-						return '[' + prop.toJS() + ']';
-						//				} else {
-
-						//					throw new Error('Wrong SET property');
-					}
-				})
-				.join();
+				fs = `params['${this.variable}']`;
+			}
+			this.props.forEach(prop => {
+				if (typeof prop === 'string') {
+					fs += `['${prop}']`;
+				} else if (typeof prop === 'number') {
+					fs += `[${prop}]`;
+				} else {
+					// Assuming prop.toJS() is a method that converts prop to a JavaScript expression.
+					fs += `[${prop.toJS()}]`;
+				}
+			});
 
-			new Function('value,params,alasql', 'var y;' + fs + '=value')(res, params, alasql);
+			new Function('value, params, alasql', `${fs} = value`)(res, params, alasql);
 		} else {
-			if (this.method == '@') {
+			if (this.method === '@') {
 				alasql.vars[this.variable] = res;
 			} else {
 				params[this.variable] = res;
 			}
 		}
 	}
-	var res = 1;
-	if (cb) res = cb(res);
-	return res;
+
+	let result = 1;
+	if (cb) result = cb(result);
+	return result;
 };
 alasql.test = function (name, times, fn) {
 	if (arguments.length === 0) {
@@ -15568,7 +14888,7 @@ yy.BeginTransaction.prototype.execute = function (databaseid, params, cb) {
 	} else {
 		// alasql commit!!!
 	}
-	if (cb) cb(res);
+	if (cb) res = cb(res);
 	return res;
 };
 
@@ -15586,7 +14906,7 @@ yy.CommitTransaction.prototype.execute = function (databaseid, params, cb) {
 	} else {
 		// alasql commit!!!
 	}
-	if (cb) cb(res);
+	if (cb) res = cb(res);
 	return res;
 };
 
@@ -15604,7 +14924,7 @@ yy.RollbackTransaction.prototype.execute = function (databaseid, params, cb) {
 	} else {
 		// alasql commit!!!
 	}
-	if (cb) cb(res);
+	if (cb) res = cb(res);
 	return res;
 };
 if (alasql.options.tsql) {
@@ -16820,9 +16140,8 @@ alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 
 alasql.from.METEOR = function (filename, opts, cb, idx, query) {
 	var res = filename.find(opts).fetch();
-	if (cb) {
-		res = cb(res, idx, query);
-	}
+	if (cb) res = cb(res, idx, query);
+
 	return res;
 };
 
@@ -16836,9 +16155,7 @@ alasql.from.TABLETOP = function (key, opts, cb, idx, query) {
 	alasql.utils.extend(opt, opts);
 	opt.callback = function (data) {
 		res = data;
-		if (cb) {
-			res = cb(res, idx, query);
-		}
+		if (cb) res = cb(res, idx, query);
 	};
 
 	Tabletop.init(opt);
@@ -16917,11 +16234,8 @@ alasql.from.FILE = function (filename, opts, cb, idx, query) {
 	}
 
 	var parts = fname.split('.');
-
 	var ext = parts[parts.length - 1].toUpperCase();
-
 	if (alasql.from[ext]) {
-
 		return alasql.from[ext](filename, opts, cb, idx, query);
 	} else {
 		throw new Error('Cannot recognize file type for loading');
@@ -17547,14 +16861,11 @@ yy.Source.prototype.toString = function () {
 
 // SOURCE FILE
 yy.Source.prototype.execute = function (databaseid, params, cb) {
-
 	var res;
 	loadFile(
 		this.url,
 		!!cb,
 		function (data) {
-
-			//		res = 1;
 			res = alasql(data);
 			if (cb) res = cb(res);
 			return res;
@@ -17604,15 +16915,12 @@ yy.Require.prototype.execute = function (databaseid, params, cb) {
 	var self = this;
 	var res = 0;
 	var ss = '';
-
 	if (this.paths && this.paths.length > 0) {
 		this.paths.forEach(function (path) {
 			loadFile(path.value, !!cb, function (data) {
 				res++;
-
 				ss += data;
 				if (res < self.paths.length) return;
-
 				new Function('params,alasql', ss)(params, alasql);
 				if (cb) res = cb(res);
 			});
@@ -17626,7 +16934,6 @@ yy.Require.prototype.execute = function (databaseid, params, cb) {
 					res++;
 					ss += data;
 					if (res < self.plugins.length) return;
-
 					new Function('params,alasql', ss)(params, alasql);
 					alasql.plugins[plugin] = true; // Plugin is loaded
 					if (cb) res = cb(res);
@@ -17657,11 +16964,7 @@ yy.Source.prototype.toString = function () {
 
 // SOURCE FILE
 yy.Assert.prototype.execute = function (databaseid) {
-
 	if (!deepEqual(alasql.res, this.value)) {
-		//		if(this.message) {
-		//			throw this.
-		//		} else {
 		throw new Error(
 			(this.message || 'Assert wrong') +
 				': ' +
@@ -17669,7 +16972,6 @@ yy.Assert.prototype.execute = function (databaseid) {
 				' == ' +
 				JSON.stringify(this.value)
 		);
-		//		}
 	}
 	return 1;
 };
@@ -18211,7 +17513,6 @@ LS.attachDatabase = function (lsdbid, databaseid, args, params, cb) {
 		if (db.tables) {
 			for (var tbid in db.tables) {
 				LS.restoreTable(databaseid, tbid);
-				//				db.tables[tbid].data = LS.get(db.lsdbid+'.'+tbid);
 			}
 		}
 	}
@@ -18387,9 +17688,7 @@ LS.intoTable = function (databaseid, tableid, value, columns, cb) {
 	}
 	if (!tb.data) tb.data = [];
 	tb.data = tb.data.concat(value);
-	//	LS.set(lsdbid+'.'+tableid, tb);
 	LS.storeTable(databaseid, tableid);
-
 	if (cb) res = cb(res);
 
 	return res;
@@ -18529,7 +17828,6 @@ SQLITE.attachDatabase = function (sqldbid, dbid, args, params, cb) {
 					db.tables[tbl[1]] = {};
 					var columns = (db.tables[tbl[1]].columns = []);
 					var ast = alasql.parse(tbl[4]);
-
 					var coldefs = ast.statements[0].columns;
 					if (coldefs && coldefs.length > 0) {
 						coldefs.forEach(function (cd) {
@@ -18606,12 +17904,9 @@ SQLITE.intoTable = function (databaseid, tableid, value, columns, cb) {
 var FS = (alasql.engines.FILESTORAGE = alasql.engines.FILE = function () {});
 
 FS.createDatabase = function (fsdbid, args, ifnotexists, dbid, cb) {
-
 	var res = 1;
 	var filename = args[0].value;
-
 	alasql.utils.fileExists(filename, function (fex) {
-
 		if (fex) {
 			if (ifnotexists) {
 				res = 0;
@@ -18672,14 +17967,12 @@ FS.dropDatabase = function (fsdbid, ifexists, cb) {
 };
 
 FS.attachDatabase = function (fsdbid, dbid, args, params, cb) {
-
 	var res = 1;
 	if (alasql.databases[dbid]) {
 		throw new Error('Unable to attach database as "' + dbid + '" because it already exists');
 	}
 	var db = new alasql.Database(dbid || fsdbid);
 	db.engineid = 'FILESTORAGE';
-	//	db.fsdbid = fsdbid;
 	db.filename = args[0].value;
 	loadFile(db.filename, !!cb, function (s) {
 		try {
@@ -18720,7 +18013,6 @@ FS.createTable = function (databaseid, tableid, ifnotexists, cb) {
 };
 
 FS.updateFile = function (databaseid) {
-
 	var db = alasql.databases[databaseid];
 	if (db.issaving) {
 		db.postsave = true;
@@ -18756,7 +18048,6 @@ FS.dropTable = function (databaseid, tableid, ifexists, cb) {
 };
 
 FS.fromTable = function (databaseid, tableid, cb, idx, query) {
-
 	var db = alasql.databases[databaseid];
 	var res = db.data[tableid];
 	if (cb) res = cb(res, idx, query);
@@ -18787,7 +18078,6 @@ FS.saveTableData = function (databaseid, tableid) {
 };
 
 FS.commit = function (databaseid, cb) {
-
 	var db = alasql.databases[databaseid];
 	var fsdb = {tables: {}};
 	if (db.tables) {
@@ -18806,9 +18096,6 @@ FS.rollback = function (databaseid, cb) {
 	var res = 1;
 	var db = alasql.databases[databaseid];
 	db.dbversion++;
-
-	//	var lsdbid = alasql.databases[databaseid].lsdbid;
-	//	lsdb = LS.get(lsdbid);
 	wait();
 	function wait() {
 		setTimeout(function () {
@@ -18826,9 +18113,6 @@ FS.rollback = function (databaseid, cb) {
 							db.tables[tbid].data = db.data[tbid];
 						}
 						db.tables[tbid].indexColumns();
-
-						// index columns
-						// convert types
 					}
 
 					delete alasql.databases[databaseid];
@@ -18843,9 +18127,6 @@ FS.rollback = function (databaseid, cb) {
 			}
 		}, 100);
 	}
-
-	//	 if(!alasql.options.autocommit) {
-
 };
 if(utils.isBrowser && !utils.isWebWorker) {
 alasql = alasql || false;