alasql 2.5.1 → 2.5.3

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.5.0 build: develop-dcdd4683 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.5.2 build: develop-0e8a5557 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 2.5.0
+@version 2.5.2
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff
@@ -142,8 +142,8 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '2.5.0';
-alasql.build = 'develop-dcdd4683';
+alasql.version = '2.5.2';
+alasql.build = 'develop-0e8a5557';
 
 /**
 	Debug flag
@@ -5153,15 +5153,19 @@ Table.prototype.indexColumns = function () {
 */
 
 // Table class
-var View = (alasql.View = function (params) {
-	// Columns
-	this.columns = [];
-	this.xcolumns = {};
-	// Data array
-	this.query = [];
+class View {
+	constructor(params) {
+		// Columns
+		this.columns = [];
+		this.xcolumns = {};
+		// Data array
+		this.query = [];
 
-	Object.assign(this, params);
-});
+		Object.assign(this, params);
+	}
+}
+
+alasql.View = View;
 
 /*
 //
@@ -5176,25 +5180,32 @@ var View = (alasql.View = function (params) {
 /**
  @class Query Main query class
  */
-var Query = (alasql.Query = function (params) {
-	this.alasql = alasql;
+class Query {
+	constructor(params) {
+		this.alasql = alasql;
 
-	// Columns
-	this.columns = [];
-	this.xcolumns = {};
-	this.selectGroup = [];
-	this.groupColumns = {};
-	// Data array
-	extend(this, params);
-});
+		// Columns
+		this.columns = [];
+		this.xcolumns = {};
+		this.selectGroup = [];
+		this.groupColumns = {};
+		// Data array
+		Object.assign(this, params);
+	}
+}
 
 /**
  @class Recordset data object
  */
-var Recordset = (alasql.Recordset = function (params) {
-	// Data array
-	extend(this, params);
-});
+class Recordset {
+	constructor(params) {
+		// Data array
+		Object.assign(this, params);
+	}
+}
+
+alasql.Recordset = Recordset;
+alasql.Query = Query;
 
 /*
 //
@@ -7240,388 +7251,420 @@ function swapSources(query, h) {
 
 /* global yy */
 
