alasql 4.1.9 → 4.1.11

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.8 build: develop-274f71f6 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.1.11 build: develop-1493d57a | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.8
+@version 4.1.11
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff
@@ -29,7 +29,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
-
 /* eslint-disable */
 
 "use strict";
@@ -142,8 +141,8 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '4.1.8';
-alasql.build = 'develop-274f71f6';
+alasql.version = '4.1.11';
+alasql.build = 'develop-1493d57a';
 
 /**
 	Debug flag
@@ -155,7 +154,6 @@ alasql.debug = undefined; // Initial debug variable
 var require = function(){return null}; // as alasqlparser.js is generated, we can not "remove" references to 
 var __dirname = '';
 //*/
-
 /* parser generated by jison 0.4.18 */
 /*
   Returns a Parser object of the following structure:
@@ -3140,8 +3138,7 @@ exports.main = function commonjsMain (args) {
 if (typeof module !== 'undefined' && require.main === module) {
   exports.main(process.argv.slice(1));
 }
-}
-/**
+}/**
    12prettyflag.js - prettify
    @todo move this functionality to plugin
 */
@@ -4339,7 +4336,6 @@ var getXLSX = function () {
 
 // set AlaSQl path
 alasql.path = alasql.utils.findAlaSQLPath();
-
 /**
  	Strip all comments.
  	@function
@@ -4424,7 +4420,6 @@ alasql.utils.uncomment = function (str) {
 
 	return str;
 };
-
 /**
 	Database class for Alasql.js
 */
@@ -4927,7 +4922,6 @@ alasql.promise = function (sql, params) {
 	}
 	return promiseAll(sql);
 };
