Merge branch 'release/0.3.2'

Author: mathiasrw

CHANGELOG.md

@@ -1,18 +1,27 @@
 # Changelog
-* Check https://trello.com/b/qxz65pVi/alasql-roadmap for roadmap
-
-_0.3.2 "..." (18.08.2016)_
 
-* ...
+_0.3.3 "Makemo" (16.09.2016)_
+* ...
+
+
+### 0.3.2 "Maumu" (05.09.2016)
+* Added: Postgres arrays like array[] and text[]
+* Added: Allow non-reserved keywords as identifiers
+* Fix: tsv/csv can now be is an empty file
+* Fix: alasql.d.ts format
+* Fix: Better way to find out if indexedDB is present
+* Fix: `null = null` is (now) null, baby.
+* Update: Column names first for RECORDSETS
+
 
 ### 0.3.1 "Taravao" (01.08.2016)
-* Allow unknown functions to be defined on alasql.fn afterwards
-* Easy access to AUTOINCREMENT values
-* MEDIAN will ignore null values 
-* STDEV will ignore null values
+* Allow unknown functions to be defined on alasql.fn afterwards
+* Easy access to AUTOINCREMENT values
+* MEDIAN will ignore null values 
+* STDEV will ignore null values
 
 
-## Version 0.3.0 "Papeete" (25.07.2016)_
+## Version 0.3.0 "Papeete" (25.07.2016)
 * Breaking change: CSVs with header will now default have BOM added (for better utf8 support) 
 * Added: Constraint names will now be exported in error message
 * Added: Web worker now supports .promise notation
@@ -32,7 +41,6 @@ _0.3.2 "..." (18.08.2016)_
 
 
 ### 0.2.6 "Frikes" (22.04.2016)
-
 * Added: Progress callback
 * Change: CLI defaults to pretty print (with option for compressed output as original)
 * Fix: Declaring all variables

TESTLOG.md

@@ -22,7 +22,7 @@ It has not yet been possible to run the SQLlogic tests on the Chrakra engine.
 
 
 ## Regression test
-The [regression tests for AlaSQL](https://github.com/agershun/alasql/tree/develop/test/) consists of more than 1000 test cases (hopefully) covering all of the functionality in the library. By executing `npm run test:only` the regression test will run via node. By executing `npm run test:browser` it will run in a browser. 
+The [regression tests for AlaSQL](https://github.com/agershun/alasql/tree/develop/test/) consists of more than 1000 test casescovering [![Coverage]( https://img.shields.io/codecov/c/github/agershun/alasql/develop.svg)](https://rawgit.com/agershun/alasql/develop/test/coverage/lcov-report/dist/alasql.fs.js.html) of the functionality in the library. By executing `npm run test:only` the regression test will run via node. By executing `npm run test:browser` it will run in a browser. 
 
 
 ### Chrome 48

bin/alasql-cli.js

@@ -1,114 +1,141 @@
 #!/usr/bin/env node
-//
+ //
 // Command line interface for Alasql
 // Version: 0.2.2
 // Date: 28.07.2015
 // (c) 2014-2015, Andrey Gershun & M. Rangel Wulff
 //
 
-var alasql = require('alasql');
-var path = require('path');
-var fs = require('fs');
-var yargs = require('yargs')
-	.demand(1)
+let alasql = require('alasql');
+let path = require('path');
+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]')
-    
-    .example('$0 "sql-statement"', 'Run SQL statement and output result as JSON')
-    .example('')
-    .example('$0 \'value of select 2+?\' 40', 'Outputs 42')
-    .example('')
+	.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('')
+	.example('$0 \'value of select 2+?\' 40', 'Outputs 42')
+	.example('')
 	.example('$0 \'select count(*) from txt()\' < city.txt', 'Count lines in city.txt')
-    .example('')
+	.example('')
 	.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)
-    .alias('v', 'version')
+	.example('')
+	.example('$0 --file file.sql France 1960', 'Run SQL from file with 2 parameters')
+
+.version('v', 'Echo AlaSQL version', alasql.version)
+	.alias('v', 'version')
 
-    .boolean('m')
-    .describe('m', 'Minify json output')
-    .alias('m', 'minify')
+.boolean('m')
+	.describe('m', 'Minify json output')
+	.alias('m', 'minify')
 
-    .describe('f', 'Load SQL from file')
-    .alias('f', 'file')
-    .nargs('f', 1)
-    .normalize('f')
+.describe('f', 'Load SQL from file')
+	.alias('f', 'file')
+	.nargs('f', 1)
+	.normalize('f')
 
-    .help('h')
-    .alias('h', 'help')
+.help('h')
+	.alias('h', 'help')
 