-yy.Select = function (params) {
-	return Object.assign(this, params);
-};
-yy.Select.prototype.toString = function () {
-	var s;
-	s = '';
-	if (this.explain) {
-		s += 'EXPLAIN ';
-	}
-	s += 'SELECT ';
-	if (this.modifier) {
-		s += this.modifier + ' ';
-	}
-	if (this.distinct) {
-		s += 'DISTINCT ';
+yy.Select = class Select {
+	constructor(params) {
+		Object.assign(this, params);
 	}
-	if (this.top) {
-		s += 'TOP ' + this.top.value + ' ';
-		if (this.percent) {
-			s += 'PERCENT ';
+
+	toString() {
+		var s;
+		s = '';
+		if (this.explain) {
+			s += 'EXPLAIN ';
 		}
-	}
-	s += this.columns
-		.map(function (col) {
-			var s;
-			s = col.toString();
-			if (typeof col.as !== 'undefined') {
-				s += ' AS ' + col.as;
+		s += 'SELECT ';
+		if (this.modifier) {
+			s += this.modifier + ' ';
+		}
+		if (this.distinct) {
+			s += 'DISTINCT ';
+		}
+		if (this.top) {
+			s += 'TOP ' + this.top.value + ' ';
+			if (this.percent) {
+				s += 'PERCENT ';
 			}
-			return s;
-		})
-		.join(', ');
-	if (this.from) {
-		s +=
-			' FROM ' +
-			this.from
-				.map(function (f) {
+		}
+		s += this.columns
+			.map(function (col) {
+				var s;
+				s = col.toString();
+				if (typeof col.as !== 'undefined') {
+					s += ' AS ' + col.as;
+				}
+				return s;
+			})
+			.join(', ');
+		if (this.from) {
+			s +=
+				' FROM ' +
+				this.from
+					.map(function (f) {
+						var ss;
+						ss = f.toString();
+						if (f.as) {
+							ss += ' AS ' + f.as;
+						}
+						return ss;
+					})
+					.join(',');
+		}
+		if (this.joins) {
+			s += this.joins
+				.map(function (jn) {
 					var ss;
-					ss = f.toString();
-					if (f.as) {
-						ss += ' AS ' + f.as;
+					ss = ' ';
+					if (jn.joinmode) {
+						ss += jn.joinmode + ' ';
+					}
+					if (jn.table) {
+						ss += 'JOIN ' + jn.table.toString();
+					} else if (jn.select) {
+						ss += 'JOIN (' + jn.select.toString() + ')';
+					} else if (jn instanceof alasql.yy.Apply) {
+						ss += jn.toString();
+					} else {
+						throw new Error('Wrong type in JOIN mode');
+					}
+					if (jn.as) {
+						ss += ' AS ' + jn.as;
+					}
+					if (jn.using) {
+						ss += ' USING ' + jn.using.toString();
+					}
+					if (jn.on) {
+						ss += ' ON ' + jn.on.toString();
 					}
 					return ss;
 				})
-				.join(',');
-	}
-	if (this.joins) {
-		s += this.joins
-			.map(function (jn) {
-				var ss;
-				ss = ' ';
-				if (jn.joinmode) {
-					ss += jn.joinmode + ' ';
-				}
-				if (jn.table) {
-					ss += 'JOIN ' + jn.table.toString();
-				} else if (jn.select) {
-					ss += 'JOIN (' + jn.select.toString() + ')';
-				} else if (jn instanceof alasql.yy.Apply) {
-					ss += jn.toString();
-				} else {
-					throw new Error('Wrong type in JOIN mode');
-				}
-				if (jn.as) {
-					ss += ' AS ' + jn.as;
-				}
-				if (jn.using) {
-					ss += ' USING ' + jn.using.toString();
-				}
-				if (jn.on) {
-					ss += ' ON ' + jn.on.toString();
-				}
-				return ss;
-			})
-			.join('');
-	}
-	if (this.where) {
-		s += ' WHERE ' + this.where.toString();
-	}
-	if (this.group && this.group.length > 0) {
-		s +=
-			' GROUP BY ' +
-			this.group
-				.map(function (grp) {
-					return grp.toString();
-				})
-				.join(', ');
-	}
-	if (this.having) {
-		s += ' HAVING ' + this.having.toString();
-	}
-	if (this.order && this.order.length > 0) {
-		s +=
-			' ORDER BY ' +
-			this.order
-				.map(function (ord) {
-					return ord.toString();
-				})
-				.join(', ');
-	}
-	if (this.limit) {
-		s += ' LIMIT ' + this.limit.value;
-	}
-	if (this.offset) {
-		s += ' OFFSET ' + this.offset.value;
-	}
-	if (this.union) {
-		s += ' UNION ' + (this.corresponding ? 'CORRESPONDING ' : '') + this.union.toString();
-	}
-	if (this.unionall) {
-		s += ' UNION ALL ' + (this.corresponding ? 'CORRESPONDING ' : '') + this.unionall.toString();
-	}
-	if (this.except) {
-		s += ' EXCEPT ' + (this.corresponding ? 'CORRESPONDING ' : '') + this.except.toString();
-	}
-	if (this.intersect) {
-		s += ' INTERSECT ' + (this.corresponding ? 'CORRESPONDING ' : '') + this.intersect.toString();
+				.join('');
+		}
+		if (this.where) {
+			s += ' WHERE ' + this.where.toString();
+		}
+		if (this.group && this.group.length > 0) {
+			s +=
+				' GROUP BY ' +
+				this.group
+					.map(function (grp) {
+						return grp.toString();
+					})
+					.join(', ');
+		}
+		if (this.having) {
+			s += ' HAVING ' + this.having.toString();
+		}
+		if (this.order && this.order.length > 0) {
+			s +=
+				' ORDER BY ' +
+				this.order
+					.map(function (ord) {
+						return ord.toString();
+					})
+					.join(', ');
+		}
+		if (this.limit) {
+			s += ' LIMIT ' + this.limit.value;
+		}
+		if (this.offset) {
+			s += ' OFFSET ' + this.offset.value;
+		}
+		if (this.union) {
+			s += ' UNION ' + (this.corresponding ? 'CORRESPONDING ' : '') + this.union.toString();
+		}
+		if (this.unionall) {
+			s += ' UNION ALL ' + (this.corresponding ? 'CORRESPONDING ' : '') + this.unionall.toString();
+		}
+		if (this.except) {
+			s += ' EXCEPT ' + (this.corresponding ? 'CORRESPONDING ' : '') + this.except.toString();
+		}
+		if (this.intersect) {
+			s += ' INTERSECT ' + (this.corresponding ? 'CORRESPONDING ' : '') + this.intersect.toString();
+		}
+		return s;
 	}
-	return s;
-};
-
-/**
- Select statement in expression
- */
-yy.Select.prototype.toJS = function (context) {
-
-	//	if(this.expression.reduced) return 'true';
-	//	return this.expression.toJS(context, tableid, defcols);
 
-	//	var s = 'this.queriesdata['+(this.queriesidx-1)+'][0]';
+	/**
+	 Select statement in expression
+	 */
+	toJS(context) {
 
-	var s =
-		'alasql.utils.flatArray(this.queriesfn[' +
-		(this.queriesidx - 1) +
-		'](this.params,null,' +
-		context +
-		'))[0]';
+		//	if(this.expression.reduced) return 'true';
+		//	return this.expression.toJS(context, tableid, defcols);
 
-	return s;
-};
+		//	var s = 'this.queriesdata['+(this.queriesidx-1)+'][0]';
+		var s =
+			'alasql.utils.flatArray(this.queriesfn[' +
+			(this.queriesidx - 1) +
+			'](this.params,null,' +
+			context +
+			'))[0]';
 
-// Compile SELECT statement
-yy.Select.prototype.compile = function (databaseid, params) {
-	var db = alasql.databases[databaseid];
-	// Create variable for query
-	var query = new Query();
+		return s;
+	}
 
-	// Array with columns to be removed
-	query.removeKeys = [];
-	query.aggrKeys = [];
+	// Compile SELECT statement
+	compile(databaseid, params) {
+		var db = alasql.databases[databaseid];
+		// Create variable for query
+		var query = new Query();
 
-	query.explain = this.explain; // Explain
-	query.explaination = [];
-	query.explid = 1;
+		// Array with columns to be removed
+		query.removeKeys = [];
+		query.aggrKeys = [];
 
-	query.modifier = this.modifier;
+		query.explain = this.explain; // Explain
+		query.explaination = [];
+		query.explid = 1;
 
-	query.database = db;
-	// 0. Precompile whereexists
-	this.compileWhereExists(query);
+		query.modifier = this.modifier;
 
-	// 0. Precompile queries for IN, NOT IN, ANY and ALL operators
-	this.compileQueries(query);
+		query.database = db;
+		// 0. Precompile whereexists
+		this.compileWhereExists(query);
 
-	query.defcols = this.compileDefCols(query, databaseid);
+		// 0. Precompile queries for IN, NOT IN, ANY and ALL operators
+		this.compileQueries(query);
 
-	// 1. Compile FROM clause
-	query.fromfn = this.compileFrom(query);
+		query.defcols = this.compileDefCols(query, databaseid);
 
-	// 2. Compile JOIN clauses
-	if (this.joins) {
-		this.compileJoins(query);
-	}
+		// 1. Compile FROM clause
+		query.fromfn = this.compileFrom(query);
 
-	// todo?: 3. Compile SELECT clause
+		// 2. Compile JOIN clauses
+		if (this.joins) {
+			this.compileJoins(query);
+		}
 
-	// For ROWNUM()
-	query.rownums = [];
+		// todo?: 3. Compile SELECT clause
+		// For ROWNUM()
+		query.rownums = [];
 
-	this.compileSelectGroup0(query);
+		this.compileSelectGroup0(query);
 
-	if (this.group || query.selectGroup.length > 0) {
-		query.selectgfns = this.compileSelectGroup1(query);
-	} else {
-		query.selectfns = this.compileSelect1(query, params);
-	}
+		if (this.group || query.selectGroup.length > 0) {
+			query.selectgfns = this.compileSelectGroup1(query);
+		} else {
+			query.selectfns = this.compileSelect1(query, params);
+		}
 
-	// Remove columns clause
-	this.compileRemoveColumns(query);
+		// Remove columns clause
+		this.compileRemoveColumns(query);
 
-	// 5. Optimize WHERE and JOINS
-	if (this.where) {
-		this.compileWhereJoins(query);
-	}
+		// 5. Optimize WHERE and JOINS
+		if (this.where) {
+			this.compileWhereJoins(query);
+		}
 
-	// 4. Compile WHERE clause
-	query.wherefn = this.compileWhere(query);
+		// 4. Compile WHERE clause
+		query.wherefn = this.compileWhere(query);
 
-	// 6. Compile GROUP BY
-	if (this.group || query.selectGroup.length > 0) {
-		query.groupfn = this.compileGroup(query);
-	}
+		// 6. Compile GROUP BY
+		if (this.group || query.selectGroup.length > 0) {
+			query.groupfn = this.compileGroup(query);
+		}
 
-	// 6. Compile HAVING
-	if (this.having) {
-		query.havingfn = this.compileHaving(query);
-	}
+		// 6. Compile HAVING
+		if (this.having) {
+			query.havingfn = this.compileHaving(query);
+		}
 
-	// 8. Compile ORDER BY clause
-	if (this.order) {
-		query.orderfn = this.compileOrder(query, params);
-	}
+		// 8. Compile ORDER BY clause
+		if (this.order) {
+			query.orderfn = this.compileOrder(query, params);
+		}
 
-	if (this.group || query.selectGroup.length > 0) {
-		query.selectgfn = this.compileSelectGroup2(query);
-	} else {
-		query.selectfn = this.compileSelect2(query, params);
-	}
+		if (this.group || query.selectGroup.length > 0) {
+			query.selectgfn = this.compileSelectGroup2(query);
+		} else {
+			query.selectfn = this.compileSelect2(query, params);
+		}
 
-	// 7. Compile DISTINCT, LIMIT and OFFSET
-	query.distinct = this.distinct;
+		// 7. Compile DISTINCT, LIMIT and OFFSET
+		query.distinct = this.distinct;
 
-	// 9. Compile PIVOT clause
-	if (this.pivot) query.pivotfn = this.compilePivot(query);
-	if (this.unpivot) query.pivotfn = this.compileUnpivot(query);
+		// 9. Compile PIVOT clause
+		if (this.pivot) query.pivotfn = this.compilePivot(query);
+		if (this.unpivot) query.pivotfn = this.compileUnpivot(query);
 
-	// 10. Compile TOP/LIMIT/OFFSET/FETCH clause
-	if (this.top) {
-		query.limit = this.top.value;
-	} else if (this.limit) {
-		query.limit = this.limit.value;
-		if (this.offset) {
-			query.offset = this.offset.value;
+		// 10. Compile TOP/LIMIT/OFFSET/FETCH clause
+		if (this.top) {
+			query.limit = this.top.value;
+		} else if (this.limit) {
+			query.limit = this.limit.value;
+			if (this.offset) {
+				query.offset = this.offset.value;
+			}
 		}
-	}
 
-	query.percent = this.percent;
+		query.percent = this.percent;
 
-	// 9. Compile ordering function for UNION and UNIONALL
-	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;
-		}
-	} 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;
-		}
-	} 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;
-		}
-	} 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;
+		// 9. Compile ordering function for UNION and UNIONALL
+		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;
+			}
+		} 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;
+			}
+		} 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;
+			}
+		} 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;
+			}
 		}