-
 /*
 //
 // Database class for Alasql.js
@@ -5104,7 +5098,6 @@ Transaction.prototype.executeSQL = Transaction.prototype.exec;
 // Transaction.prototype.run = Database.prototype.exec;
 
 alasql.Transaction = Transaction;
-
 /*
 //
 // Table class for Alasql.js
@@ -5162,7 +5155,6 @@ Table.prototype.indexColumns = function () {
 		self.xcolumns[col.columnid] = col;
 	});
 };
-
 /*
 //
 // View class for Alasql.js
@@ -5257,7 +5249,6 @@ var yy = {
 };
 
 alasqlparser.yy = alasql.yy = yy;
-
 /*
 //
 // Statements class for Alasql.js
@@ -5287,7 +5278,6 @@ yy.Statements = class Statements {
 			  };
 	}
 };
-
 /* global alasql */
 /* global yy */
 /*
@@ -6430,7 +6420,6 @@ var compileSearchOrder = function (order) {
 		return new Function('a,b', s);
 	}
 };
-
 // Main query procedure
 function queryfn(query, oldscope, cb, A, B) {
 	var aaa = query.sources.length;
@@ -6622,6 +6611,11 @@ function queryfn3(query) {
 			if (!query.havingfn || query.havingfn(g, query.params, alasql)) {
 
 				var d = query.selectgfn(g, query.params, alasql);
+
+				for (const key in query.groupColumns) {
+					if (query.groupColumns[key] !== key && d[query.groupColumns[key]])
+						delete d[query.groupColumns[key]];
+				}
 				query.data.push(d);
 			}
 		}
@@ -7041,7 +7035,6 @@ var preIndex = function (query) {
 		}
 	}
 };
-
 //
 // Join all lines over sources
 //
@@ -7257,7 +7250,6 @@ function swapSources(query, h) {
 	query.sources[h] = nextsource;
 	query.sources[h + 1] = source;
 }
-
 /*
 //
 // Select run-time part for Alasql.js
@@ -7814,7 +7806,6 @@ function modify(query, res) {
 	}
 	return res;
 }
-
 /*
 //
 // EXISTS and other subqueries functions  functions for Alasql.js
@@ -7872,7 +7863,6 @@ alasql.precompile = function (statement, databaseid, params) {
 		});
 	}
 };
-
 /*
 //
 // Select compiler part for Alasql.js
@@ -8112,7 +8102,6 @@ alasql.prepareFromData = function (data, array) {
 
 	return res;
 };
-
 /*
 //
 // Select compiler part for Alasql.js
@@ -8497,7 +8486,6 @@ yy.Select.prototype.compileJoins = function (query) {
 	});
 
 };
-
 yy.Select.prototype.compileWhere = function (query) {
 	if (this.where) {
 		if (typeof this.where == 'function') {
@@ -8598,7 +8586,6 @@ function optimizeWhereJoin(query, ast) {
 		}
 	}
 }
-
 /*
 //
 // Select compiler part for Alasql.js
@@ -9039,7 +9026,6 @@ yy.Select.prototype.compileGroup = function (query) {
 
 	return new Function('p,params,alasql', 'var y;' + s);
 };
-
 /*
 //
 // Select compiler part for Alasql.js
@@ -9086,9 +9072,10 @@ function compileSelectStar(query, aliases, joinstar) {
 
 		if (columns && columns.length > 0) {
 			columns.forEach(function (tcol) {
+				const escapedColumnId = escapeq(tcol.columnid);
 				if (joinstar && alasql.options.joinstar == 'underscore') {
 					ss.push(
-						"'" + alias + '_' + tcol.columnid + "':p['" + alias + "']['" + tcol.columnid + "']"
+						"'" + alias + '_' + escapedColumnId + "':p['" + alias + "']['" + escapedColumnId + "']"
 					);
 				} else if (joinstar && alasql.options.joinstar == 'json') {
 					//				ss.push('\''+alias+'_'+tcol.columnid+'\':p[\''+alias+'\'][\''+tcol.columnid+'\']');
@@ -9096,16 +9083,16 @@ function compileSelectStar(query, aliases, joinstar) {
 						"r['" +
 						alias +
 						"']['" +
-						tcol.columnid +
+						escapedColumnId +
 						"']=p['" +
 						alias +
 						"']['" +
-						tcol.columnid +
+						escapedColumnId +
 						"'];";
 				} else {
-					var value = "p['" + alias + "']['" + tcol.columnid + "']";
+					var value = "p['" + alias + "']['" + escapedColumnId + "']";
 					if (!columnIds[tcol.columnid]) {
-						var key = "'" + tcol.columnid + "':";
+						var key = "'" + escapedColumnId + "':";
 						ss.push(key + value);
 						columnIds[tcol.columnid] = {
 							id: ss.length - 1,
@@ -9120,7 +9107,7 @@ function compileSelectStar(query, aliases, joinstar) {
 					}
 				}
 
-				query.selectColumns[escapeq(tcol.columnid)] = true;
+				query.selectColumns[escapedColumnId] = true;
 
 				var coldef = {
 					columnid: tcol.columnid,
@@ -9555,7 +9542,6 @@ yy.Select.prototype.compileRemoveColumns = function (query) {
 			});
 	}
 };
-
 /* global yy */
 
 yy.Select.prototype.compileHaving = function (query) {
@@ -9570,7 +9556,6 @@ yy.Select.prototype.compileHaving = function (query) {
 		return true;
 	};
 };
-
 yy.Select.prototype.compileOrder = function (query, params) {
 	var self = this;
 	self.orderColumns = [];
@@ -9726,7 +9711,6 @@ if(false) {
 		return new Function('a,b', 'var y;' + s);
 	}
 };