-    .epilog('\nMore information about the library: www.alasql.org')
-var argv = yargs.argv;
-var sql = '';
-var params = [];
+.epilog('\nMore information about the library: www.alasql.org')
 
+let argv = yargs.argv;
+let sql = '';
+let params = [];
+let pipedData = ''
+stdin.on('data', function (chunk) {
+	pipedData += chunk;
+});
 
-if(argv.v) {
-	console.log(alasql.version); 
+if (argv.v) {
+	console.log(alasql.version);
 	process.exit(0);
 }
 
-if(argv.f) {
+if (argv.f) {
 	if (!fs.existsSync(argv.f)) {
-		console.log('Error: file not found');
+		console.error('Error: file not found');
 		process.exit(1);
-	}	
+	}
 
 	if (isDirectory(argv.f)) {
-		console.log('Error: file expected but directory found');
+		console.error('Error: file expected but directory found');
 		process.exit(1);
 	}
 
 	sql = fs.readFileSync(argv.f, 'utf8').toString();
+	execute(sql, argv._);
+
 } else {
 	sql = argv._.shift() || '';
+
+	// if data is not piped
+	if (Boolean(process.stdin.isTTY)) {
+		execute(sql, argv._);
+	}
 }
 
-params = argv._;
+// if data is piped
+stdin.on('end', function () {
+	execute(pipedData, argv._);
+});
 
-if(0===sql.trim().length){
-	yargs.showHelp();
-	process.exit(1);
-}
+/**
+ * Execute SQL query
+ *
+ * @sql {String} SQL query
+ * @param {String} Parameters
+ * @returns {null} Result will be printet to console.log
+ */
+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
-			params[i] = +a;
-		}
+	if (0 === sql.trim().length) {
+		console.error("\nNo SQL to process\n");
+		yargs.showHelp();
+		process.exit(1);
 	}
-}
 
-alasql.promise(sql,params)
-	.then(function(res){
-		if(!alasql.options.stdout){
-			console.log(formatOutput(res));
+	for (var i = 1; i < params.length; i++) {
+		var a = params[i];
+		if (a[0] !== '"' && a[0] !== "'") {
+			if (+a == a) { // jshint ignore:line
+				params[i] = +a;
+			}
 		}
-		process.exit(0);
-	}).catch(function(err){
-		console.log(formatOutput({error:err}));
-		process.exit(1);
-	});
+	}
 
+	alasql.promise(sql, params)
+		.then(function (res) {
+			if (!alasql.options.stdout) {
+				console.log(formatOutput(res));
+			}
+			process.exit(0);
+		}).catch(function (err) {
+			let errorJsonObj = JSON.parse(JSON.stringify(err, Object.getOwnPropertyNames(err)));
+			console.error(formatOutput({
+				error: errorJsonObj
+			}));
+			process.exit(1);
+		});
+}
 
 /**
- * Is a Directory
+ * Is this padh a Directory
  *
  * @param {String} filePath
  * @returns {Boolean}
  */
-function isDirectory(filePath){
-      	var isDir = false;
-      	try {
-      	      	var absolutePath = path.resolve(filePath);
-      	      	isDir = fs.lstatSync(absolutePath).isDirectory();
-      	} catch (e) {
-      	      	isDir = e.code === 'ENOENT';
-      	}
-      	return isDir;
+function isDirectory(filePath) {
+	var isDir = false;
+	try {
+		var absolutePath = path.resolve(filePath);
+		isDir = fs.lstatSync(absolutePath).isDirectory();
+	} catch (e) {
+		isDir = e.code === 'ENOENT';
+	}
+	return isDir;
 }
 
 
@@ -118,12 +145,9 @@ function isDirectory(filePath){
  * @param {Object} Object to be formatted according to -p flag
  * @returns {JSON string}
  */
-function formatOutput(obj){
-	if(argv.m){
+function formatOutput(obj) {
+	if (argv.m) {
 		return JSON.stringify(obj);
 	}
 	return JSON.stringify(obj, null, 2);
 }
-
-
-

bower.json

@@ -58,5 +58,5 @@
     "bin",
     "lib"
   ],
-  "version": "0.3.1"
+  "version": "0.3.2"
 }

dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.3.1 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.3.2 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 /*
 @module alasql
-@version 0.3.1
+@version 0.3.2
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

dist/alasql-worker.min.js

@@ -73,7 +73,7 @@ declare namespace alaSQLSpace {
         promise(sql: any, params?: any): Thenable<any>;
         fn: userDefinedFunctionLookUp;
         aggr: userAggregatorLookUp;
-        autoval(tablename: string, colname: string, getNext=:boolean): number;
+        autoval(tablename: string, colname: string, getNext?:boolean): number;
     }
 }