-	}
 
-	// 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
-			) {
-				// For external database when AUTOCOMMIT is ONs
+		// 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
+				) {
+					// For external database when AUTOCOMMIT is ONs
+					query.intoallfns =
+						'return alasql.engines["' +
+						alasql.databases[this.into.databaseid || databaseid].engineid +
+						'"]' +
+						'.intoTable("' +
+						(this.into.databaseid || databaseid) +
+						'","' +
+						this.into.tableid +
+						'",this.data, columns, cb);';
+				} else {
+					// Into AlaSQL tables
+					query.intofns =
+						"alasql.databases['" +
+						(this.into.databaseid || databaseid) +
+						"'].tables" +
+						"['" +
+						this.into.tableid +
+						"'].data.push(r);";
+				}
+			} else if (this.into instanceof yy.VarValue) {
+				//
+				// Save into local variable
+				// SELECT * INTO @VAR1 FROM ?
+				//
 				query.intoallfns =
-					'return alasql.engines["' +
-					alasql.databases[this.into.databaseid || databaseid].engineid +
-					'"]' +
-					'.intoTable("' +
-					(this.into.databaseid || databaseid) +
-					'","' +
-					this.into.tableid +
-					'",this.data, columns, cb);';
-			} else {
-				// Into AlaSQL tables
-				query.intofns =
-					"alasql.databases['" +
-					(this.into.databaseid || databaseid) +
-					"'].tables" +
-					"['" +
-					this.into.tableid +
-					"'].data.push(r);";
-			}
-		} else if (this.into instanceof yy.VarValue) {
-			//
-			// Save into local variable
-			// SELECT * INTO @VAR1 FROM ?
-			//
-			query.intoallfns =
-				'alasql.vars["' +
-				this.into.variable +
-				'"]=this.data;res=this.data.length;if(cb)res=cb(res);return res;';
-		} else if (this.into instanceof yy.FuncValue) {
-			//
-			// If this is INTO() function, then call it
-			// with one or two parameters
-			//
-			var qs = 'return alasql.into[' + JSON.stringify(this.into.funcid.toUpperCase()) + '](';
-			if (this.into.args && this.into.args.length > 0) {
-				qs += this.into.args[0].toJS() + ',';
-				if (this.into.args.length > 1) {
-					qs += this.into.args[1].toJS() + ',';
+					'alasql.vars["' +
+					this.into.variable +
+					'"]=this.data;res=this.data.length;if(cb)res=cb(res);return res;';
+			} else if (this.into instanceof yy.FuncValue) {
+				//
+				// If this is INTO() function, then call it
+				// with one or two parameters
+				//
+				var qs = 'return alasql.into[' + JSON.stringify(this.into.funcid.toUpperCase()) + '](';
+				if (this.into.args && this.into.args.length > 0) {
+					qs += this.into.args[0].toJS() + ',';
+					if (this.into.args.length > 1) {
+						qs += this.into.args[1].toJS() + ',';
+					} else {
+						qs += 'undefined,';
+					}
 				} else {
-					qs += 'undefined,';
+					qs += 'undefined, undefined,';
 				}
-			} else {
-				qs += 'undefined, undefined,';
-			}
-			query.intoallfns = qs + 'this.data,columns,cb)';
+				query.intoallfns = qs + 'this.data,columns,cb)';
 
-		} else if (this.into instanceof yy.ParamValue) {
-			//
-			// Save data into parameters array
-			// like alasql('SELECT * INTO ? FROM ?',[outdata,srcdata]);
-			//
-			query.intofns = "params['" + this.into.param + "'].push(r)";
-		}
+			} else if (this.into instanceof yy.ParamValue) {
+				//
+				// Save data into parameters array
+				// like alasql('SELECT * INTO ? FROM ?',[outdata,srcdata]);
+				//
+				query.intofns = "params['" + this.into.param + "'].push(r)";
+			}
 