-
 // Pivot functions
 /**
 	Compile Pivot functions
@@ -9916,7 +9900,6 @@ yy.Select.prototype.compileUnpivot = function (query) {
 		//		});
 	};
 };
-
 /*
 //
 // ROLLUP(), CUBE(), GROUPING SETS() for Alasql.js
@@ -10072,7 +10055,6 @@ function decartes(gv, query) {
 	}
 
 }
-
 /*
 //
 // Select run-time part for Alasql.js
@@ -10153,7 +10135,6 @@ yy.Select.prototype.compileDefCols = function (query, databaseid) {
 
 	return defcols;
 };
-
 /*
 //
 // UNION for Alasql.js
@@ -10177,7 +10158,6 @@ yy.Union = class Union {
 		return null;
 	}
 };
-
 /*
 //
 // CROSS AND OUTER APPLY for Alasql.js
@@ -10199,7 +10179,6 @@ yy.Apply = class Apply {
 		return s;
 	}
 };
-
 /*
 //
 // CROSS AND OUTER APPLY for Alasql.js
@@ -10226,7 +10205,6 @@ yy.Over = class Over {
 		return s;
 	}
 };
-
 /*
 //
 // Expressions for Alasql.js
@@ -10596,7 +10574,7 @@ yy.Over = class Over {
 				var ljs = '(' + leftJS() + '||{})';
 
 				if (typeof this.right === 'string') {
-					s = ljs + '["' + this.right + '"]';
+					s = ljs + '["' + escapeq(this.right) + '"]';
 				} else if (typeof this.right === 'number') {
 					s = ljs + '[' + this.right + ']';
 				} else if (this.right instanceof yy.FuncValue) {
@@ -10835,7 +10813,7 @@ yy.Over = class Over {
 		}
 
 		toJS() {
-			return "alasql.vars['" + this.variable + "']";
+			return "alasql.vars['" + escapeq(this.variable) + "']";
 		}
 	}
 
@@ -11224,7 +11202,7 @@ yy.Over = class Over {
 		toJS() {
 			var colas = this.nick;
 			if (colas === undefined) {
-				colas = this.toString();
+				colas = escapeq(this.toString());
 			}
 			return "g['" + colas + "']";
 		}
@@ -11272,7 +11250,6 @@ yy.Over = class Over {
 		View,
 	});
 }
-
 // Alasql Linq library
 
 yy.FromData = function (params) {
@@ -11438,7 +11415,6 @@ yy.Select.prototype.Where = function (expr) {
 	}
 	return self;
 };
-
 /*
 //
 // Functions for Alasql.js
@@ -11900,7 +11876,6 @@ stdfn.NEWID =
 				lut[(d3 >> 24) & 0xff]
 			);
 		};
-
 /*
 //
 // CASE for Alasql.js
@@ -11974,7 +11949,6 @@ yy.CaseValue.prototype.toJS = function (context, tableid, defcols) {
 
 	return s;
 };
-
 /*
 //
 // JSON for Alasql.js
@@ -12083,7 +12057,6 @@ yy.Json.prototype.toJS = function (context, tableid, defcols) {
 	// TODO redo
 	return JSONtoJS(this.value, context, tableid, defcols);
 };
-
 /*
 //
 // CAST and CONVERT functions
@@ -12298,7 +12271,6 @@ alasql.stdfn.CONVERT = function (value, args) {
 	}
 	return val;
 };
-
 /*
 //
 // CREATE TABLE for Alasql.js
@@ -12974,7 +12946,6 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 	if (cb) res = cb(res);
 	return res;
 };
-
 //
 // Date functions
 //
@@ -13146,7 +13117,6 @@ function newDate(d) {
 	}
 	return new Date(d);
 }
-
 /*
 //
 // DROP TABLE for Alasql.js
@@ -13257,7 +13227,6 @@ yy.TruncateTable.prototype.execute = function (databaseid, params, cb) {
 	}
 	return cb ? cb(0) : 0;
 };
-
 /*
 //
 // CREATE VERTEX for AlaSQL
@@ -13696,7 +13665,6 @@ yy.CreateGraph.prototype.compile1 = function (databaseid) {
 	};
 	return statement;
 };
-
 /*
 //
 // ALTER TABLE for Alasql.js
@@ -13859,7 +13827,6 @@ yy.AlterTable.prototype.execute = function (databaseid, params, cb) {
 		throw Error('Unknown ALTER TABLE method');
 	}
 };
-
 /*
 //
 // CREATE TABLE for Alasql.js
@@ -13952,7 +13919,6 @@ yy.Reindex.prototype.execute = function (databaseid, params, cb) {
 	if (cb) res = cb(res);
 	return res;
 };
-
 /*
 //
 // DROP TABLE for Alasql.js
@@ -13975,7 +13941,6 @@ yy.DropIndex.prototype.compile = function (db) {
 		return 1;
 	};
 };
-
 /*
 //
 // WITH SELECT for Alasql.js
@@ -14066,7 +14031,6 @@ yy.If.prototype.execute = function (databaseid, params, cb) {
 	//	 else res = this.elsestat.execute(databaseid,params,cb,scope);
 	return res;
 };
-
 /*
 //
 // CREATE VIEW for Alasql.js
@@ -14169,7 +14133,6 @@ yy.BeginEnd.prototype.execute = function (databaseid, params, cb, scope) {
 	}
 	return res;
 };
-
 /*
 //
 // INSERT for Alasql.js
@@ -14442,7 +14405,6 @@ yy.Insert.prototype.execute = function (databaseid, params, cb) {
 	return this.compile(databaseid)(params, cb);
 	//	throw new Error('Insert statement is should be compiled')
 };
-
 /*
 //
 // TRIGGER for Alasql.js
@@ -14553,7 +14515,6 @@ yy.DropTrigger.prototype.execute = function (databaseid, params, cb) {
 	if (cb) res = cb(res);
 	return res;
 };
-
 /*
 //
 // DELETE for Alasql.js
@@ -14710,7 +14671,6 @@ yy.Delete.prototype.compile = function (databaseid) {
 yy.Delete.prototype.execute = function (databaseid, params, cb) {
 	return this.compile(databaseid)(params, cb);
 };
-
 /*
 //
 // UPDATE for Alasql.js
@@ -14822,7 +14782,6 @@ yy.Update.prototype.compile = function (databaseid) {
 yy.Update.prototype.execute = function (databaseid, params, cb) {
 	return this.compile(databaseid)(params, cb);
 };
-
 /*
 //
 // SET for Alasql.js
@@ -14878,7 +14837,6 @@ yy.Merge.prototype.execute = function (databaseid, params, cb) {
 	if (cb) res = cb(res);
 	return res;
 };
-
 /*
 //
 // UPDATE for Alasql.js
@@ -15103,7 +15061,6 @@ yy.DropDatabase.prototype.execute = function (databaseid, params, cb) {
 	if (cb) cb(res);
 	return res;
 };
-
 /*
 //
 // SET for Alasql.js
@@ -15176,7 +15133,6 @@ yy.Declare.prototype.execute = function (databaseid, params, cb) {
 	}
 	return res;
 };
-
 /*
 //
 // SHOW for Alasql.js
@@ -15323,7 +15279,6 @@ yy.ShowCreateTable.prototype.execute = function (databaseid) {
 		throw new Error('There is no such table "' + this.table.tableid + '"');
 	}
 };
-
 /*
 //
 // SET for Alasql.js
@@ -15415,7 +15370,6 @@ yy.SetVariable.prototype.execute = function (databaseid, params, cb) {
 	if (cb) res = cb(res);
 	return res;
 };
-
 alasql.test = function (name, times, fn) {
 	if (arguments.length === 0) {
 		alasql.log(alasql.con.results);
@@ -15715,7 +15669,6 @@ alasql.prompt = function (el, useidel, firstsql) {
 		}
 	};
 };
-
 /*
 //
 // Commit for Alasql.js
@@ -15776,7 +15729,6 @@ yy.RollbackTransaction.prototype.execute = function (databaseid, params, cb) {
 	if (cb) cb(res);
 	return res;
 };
-
 if (alasql.options.tsql) {
 	//
 	// Check tables and views
@@ -15812,7 +15764,6 @@ if (alasql.options.tsql) {
 		return undefined;
 	};
 }
-
 if (alasql.options.mysql) {
 	alasql.fn.TIMESTAMPDIFF = function (unit, date1, date2) {
 		return alasql.stdfn.DATEDIFF(unit, date1, date2);
@@ -15841,16 +15792,12 @@ if (alasql.options.mysql || alasql.options.sqlite) {
 		throw new Error('Unknown INFORMATION_SCHEMA table');
 	};
 }
-
 if (alasql.options.postgres) {
 }
-
 if (alasql.options.oracle) {
 }
-
 if (alasql.options.sqlite) {
 }
-
 //
 // into functions
 //
@@ -16107,7 +16054,6 @@ alasql.into.CSV = function (filename, opts, data, columns, cb) {
 	}
 	return res;
 };
-
 //
 // 831xl.js - Coloring Excel
 // 18.04.2015
@@ -16432,7 +16378,6 @@ alasql.into.XLS = function (filename, opts, data, columns, cb) {
 		return s;
 	}
 };
-
 alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 	opts = opts || {};
 
@@ -16786,7 +16731,6 @@ alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 		return s1 + s2 + s3;
 	}
 };
-
 /**
 	Export to XLSX function
 	@function
@@ -16978,7 +16922,6 @@ alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 
 	}
 };
-
 /*
 //
 // FROM functions Alasql.js
@@ -17462,7 +17405,6 @@ alasql.from.ODS = function (filename, opts, cb, idx, query) {
 	opts.autoExt = false;
 	return XLSXLSX(getXLSX(), filename, opts, cb, idx, query);
 };
-
 alasql.from.XML = function (filename, opts, cb, idx, query) {
 	var res;
 
@@ -17628,7 +17570,6 @@ function xmlparse(xml) {
 		return 0 == xml.indexOf(prefix);
 	}
 }
-
 alasql.from.GEXF = function (filename, opts, cb, idx, query) {
 	var res;
 	alasql('SEARCH FROM XML(' + filename + ')', [], function (data) {
@@ -17638,7 +17579,6 @@ alasql.from.GEXF = function (filename, opts, cb, idx, query) {
 	});
 	return res;
 };
-
 /*
 //
 // HELP for Alasql.js
@@ -17706,7 +17646,6 @@ yy.Print.prototype.execute = function (databaseid, params, cb) {
 	if (cb) res = cb(res);
 	return res;
 };
-
 /*
 //
 // HELP for Alasql.js
@@ -17744,7 +17683,6 @@ yy.Source.prototype.execute = function (databaseid, params, cb) {
 	);
 	return res;
 };
-
 /*
 //
 // HELP for Alasql.js
@@ -17818,7 +17756,6 @@ yy.Require.prototype.execute = function (databaseid, params, cb) {
 	}
 	return res;
 };
-
 /*
 //
 // HELP for Alasql.js
@@ -17854,7 +17791,6 @@ yy.Assert.prototype.execute = function (databaseid) {
 	}
 	return 1;
 };
-
 //
 // 91indexeddb.js
 // AlaSQL IndexedDB module
@@ -18215,7 +18151,6 @@ IDB.updateTable = function (databaseid, tableid, assignfn, wherefn, params, cb)
 		};
 	};
 };
-
 //
 // 91localstorage.js
 // localStorage and DOM-Storage engine
@@ -18669,7 +18604,6 @@ LS.rollback = function (databaseid, cb) {
 	//	}
 
 };
-
 //
 // 93sqlite.js
 // SQLite database support
@@ -18780,7 +18714,6 @@ SQLITE.intoTable = function (databaseid, tableid, value, columns, cb) {
 	if (cb) cb(res);
 	return res;
 };
-
 //
 // 91localstorage.js
 // localStorage and DOM-Storage engine
@@ -19032,9 +18965,7 @@ FS.rollback = function (databaseid, cb) {
 	//	 if(!alasql.options.autocommit) {
 
 };
-
 if(utils.isBrowser && !utils.isWebWorker) {
-
 alasql = alasql || false;
 
 if (!alasql) {
@@ -19111,7 +19042,6 @@ if (typeof Worker !== 'undefined') {
 		}
 	};
 }
-
 /* FileSaver.js
  * A saveAs() FileSaver implementation.
  * 1.3.2
@@ -19311,7 +19241,6 @@ if (typeof module !== 'undefined' && module.exports) {
 		return saveAs;
 	});
 }
-
 /* eslint-disable */ 
 
 /*