alasql 0.6.3 → 0.6.4

package/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    time: "04:00"
+  open-pull-requests-limit: 10

package/.github/workflows/nodejs.yml

@@ -21,9 +21,8 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npx yarn install
+    - run: npx yarn install --frozen-lockfile
     - run: npx prettier src/*.js --list-different || (echo 'Please correct file formatting using `yarn format` and try again.' && exit 1) 
-    - run: npx yarn test-only
     - run: npx yarn test
  
 

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 0.6.4 (24.09.2020)
+
+- Add: String and Number objects supported as values
+- Add: `JOIN USING` now supports String and Number objects 
+- Fix: File naming when exporting to Exel
+
 
 ### 0.6.2 (31.05.2020)
 
@@ -105,7 +111,7 @@
 * Fix: missing ORDER BY direction when calling toString on AST (#970)
 * Fix: Converting the syntax tree back to SQL with multple joins (#972)
 
-### 0.4.4 "Alsowm" (03.012.2017)
+### 0.4.4 "Alsowm" (03.12.2017)
 
 * Better: Better usage via unpkg.com
 * Better: Better usage via jsdelivr.com

package/README.md

@@ -3,7 +3,7 @@ _AlaSQL is an open source project used on more than two million page views per m
 _Have a question? Ask on [Stack Overflow](http://stackoverflow.com/questions/ask?tags=AlaSQL) using the "alasql" tag._
 
 
-[![Build Status](https://travis-ci.org/agershun/alasql.svg?branch=develop)](https://travis-ci.org/agershun/alasql)
+[![CI-test](https://github.com/agershun/alasql/workflows/CI-test/badge.svg)](https://github.com/agershun/alasql/actions)
 [![NPM downloads](http://img.shields.io/npm/dm/alasql.svg?style=flat&label=npm%20downloads)](https://npm-stat.com/charts.html?package=alasql)
 [![OPEN open source software](https://img.shields.io/badge/Open--OSS-%E2%9C%94-brightgreen.svg)](http://open-oss.com)
 [![Release](https://img.shields.io/github/release/agershun/alasql.svg?label=Last%20release&a)](https://www.npmjs.com/package/alasql)

package/bin/alaserver.js

@@ -8,21 +8,23 @@
 var alasql = require('alasql');
 var http = require('http');
 var url = require('url');
-var port = (process.argv[2] || 1337)|0;
-if(!port) {
-	throw new Error('Wrong port number '+process.argv[3]);
+var port = (process.argv[2] || 1337) | 0;
+if (!port) {
+	throw new Error('Wrong port number ' + process.argv[3]);
 }
 
-http.createServer(function (req, res) {
-	var sql = decodeURI(url.parse(req.url).search).substr(1);
-	var a = '';
-	try {
-		a = alasql(sql);
-	} catch(err) {
-		a = err.toString();
-	};
-  	res.writeHead(200, {'Content-Type': 'application/json'});
-  	res.end(JSON.stringify(a));
-}).listen(port, '127.0.0.1');
+http
+	.createServer(function (req, res) {
+		var sql = decodeURI(url.parse(req.url).search).substr(1);
+		var a = '';
+		try {
+			a = alasql(sql);
+		} catch (err) {
+			a = err.toString();
+		}
+		res.writeHead(200, {'Content-Type': 'application/json'});
+		res.end(JSON.stringify(a));
+	})
+	.listen(port, '127.0.0.1');
 
-console.log('Server running at http://127.0.0.1:'+port+'/');
+console.log('Server running at http://127.0.0.1:' + port + '/');

package/bin/alasql-cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
- //
+//
 // Command line interface for Alasql
 // Version: 0.2.2
 // Date: 28.07.2015
@@ -12,39 +12,46 @@ let fs = require('fs');
 let stdin = process.openStdin();
 let yargs = require('yargs')
 	.strict()
-	.usage('AlaSQL command-line utility (version ' + alasql.version + ')\n\nUsage: $0 [options] [sql] [params]')
+	.usage(
+		'AlaSQL command-line utility (version ' +
+			alasql.version +
+			')\n\nUsage: $0 [options] [sql] [params]'
+	)
 
-.example('$0 "sql-statement"', 'Run SQL statement and output result as JSON')
+	.example('$0 "sql-statement"', 'Run SQL statement and output result as JSON')
 	.example('')
-	.example('$0 \'value of select 2+?\' 40', 'Outputs 42')
+	.example("$0 'value of select 2+?' 40", 'Outputs 42')
 	.example('')
-	.example('$0 \'select count(*) from txt()\' < city.txt', 'Count lines in city.txt')
+	.example("$0 'select count(*) from txt()' < city.txt", 'Count lines in city.txt')
 	.example('')
-	.example('$0 \'select * into xlsx("city.xlsx") from txt("city.txt")\'', 'Convert from txt to xlsx')
+	.example(
+		'$0 \'select * into xlsx("city.xlsx") from txt("city.txt")\'',
+		'Convert from txt to xlsx'
+	)
 	.example('')
 	.example('$0 --file file.sql France 1960', 'Run SQL from file with 2 parameters')
 
-.version('v', 'Echo AlaSQL version', alasql.version)
+	.version('v', 'Echo AlaSQL version', alasql.version)
 	.alias('v', 'version')
 
-.boolean('m')
+	.boolean('m')
 	.describe('m', 'Minify json output')
 	.alias('m', 'minify')
 
-.describe('f', 'Load SQL from file')
+	.describe('f', 'Load SQL from file')
 	.alias('f', 'file')
 	.nargs('f', 1)
 	.normalize('f')
 
-.help('h')
+	.help('h')
 	.alias('h', 'help')
 
-.epilog('\nMore information about the library: www.alasql.org')
+	.epilog('\nMore information about the library: www.alasql.org');
 
 let argv = yargs.argv;
 let sql = '';
 let params = [];
-let pipedData = ''
+let pipedData = '';
 stdin.on('data', function (chunk) {
 	pipedData += chunk;
 });
@@ -67,7 +74,6 @@ if (argv.f) {
 
 	sql = fs.readFileSync(argv.f, 'utf8').toString();
 	execute(sql, argv._);
-
 } else {
 	sql = argv._.shift() || '';
 
@@ -90,9 +96,8 @@ stdin.on('end', function () {
  * @returns {null} Result will be printet to console.log
  */
 function execute(sql, params) {
-
 	if (0 === sql.trim().length) {
-		console.error("\nNo SQL to process\n");
+		console.error('\nNo SQL to process\n');
 		yargs.showHelp();
 		process.exit(1);
 	}
@@ -100,23 +105,28 @@ function execute(sql, params) {
 	for (var i = 1; i < params.length; i++) {
 		var a = params[i];
 		if (a[0] !== '"' && a[0] !== "'") {
-			if (+a == a) { // jshint ignore:line
+			if (+a == a) {
+				// jshint ignore:line
 				params[i] = +a;
 			}
 		}
 	}
 
-	alasql.promise(sql, params)
+	alasql
+		.promise(sql, params)
 		.then(function (res) {
 			if (!alasql.options.stdout) {
 				console.log(formatOutput(res));
 			}
 			process.exit(0);
-		}).catch(function (err) {
+		})
+		.catch(function (err) {
 			let errorJsonObj = JSON.parse(JSON.stringify(err, Object.getOwnPropertyNames(err)));
-			console.error(formatOutput({
-				error: errorJsonObj
-			}));
+			console.error(
+				formatOutput({
+					error: errorJsonObj,
+				})
+			);
 			process.exit(1);
 		});
 }
@@ -138,7 +148,6 @@ function isDirectory(filePath) {
 	return isDir;
 }
 
-
 /**
  * Format output
  *

package/dist/alasql-echo.js

@@ -2,17 +2,19 @@
 
 var yy = alasql.yy;
 
-yy.Echo = function (params) { return yy.extend(this, params); }
-yy.Echo.prototype.toString = function() {
-	var s =  'TEST '+this.expr.toString();
+yy.Echo = function (params) {
+	return yy.extend(this, params);
+};
+yy.Echo.prototype.toString = function () {
+	var s = 'TEST ' + this.expr.toString();
 	return s;
-}
+};
 
 yy.Echo.prototype.execute = function (databaseid, params, cb) {
-//	var self = this;
+	//	var self = this;
 	// console.log(76336,this.expr.toJS());
-	var fn = new Function('params, alasql','return '+this.expr.toJS());
+	var fn = new Function('params, alasql', 'return ' + this.expr.toJS());
 	var res = fn(params, alasql);
-	if(cb) res = cb(res);
+	if (cb) res = cb(res);
 	return res;
-}
+};

package/dist/alasql-prolog.js

@@ -2,39 +2,50 @@
 
 var yy = alasql.yy;
 
-yy.Term = function (params) { return yy.extend(this, params); }
-yy.Term.prototype.toString = function() {
+yy.Term = function (params) {
+	return yy.extend(this, params);
+};
+yy.Term.prototype.toString = function () {
 	var s = this.termid;
-	if(this.args && this.args.length > 0) {
-		s += '('+this.args.map(function(arg){
-			return arg.toString();
-		})+')';
+	if (this.args && this.args.length > 0) {
+		s +=
+			'(' +
+			this.args.map(function (arg) {
+				return arg.toString();
+			}) +
+			')';
 	}
 	return s;
 };
 
-yy.AddRule = function (params) { return yy.extend(this, params); }
-yy.AddRule.prototype.toString = function() {
+yy.AddRule = function (params) {
+	return yy.extend(this, params);
+};
+yy.AddRule.prototype.toString = function () {
 	var s = '';
-	if(this.left) s += this.left.toString();
+	if (this.left) s += this.left.toString();
 	s += ':-';
-	s += this.right.map(function(r){return r.toString()}).join(',');
+	s += this.right
+		.map(function (r) {
+			return r.toString();
+		})
+		.join(',');
 	return s;
 };
 
 yy.AddRule.prototype.execute = function (databaseid, params, cb) {
-//	var self = this;
-//	console.log(this.expr.toJS());
-//	var fn = new Function('params, alasql','return '+this.expr.toJS());
-//	var res = fn(params, alasql);
+	//	var self = this;
+	//	console.log(this.expr.toJS());
+	//	var fn = new Function('params, alasql','return '+this.expr.toJS());
+	//	var res = fn(params, alasql);
 	var res = 1;
 	var objects = alasql.databases[databaseid].objects;
 	var rule = {};
-	if(!this.left) {
-		this.right.forEach(function(term){
+	if (!this.left) {
+		this.right.forEach(function (term) {
 			rule.$class = term.termid;
 		});
 	}
-	if(cb) res = cb(res);
+	if (cb) res = cb(res);
 	return res;
-};
+};

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.6.3-develop-6e6d1902undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.6.4-develop-2311b55fundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.6.3-develop-6e6d1902undefined
+@version 0.6.4-develop-2311b55fundefined
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

package/dist/alasql-worker.min.js

@@ -1,2 +1,2 @@
-//! AlaSQL v0.6.3-develop-6e6d1902undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.6.4-develop-2311b55fundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 !function(r,e){"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?module.exports=e():r.alasql=e()}(this,function(){function a(r,e,t){"function"==typeof(e=e||[])&&(scope=t,t=e,e=[]),"object"!=typeof e&&(e=[e]);var o=a.lastid++;a.buffer[o]=t,a.webworker.postMessage({id:o,sql:r,params:e})}var i;if(a.options={},a.options.progress=function(){},isArray=function(r){return"[object Array]"===Object.prototype.toString.call(r)},a.promise=function(){throw new Error("Please include a Promise/A+ library")},"undefined"!=typeof Promise&&(i=function(r,e,n,s){return new Promise(function(t,o){a(r,e,function(r,e){e?o(e):(n&&s&&!1!==a.options.progress&&a.options.progress(n,s),t(r))})})},a.promise=function(r,e){if("undefined"==typeof Promise)throw new Error("Please include a Promise/A+ library");if("string"==typeof r)return i(r,e);if(!isArray(r)||r.length<1||void 0!==e)throw new Error("Error in .promise parameters");return function(r){if(!(r.length<1)){for(var e,t,o,n=[],s=0;s<r.length;s++){if("string"==typeof(e=r[s])&&(e=[e]),!isArray(e)||e.length<1||2<e.length)throw new Error("Error in .promise parameter");t=e[0],o=e[1]||void 0,n.push(i(t,o,s,r.length))}return Promise.all(n)}}(r)}),!(a=a||!1))throw new Error("alasql was not found");return a.worker=function(){throw new Error("Can find webworker in this enviroment")},"undefined"!=typeof Worker&&(a.worker=function(r,e,t){if(!0===r&&(r=void 0),void 0===r)for(var o=document.getElementsByTagName("script"),n=0;n<o.length;n++){if("alasql-worker.js"===o[n].src.substr(-16).toLowerCase()){r=o[n].src.substr(0,o[n].src.length-16)+"alasql.js";break}if("alasql-worker.min.js"===o[n].src.substr(-20).toLowerCase()){r=o[n].src.substr(0,o[n].src.length-20)+"alasql.min.js";break}if("alasql.js"===o[n].src.substr(-9).toLowerCase()){r=o[n].src;break}if("alasql.min.js"===o[n].src.substr(-13).toLowerCase()){r=o[n].src.substr(0,o[n].src.length-13)+"alasql.min.js";break}}if(void 0===r)throw new Error("Path to alasql.js is not specified");if(!1!==r){var s="importScripts('";s+=r,s+="');self.onmessage = function(event) {alasql(event.data.sql,event.data.params, function(data){postMessage({id:event.data.id, data:data});});}";var i=new Blob([s],{type:"text/plain"});a.webworker=new Worker(URL.createObjectURL(i)),a.webworker.onmessage=function(r){var e=r.data.id;a.buffer[e](r.data.data),delete a.buffer[e]},a.webworker.onerror=function(r){throw r},1<arguments.length&&a("REQUIRE "+e.map(function(r){return'"'+r+'"'}).join(","),[],t)}else if(!1===r)return void delete a.webworker}),a.lastid=0,a.buffer={},a.worker(),a});

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.6.3-develop-6e6d1902undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.6.4-develop-2311b55fundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.6.3-develop-6e6d1902undefined
+@version 0.6.4-develop-2311b55fundefined
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.6.3-develop-6e6d1902undefined';
+alasql.version = '0.6.4-develop-2311b55fundefined';
 
 /**
 	Debug flag
@@ -4019,6 +4019,14 @@ var cloneDeep = (utils.cloneDeep = function cloneDeep(obj) {
 		return new Date(obj);
 	}
 
+	if (obj instanceof String) {
+		return obj.toString();
+	}
+
+	if (obj instanceof Number) {
+		return +obj;
+	}
+
 	var temp = obj.constructor(); // changed
 
 	for (var key in obj) {
@@ -7501,12 +7509,18 @@ function doJoin(query, scope, h) {
 				if (!opt && source.getfn && !source.dontcache) data[i] = dataw;
 
 				scope[tableid] = dataw;
+
 				// Reduce with ON and USING clause
-				if (
-					!source.onleftfn ||
-					source.onleftfn(scope, query.params, alasql) ==
-						source.onrightfn(scope, query.params, alasql)
-				) {
+				var usingPassed = !source.onleftfn;
+				if (!usingPassed) {
+					var left = source.onleftfn(scope, query.params, alasql);
+					var right = source.onrightfn(scope, query.params, alasql);
+					if (left instanceof String || left instanceof Number) left = left.valueOf();
+					if (right instanceof String || right instanceof Number) right = left.valueOf();
+					usingPassed = left == right;
+				}
+
+				if (usingPassed) {
 					// For all non-standard JOINs like a-b=0
 					if (source.onmiddlefn(scope, query.params, alasql)) {
 						// Recursively call new join
@@ -11901,11 +11915,12 @@ alasql.aggr.MEDIAN = function (v, s, stage) {
 			return r[p - 1];
 		}
 
-		if (typeof r[Math.floor(p - 1)] !== 'number') {
-			return r[Math.floor(p - 1)];
+		var value = r[Math.floor(p - 1)];
+		if (typeof value !== 'number' && !(value instanceof Number)) {
+			return value;
 		}
 
-		return (r[Math.floor(p - 1)] + r[Math.ceil(p - 1)]) / 2;
+		return (value + r[Math.ceil(p - 1)]) / 2;
 	}
 };
 
@@ -17023,6 +17038,7 @@ alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 	/** @type {number} result */
 	var res = 1;
+	opts = opts || {};
 
 	if (deepEqual(columns, [{columnid: '_'}])) {
 		data = data.map(function (dat) {
@@ -17040,6 +17056,7 @@ alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 
 	/* If called without filename, use opts */
 	if (typeof filename == 'object') {
+		// todo: check if data, clumns and cb also should be shifted.
 		opts = filename;
 		filename = undefined;
 	}

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.6.3-develop-6e6d1902undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.6.4-develop-2311b55fundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.6.3-develop-6e6d1902undefined
+@version 0.6.4-develop-2311b55fundefined
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.6.3-develop-6e6d1902undefined';
+alasql.version = '0.6.4-develop-2311b55fundefined';
 
 /**
 	Debug flag
@@ -4014,6 +4014,14 @@ var cloneDeep = (utils.cloneDeep = function cloneDeep(obj) {
 		return new Date(obj);
 	}
 
+	if (obj instanceof String) {
+		return obj.toString();
+	}
+
+	if (obj instanceof Number) {
+		return +obj;
+	}
+
 	var temp = obj.constructor(); // changed
 
 	for (var key in obj) {
@@ -7496,12 +7504,18 @@ function doJoin(query, scope, h) {
 				if (!opt && source.getfn && !source.dontcache) data[i] = dataw;
 
 				scope[tableid] = dataw;
+
 				// Reduce with ON and USING clause
-				if (
-					!source.onleftfn ||
-					source.onleftfn(scope, query.params, alasql) ==
-						source.onrightfn(scope, query.params, alasql)
-				) {
+				var usingPassed = !source.onleftfn;
+				if (!usingPassed) {
+					var left = source.onleftfn(scope, query.params, alasql);
+					var right = source.onrightfn(scope, query.params, alasql);
+					if (left instanceof String || left instanceof Number) left = left.valueOf();
+					if (right instanceof String || right instanceof Number) right = left.valueOf();
+					usingPassed = left == right;
+				}
+
+				if (usingPassed) {
 					// For all non-standard JOINs like a-b=0
 					if (source.onmiddlefn(scope, query.params, alasql)) {
 						// Recursively call new join
@@ -11896,11 +11910,12 @@ alasql.aggr.MEDIAN = function (v, s, stage) {
 			return r[p - 1];
 		}
 
-		if (typeof r[Math.floor(p - 1)] !== 'number') {
-			return r[Math.floor(p - 1)];
+		var value = r[Math.floor(p - 1)];
+		if (typeof value !== 'number' && !(value instanceof Number)) {
+			return value;
 		}
 
-		return (r[Math.floor(p - 1)] + r[Math.ceil(p - 1)]) / 2;
+		return (value + r[Math.ceil(p - 1)]) / 2;
 	}
 };
 
@@ -17018,6 +17033,7 @@ alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 	/** @type {number} result */
 	var res = 1;
+	opts = opts || {};
 
 	if (deepEqual(columns, [{columnid: '_'}])) {
 		data = data.map(function (dat) {
@@ -17035,6 +17051,7 @@ alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 
 	/* If called without filename, use opts */
 	if (typeof filename == 'object') {
+		// todo: check if data, clumns and cb also should be shifted.
 		opts = filename;
 		filename = undefined;
 	}