-		if (query.intofns) {
-			// Create intofn function
+			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.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);
+				query.intoallfn = new Function('columns,cb,params,alasql', 'var y;' + query.intoallfns);
+			}
 		}
-	}
 
-	// Now, compile all togeather into one function with query object in scope
-	var statement = function (params, cb, oldscope) {
-		query.params = params;
-		// Note the callback function has the data and error reversed due to existing code in promiseExec which has the
-		// err and data swapped.  This trickles down into alasql.exec and further. Rather than risk breaking the whole thing,
-		// the (data, err) standard is maintained here.
-		var res1 = queryfn(query, oldscope, function (res, err) {
-			if (err) {
-				return cb(err, null);
-			}
-			if (query.rownums.length > 0) {
-				for (var i = 0, ilen = res.length; i < ilen; i++) {
-					for (var j = 0, jlen = query.rownums.length; j < jlen; j++) {
-						res[i][query.rownums[j]] = i + 1;
+		// Now, compile all togeather into one function with query object in scope
+		var statement = function (params, cb, oldscope) {
+			query.params = params;
+			// Note the callback function has the data and error reversed due to existing code in promiseExec which has the
+			// err and data swapped.  This trickles down into alasql.exec and further. Rather than risk breaking the whole thing,
+			// the (data, err) standard is maintained here.
+			var res1 = queryfn(query, oldscope, function (res, err) {
+				if (err) {
+					return cb(err, null);
+				}
+				if (query.rownums.length > 0) {
+					for (var i = 0, ilen = res.length; i < ilen; i++) {
+						for (var j = 0, jlen = query.rownums.length; j < jlen; j++) {
+							res[i][query.rownums[j]] = i + 1;
+						}
 					}
 				}
-			}
 
-			var res2 = modify(query, res);
+				var res2 = modify(query, res);
 
-			if (cb) {
-				cb(res2);
-			}
+				if (cb) {
+					cb(res2);
+				}
 
-			return res2;
-		});
+				return res2;
+			});
 
-		//		if(typeof res1 != 'undefined') res1 =  modify(query,res1);
+			//		if(typeof res1 != 'undefined') res1 =  modify(query,res1);
+			return res1;
+		};
 
-		return res1;
-	};
+		//	statement.dbversion = ;
 
-	//	statement.dbversion = ;
+		statement.query = query;
+		return statement;
+	}
 
-	statement.query = query;
-	return statement;
+	execute(databaseid, params, cb) {
+		return this.compile(databaseid)(params, cb);
+		//	throw new Error('Insert statement is should be compiled')
+	}
+
+	compileWhereExists(query) {
+		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;
+		});
+	}
+
+	compileQueries(query) {
+		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');
+	// }
 };
 
 /**
@@ -7751,11 +7794,6 @@ function modify(query, res) {
 	return res;
 }
 
-yy.Select.prototype.execute = function (databaseid, params, cb) {
-	return this.compile(databaseid)(params, cb);
-	//	throw new Error('Insert statement is should be compiled')
-};
-
 /*
 //
 // EXISTS and other subqueries functions  functions for Alasql.js
@@ -7764,43 +7802,23 @@ yy.Select.prototype.execute = function (databaseid, params, cb) {
 //
 */
 
-yy.ExistsValue = function (params) {
-	return Object.assign(this, params);
-};
-yy.ExistsValue.prototype.toString = function () {
-	return 'EXISTS(' + this.value.toString() + ')';
-};
-
-yy.ExistsValue.prototype.toType = function () {
-	return 'boolean';
-};
-
-yy.ExistsValue.prototype.toJS = function (context, tableid, defcols) {
-
-	return 'this.existsfn[' + this.existsidx + '](params,null,' + context + ').data.length';
-};
+yy.ExistsValue = class ExistsValue {
+	constructor(params) {
+		Object.assign(this, params);
+	}
 
-yy.Select.prototype.compileWhereExists = function (query) {
-	if (!this.exists) return;
-	query.existsfn = this.exists.map(function (ex) {
-		var nq = ex.compile(query.database.databaseid);
+	toString() {
+		return 'EXISTS(' + this.value.toString() + ')';
+	}
 
-		//		 if(!nq.query.modifier) nq.query.modifier = 'RECORDSET';
-		nq.query.modifier = 'RECORDSET';
-		return nq;
-	});
-};
+	toType() {
+		return 'boolean';
+	}
 
-yy.Select.prototype.compileQueries = function (query) {
-	if (!this.queries) return;
-	query.queriesfn = this.queries.map(function (q) {
-		var nq = q.compile(query.database.databaseid);
+	toJS(context, tableid, defcols) {
 
-		//	if(!nq.query) nq.query = {};
-		nq.query.modifier = 'RECORDSET';
-		//		 if(!nq.query.modifier) nq.query.modifier = 'RECORDSET';
-		return nq;
-	});
+		return 'this.existsfn[' + this.existsidx + '](params,null,' + context + ').data.length';
+	}
 };
 
 //
@@ -8843,25 +8861,27 @@ yy.Select.prototype.compileGroup = function (query) {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
 							return (
-								pre + 
+								pre +
 								`if(typeof g['${colas}'] == 'string' && !isNaN(g['${colas}']) && typeof Number(g['${colas}']) == 'number' && 
 						typeof ${colexp1} == 'string' && !isNaN(${colexp1}) && typeof Number(${colexp1}) == 'number'){g['${colas}'] = Number(g['${colas}']) + Number(${colexp1})}
 						else if(typeof g['${colas}'] == 'string' && typeof ${colexp1} == 'string'){g['${colas}'] = 0}
 						else if(typeof g['${colas}'] == 'string' && typeof ${colexp1} == 'number'){g['${colas}'] = ${colexp1}}
 						else if(typeof ${colexp1} == 'string' && typeof g['${colas}'] == 'number'){g['${colas}'] = g['${colas}']}
-						else{g['${colas}'] += ${colexp1}||0}`  
-								+ post
+						else{g['${colas}'] += ${colexp1}||0}` +
+								post
 							);
 						}
-						return pre + 
-						`if(typeof g['${colas}'] == 'string' && !isNaN(g['${colas}']) && typeof Number(g['${colas}']) == 'number' && 
+						return (
+							pre +
+							`if(typeof g['${colas}'] == 'string' && !isNaN(g['${colas}']) && typeof Number(g['${colas}']) == 'number' && 
 						typeof ${colexp} == 'string' && !isNaN(${colexp}) && typeof Number(${colexp}) == 'number'){g['${colas}'] = Number(g['${colas}']) + Number(${colexp})}
 						else if(typeof g['${colas}'] == 'string' && typeof ${colexp} == 'string'){g['${colas}'] = 0}
 						else if(typeof g['${colas}'] == 'string' && typeof ${colexp} == 'number'){g['${colas}'] = ${colexp}}
 						else if(typeof ${colexp} == 'string' && typeof g['${colas}'] == 'number'){g['${colas}'] = g['${colas}']}
-						else{g['${colas}'] += ${colexp}||0}` 
-						+ post
-					}else if (col.aggregatorid === 'COUNT') {
+						else{g['${colas}'] += ${colexp}||0}` +
+							post
+						);
+					} else if (col.aggregatorid === 'COUNT') {
 
 						if (col.expression.columnid === '*') {
 							return pre + "g['" + colas + "']++;" + post;
@@ -10122,15 +10142,18 @@ yy.Select.prototype.compileDefCols = function (query, databaseid) {
 
 // SELECT UNION statement
 
-yy.Union = function (params) {
-	return Object.assign(this, params);
-};
-yy.Union.prototype.toString = function () {
-	return 'UNION';
-};
+yy.Union = class Union {
+	constructor(params) {
+		Object.assign(this, params);
+	}
 
-yy.Union.prototype.compile = function (tableid) {
-	return null;
+	toString() {
+		return 'UNION';
+	}
+
+	compile(tableid) {
+		return null;
+	}
 };
 
 /*
@@ -10141,16 +10164,18 @@ yy.Union.prototype.compile = function (tableid) {
 //
 */
 
-yy.Apply = function (params) {
-	return Object.assign(this, params);
-};
+yy.Apply = class Apply {
+	constructor(params) {
+		Object.assign(this, params);
+	}
 
-yy.Apply.prototype.toString = function () {
-	var s = this.applymode + ' APPLY (' + this.select.toString() + ')';
+	toString() {
+		var s = this.applymode + ' APPLY (' + this.select.toString() + ')';
 
-	if (this.as) s += ' AS ' + this.as;
+		if (this.as) s += ' AS ' + this.as;
 
-	return s;
+		return s;
+	}
 };
 
 /*
@@ -10161,20 +10186,23 @@ yy.Apply.prototype.toString = function () {
 //
 */
 
-yy.Over = function (params) {
-	return Object.assign(this, params);
-};
-yy.Over.prototype.toString = function () {
-	var s = 'OVER (';
-	if (this.partition) {
-		s += 'PARTITION BY ' + this.partition.toString();
-		if (this.order) s += ' ';
+yy.Over = class Over {
+	constructor(params) {
+		Object.assign(this, params);
 	}
-	if (this.order) {
-		s += 'ORDER BY ' + this.order.toString();
+
+	toString() {
+		var s = 'OVER (';
+		if (this.partition) {
+			s += 'PARTITION BY ' + this.partition.toString();
+			if (this.order) s += ' ';
+		}
+		if (this.order) {
+			s += 'ORDER BY ' + this.order.toString();
+		}
+		s += ')';
+		return s;
 	}
-	s += ')';
-	return s;
 };
 
 /*
@@ -10574,21 +10602,9 @@ yy.Over.prototype.toString = function () {
 					this.right instanceof yy.NullValue ||
 					(this.right.op === 'NOT' && this.right.right instanceof yy.NullValue)
 				) {
-					s = `(
-					(${leftOperand}==null)   // Cant be ===
-					===
-					(${rightOperand}==null)  // Cant be ===
-				)`;
+					s = `((${leftOperand} == null) === (${rightOperand} == null))`; // == null cant be ===
 				} else {
-					s = `(
-					(${leftOperand} == ${rightOperand})
-					||
-					(
-						${leftOperand}  < 0
-						&&
-						true == ${rightOperand}
-					)
-				)`;
+					s = `((${leftOperand} == ${rightOperand}) || (${leftOperand}  < 0 && true == ${rightOperand}))`;
 				}
 			}
 
@@ -11165,8 +11181,9 @@ yy.Over.prototype.toString = function () {
 
 		toType() {
 			if (
-				['SUM', 'COUNT', 'AVG', 'MIN', 'MAX', 'AGGR', 'VAR', 'STDDEV', 'TOTAL'].indexOf(this.aggregatorid) >
-				-1
+				['SUM', 'COUNT', 'AVG', 'MIN', 'MAX', 'AGGR', 'VAR', 'STDDEV', 'TOTAL'].indexOf(
+					this.aggregatorid
+				) > -1
 			) {
 				return 'number';
 			}
@@ -14418,6 +14435,9 @@ yy.Insert.prototype.compile = function (databaseid) {
 		// INSERT INTO table SELECT
 	} else if (this.select) {
 		this.select.modifier = 'RECORDSET';
+		if (this.queries) {
+			this.select.queries = this.queries;
+		}
 		var selectfn = this.select.compile(databaseid);
 		if (db.engineid && alasql.engines[db.engineid].intoTable) {
 			var statement = function (params, cb) {