alasql 0.2.6 → 0.2.8

package/CHANGELOG.md

@@ -1,19 +1,32 @@
 # Changelog
 * Check https://trello.com/b/qxz65pVi/alasql-roadmap for roadmap
 
-### 0.2.6 "Frikes" (22.04.2016)
+_0.2.8 "..." (xx.06.2016)_
+
+
+_0.2.7 "Corinth" (30.05.2016)_
+* Added: Now supports Node 6.0 
+* Added: Let .promise return all responses (not just last) 
+* Change: Headers set as default true for INTO and FROM statements
+* Fix: Back on track (for good) with supporting Meteor 
+* Fix: Default tentative string to numbers conversion when reading data from google spreadsheets 
+* Update: No need for empty params when async
+* Update: Better hashing for cashing
+
+
+### 0.2.6 "Frikes" (22.04.2016)
 
 * Added: Progress callback
 * Change: CLI defaults to pretty print (with option for compressed output as original)
-* Update: CLI output is guaranteed to be valid JSON 
-* Update: Better error message for missing table or column
-* Update: Typescript defenition for .promise
-* Update: Empty params not needed for async calls
 * Fix: Declaring all variables
 * Fix: Read XLSX files
 * Fix: Selecting a view from localstorage 
 * Fix: CREATE VIEW for localStorage engine 
 * Fix: Better use for RequireJS
+* Update: CLI output is guaranteed to be valid JSON 
+* Update: Better error message for missing table or column
+* Update: Typescript defenition for .promise
+* Update: Empty params not needed for async calls
 
 
 ### 0.2.5 "Polychrono" (23.03.2016)

package/README.md

@@ -13,7 +13,7 @@ _Got a question? Ask on [Stack Overflow](http://stackoverflow.com/questions/ask?
 
 # AlaSQL
 
-<a href="http://alasql.org"><img src="https://cloud.githubusercontent.com/assets/1063454/14003945/d6e56888-f156-11e5-95b9-3035a2538ae8.png" align="left" alt="AlaSQL logo" width="82" height="82"/></a>
+<a href="http://alasql.org"><img src="https://cloud.githubusercontent.com/assets/1063454/14003945/d6e56888-f156-11e5-95b9-3035a2538ae8.png" align="left" alt="AlaSQL logo" /></a>
 
 _( [à la](http://en.wiktionary.org/wiki/%C3%A0_la) [SQL](http://en.wikipedia.org/wiki/SQL) ) [ælæ ɛskju:ɛl]_ - AlaSQL is an open source SQL database for Javascript with a strong focus on query speed and datasource flexibility for relational data, schemaless data, and graph data. It works in your browser, Node.js, IO.js and Cordova.
 
@@ -645,6 +645,6 @@ and other people for useful tools, which make our work much easier.
 ----
 
 
-<a href="http://alasql.org"><img src="https://cloud.githubusercontent.com/assets/1063454/14003946/d6e5c076-f156-11e5-8238-e62d2a8d20dc.png" align="right" alt="AlaSQL logo" width="82" height="82"/></a>
+<a href="http://alasql.org"><img src="https://cloud.githubusercontent.com/assets/1063454/14003946/d6e5c076-f156-11e5-8238-e62d2a8d20dc.png" align="right" alt="AlaSQL logo"/></a>
 © 2014-2016, Andrey Gershun (agershun@gmail.com) & M. Rangel Wulff (m@rawu.dk)
 

package/bin/alasql-cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 //
 // Command line interface for Alasql
-// Version: 0.2.2
+// Version: 0.2.8
 // Date: 28.07.2015
 // (c) 2014-2015, Andrey Gershun & M. Rangel Wulff
 //

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.2.6 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.2.8 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 /*
 @module alasql
-@version 0.2.6
+@version 0.2.8
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

package/dist/alasql-worker.min.js

@@ -1,2 +1,2 @@
-//! AlaSQL v0.2.6 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.2.8 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 !function(e,r){"function"==typeof define&&define.amd?define([],r):"object"==typeof exports?module.exports=r():e.alasql=r()}(this,function(){function e(r,t,s){var a=e.lastid++;e.buffer[a]=s,e.webworker.postMessage({id:a,sql:r,params:t})}return"undefined"==typeof location||!location.reload||"undefined"!=typeof process&&process.browser||"function"==typeof require&&"function"==typeof require.specified||(e.worker=function(r,t,s){if(r===!0&&(r=void 0),"undefined"==typeof r)for(var a=document.getElementsByTagName("script"),o=0;o<a.length;o++){if("alasql-worker.js"===a[o].src.substr(-16).toLowerCase()){r=a[o].src.substr(0,a[o].src.length-16)+"alasql.js";break}if("alasql-worker.min.js"===a[o].src.substr(-20).toLowerCase()){r=a[o].src.substr(0,a[o].src.length-20)+"alasql.min.js";break}if("alasql.js"===a[o].src.substr(-9).toLowerCase()){r=a[o].src;break}if("alasql.min.js"===a[o].src.substr(-13).toLowerCase()){r=a[o].src.substr(0,a[o].src.length-13)+"alasql.min.js";break}}if("undefined"==typeof r)throw new Error("Path to alasql.js is not specified");if(r!==!1){var n="importScripts('";n+=r,n+="');self.onmessage = function(event) {alasql(event.data.sql,event.data.params, function(data){postMessage({id:event.data.id, data:data});});}";var i=new Blob([n],{type:"text/plain"});if(e.webworker=new Worker(URL.createObjectURL(i)),e.webworker.onmessage=function(r){var t=r.data.id;e.buffer[t](r.data.data),delete e.buffer[t]},e.webworker.onerror=function(e){throw e},arguments.length>1){var f="REQUIRE "+t.map(function(e){return'"'+e+'"'}).join(",");e(f,[],s)}}else if(r===!1)return void delete e.webworker}),e.lastid=0,e.buffer={},e.worker(),e});

package/dist/alasql.d.ts

@@ -4,44 +4,43 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 
-
 interface AlaSQLCallback {
-	(data?:any,err?:Error):void
+    (data?: any, err?: Error): void;
 }
 
 interface AlaSQLOptions {
-	errorlog: boolean;
-	valueof :boolean
-	dropifnotexists :boolean; // DROP database in any case
-	datetimeformat :string; // How to handle DATE and DATETIME types
-	casesensitive :boolean; // Table and column names are case sensitive and converted to lower-case
-	logtarget :string; // target for log. Values: 'console', 'output', 'id' of html tag
-	logprompt :boolean; // Print SQL at log
-	modifier :any; // values: RECORDSET, VALUE, ROW, COLUMN, MATRIX, TEXTSTRING, INDEX
-	columnlookup:number; // How many rows to lookup to define columns
-	autovertex:boolean;// Create vertex if not found
-	usedbo:boolean; // Use dbo as current database (for partial T-SQL comaptibility)
-	autocommit:boolean; // AUTOCOMMIT ON | OFF
-	cache:boolean; // Use cache
-	nocount:boolean;// for SET NOCOUNT OFF
-	nan:boolean;// Check for NaN and convert it to undefined
-	angularjs :boolean;
-	tsql:boolean;
-	mysql:boolean;
-	postgres:boolean;
-	oracle:boolean;
-	sqlite:boolean;
-	orientdb:boolean;
+    errorlog: boolean;
+    valueof: boolean;
+    dropifnotexists: boolean; // drop database in any case
+    datetimeformat: string; // how to handle DATE and DATETIME types
+    casesensitive: boolean; // table and column names are case sensitive and converted to lower-case
+    logtarget: string; // target for log. Values: 'console', 'output', 'id' of html tag
+    logprompt: boolean; // print SQL at log
+    modifier: any; // values: RECORDSET, VALUE, ROW, COLUMN, MATRIX, TEXTSTRING, INDEX
+    columnlookup: number; // how many rows to lookup to define columns
+    autovertex: boolean; // create vertex if not found
+    usedbo: boolean; // use dbo as current database (for partial T-SQL comaptibility)
+    autocommit: boolean; // the AUTOCOMMIT ON | OFF
+    cache: boolean; // use cache
+    nocount: boolean; // for SET NOCOUNT OFF
+    nan: boolean; // check for NaN and convert it to undefined
+    angularjs: boolean;
+    tsql: boolean;
+    mysql: boolean;
+    postgres: boolean;
+    oracle: boolean;
+    sqlite: boolean;
+    orientdb: boolean;
 }
 
-// Compiled Statement
+// compiled Statement
 interface AlaSQLStatement {
-	(params?:any,cb?:AlaSQLCallback,scope?:any):any;
+    (params?: any, cb?: AlaSQLCallback, scope?: any): any;
 }
 
-// Abstract Syntax Tree
+// abstract Syntax Tree
 interface AlaSQLAST {
-	compile(databaseid:string):AlaSQLStatement;
+    compile(databaseid: string): AlaSQLStatement;
 }
 
 // https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/es6-promise/es6-promise.d.ts
@@ -52,12 +51,12 @@ interface Thenable<T> {
 }
 
 interface AlaSQL {
-	(sql:any,params?:any,cb?:AlaSQLCallback,scope?:any):any;
-	parse(sql):AlaSQLAST;
-	options:AlaSQLOptions;
-	error: Error;
-	promise(sql:any,params?:any):Thenable;
+    options: AlaSQLOptions;
+    error: Error;
+    (sql: any, params?: any, cb?: AlaSQLCallback, scope?: any): any;
+    parse(sql): AlaSQLAST;
+    promise(sql: any, params?: any): Thenable<any>;
 }
 
-declare var alasql : AlaSQL;
+declare var alasql: AlaSQL;
 

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.2.6 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.2.8 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 /*
 @module alasql
-@version 0.2.6
+@version 0.2.8
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -85,13 +85,19 @@ SOFTWARE.
     alasql().From(data).Where(function(x){return x.a == 10}).exec();
  */
 
-var alasql = function alasql(sql, params, cb, scope) {
+var alasql = function(sql, params, cb, scope) {
+
+	params = params||[];
 
 	// Avoid setting params if not needed even with callback
 	if(typeof params === 'function'){
 		scope = cb;
 		cb = params;
-		params = {};
+		params = [];
+	}
+
+	if(typeof params !== 'object'){
+			params = [params];
 	}
 
 	if(typeof importScripts !== 'function' && alasql.webworker) {
@@ -134,7 +140,7 @@ var alasql = function alasql(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.2.6';
+alasql.version = '0.2.8';
 
 /**
 	Debug flag
@@ -3587,28 +3593,22 @@ function isIE () {
   return (myNav.indexOf('msie') !== -1) ? parseInt(myNav.split('msie')[1]) : false;
 }
 
-// Fast hash function
-
 /**
-  @function Hash string to integer number
-  @param {string} str Source string
+  @function Hash a string to signed integer
+  @param {string} source string
   @return {integer} hash number
 */
 
-var hash = utils.hash = function hash(str){
-    var h = 0;
-
-    if (0 === str.length){
-        return h;
-    }
+// sdbm hash function
+var hash = utils.hash = function(str){
+  var hash = 5381,
+      i    = str.length
 
-    for (var i = 0; i < str.length; i++) {
-        h = ((h<<5)-h)+str.charCodeAt(i);
-        h = h & h;
-   	}
+  while(i)
+    hash = (hash * 33) ^ str.charCodeAt(--i)
 
-    return h;
-};
+  return hash;
+}
 
 /**
     Union arrays
@@ -3725,11 +3725,11 @@ var cloneDeep = utils.cloneDeep = function cloneDeep(obj) {
 	return new Date(obj);
     }
 
-    var temp = obj.constructor(); // changed
+    var temp = (Object.prototype.hasOwnProperty.call(obj, 'constructor') ? Object : obj.constructor)(); // changed
 
     for(var key in obj) {
         if(obj.hasOwnProperty(key)) {
-            temp[key] = cloneDeep(obj[key]);
+            /* A "__proto__" key from parsed data is copied as data, never as the prototype */ if (key === '__proto__') { Object.defineProperty(temp, key, {value: cloneDeep(obj[key]), writable: true, enumerable: true, configurable: true}); } else { temp[key] = cloneDeep(obj[key]); }
         }
     }
     return temp;
@@ -3800,7 +3800,7 @@ var extend = utils.extend = function extend (a,b){
     a = a || {};
     for(var key in b) {
         if(b.hasOwnProperty(key)) {
-            a[key] = b[key];
+            /* A "__proto__" key from parsed data is copied as data, never as the prototype */ if (key === '__proto__') { Object.defineProperty(a, key, {value: b[key], writable: true, enumerable: true, configurable: true}); } else { a[key] = b[key]; }
         }
     }
     return a;
@@ -4441,32 +4441,68 @@ alasql.compile = function(sql, databaseid) {
 // Promises for AlaSQL
 //
 
-if(utils.isNode){
-	utils.global.Promise = require('es6-promise').Promise;
-} else {
-	/*!
-	 * @overview es6-promise - a tiny implementation of Promises/A+.
-	 * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
-	 * @license   Licensed under MIT license
-	 *            See https://raw.githubusercontent.com/jakearchibald/es6-promise/master/LICENSE
-	 * @version   3.2.1
-	 */
-	(function(){"use strict";function t(t){return"function"==typeof t||"object"==typeof t&&null!==t}function e(t){return"function"==typeof t}function n(t){G=t}function r(t){Q=t}function o(){return function(){process.nextTick(a)}}function i(){return function(){B(a)}}function s(){var t=0,e=new X(a),n=document.createTextNode("");return e.observe(n,{characterData:!0}),function(){n.data=t=++t%2}}function u(){var t=new MessageChannel;return t.port1.onmessage=a,function(){t.port2.postMessage(0)}}function c(){return function(){setTimeout(a,1)}}function a(){for(var t=0;J>t;t+=2){var e=tt[t],n=tt[t+1];e(n),tt[t]=void 0,tt[t+1]=void 0}J=0}function f(){try{var t=require,e=t("vertx");return B=e.runOnLoop||e.runOnContext,i()}catch(n){return c()}}function l(t,e){var n=this,r=new this.constructor(p);void 0===r[rt]&&k(r);var o=n._state;if(o){var i=arguments[o-1];Q(function(){x(o,r,i,n._result)})}else E(n,r,t,e);return r}function h(t){var e=this;if(t&&"object"==typeof t&&t.constructor===e)return t;var n=new e(p);return g(n,t),n}function p(){}function _(){return new TypeError("You cannot resolve a promise with itself")}function d(){return new TypeError("A promises callback cannot return that same promise.")}function v(t){try{return t.then}catch(e){return ut.error=e,ut}}function y(t,e,n,r){try{t.call(e,n,r)}catch(o){return o}}function m(t,e,n){Q(function(t){var r=!1,o=y(n,e,function(n){r||(r=!0,e!==n?g(t,n):S(t,n))},function(e){r||(r=!0,j(t,e))},"Settle: "+(t._label||" unknown promise"));!r&&o&&(r=!0,j(t,o))},t)}function b(t,e){e._state===it?S(t,e._result):e._state===st?j(t,e._result):E(e,void 0,function(e){g(t,e)},function(e){j(t,e)})}function w(t,n,r){n.constructor===t.constructor&&r===et&&constructor.resolve===nt?b(t,n):r===ut?j(t,ut.error):void 0===r?S(t,n):e(r)?m(t,n,r):S(t,n)}function g(e,n){e===n?j(e,_()):t(n)?w(e,n,v(n)):S(e,n)}function A(t){t._onerror&&t._onerror(t._result),T(t)}function S(t,e){t._state===ot&&(t._result=e,t._state=it,0!==t._subscribers.length&&Q(T,t))}function j(t,e){t._state===ot&&(t._state=st,t._result=e,Q(A,t))}function E(t,e,n,r){var o=t._subscribers,i=o.length;t._onerror=null,o[i]=e,o[i+it]=n,o[i+st]=r,0===i&&t._state&&Q(T,t)}function T(t){var e=t._subscribers,n=t._state;if(0!==e.length){for(var r,o,i=t._result,s=0;s<e.length;s+=3)r=e[s],o=e[s+n],r?x(n,r,o,i):o(i);t._subscribers.length=0}}function M(){this.error=null}function P(t,e){try{return t(e)}catch(n){return ct.error=n,ct}}function x(t,n,r,o){var i,s,u,c,a=e(r);if(a){if(i=P(r,o),i===ct?(c=!0,s=i.error,i=null):u=!0,n===i)return void j(n,d())}else i=o,u=!0;n._state!==ot||(a&&u?g(n,i):c?j(n,s):t===it?S(n,i):t===st&&j(n,i))}function C(t,e){try{e(function(e){g(t,e)},function(e){j(t,e)})}catch(n){j(t,n)}}function O(){return at++}function k(t){t[rt]=at++,t._state=void 0,t._result=void 0,t._subscribers=[]}function Y(t){return new _t(this,t).promise}function q(t){var e=this;return new e(I(t)?function(n,r){for(var o=t.length,i=0;o>i;i++)e.resolve(t[i]).then(n,r)}:function(t,e){e(new TypeError("You must pass an array to race."))})}function F(t){var e=this,n=new e(p);return j(n,t),n}function D(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}function K(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}function L(t){this[rt]=O(),this._result=this._state=void 0,this._subscribers=[],p!==t&&("function"!=typeof t&&D(),this instanceof L?C(this,t):K())}function N(t,e){this._instanceConstructor=t,this.promise=new t(p),this.promise[rt]||k(this.promise),Array.isArray(e)?(this._input=e,this.length=e.length,this._remaining=e.length,this._result=new Array(this.length),0===this.length?S(this.promise,this._result):(this.length=this.length||0,this._enumerate(),0===this._remaining&&S(this.promise,this._result))):j(this.promise,U())}function U(){return new Error("Array Methods must be provided an Array")}function W(){var t;if("undefined"!=typeof global)t=global;else if("undefined"!=typeof self)t=self;else try{t=Function("return this")()}catch(e){throw new Error("polyfill failed because global object is unavailable in this environment")}var n=t.Promise;(!n||"[object Promise]"!==Object.prototype.toString.call(n.resolve())||n.cast)&&(t.Promise=pt)}var z;z=Array.isArray?Array.isArray:function(t){return"[object Array]"===Object.prototype.toString.call(t)};var B,G,H,I=z,J=0,Q=function(t,e){tt[J]=t,tt[J+1]=e,J+=2,2===J&&(G?G(a):H())},R="undefined"!=typeof window?window:void 0,V=R||{},X=V.MutationObserver||V.WebKitMutationObserver,Z="undefined"==typeof self&&"undefined"!=typeof process&&"[object process]"==={}.toString.call(process),$="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof importScripts&&"undefined"!=typeof MessageChannel,tt=new Array(1e3);H=Z?o():X?s():$?u():void 0===R&&"function"==typeof require?f():c();var et=l,nt=h,rt=Math.random().toString(36).substring(16),ot=void 0,it=1,st=2,ut=new M,ct=new M,at=0,ft=Y,lt=q,ht=F,pt=L;L.all=ft,L.race=lt,L.resolve=nt,L.reject=ht,L._setScheduler=n,L._setAsap=r,L._asap=Q,L.prototype={constructor:L,then:et,"catch":function(t){return this.then(null,t)}};var _t=N;N.prototype._enumerate=function(){for(var t=this.length,e=this._input,n=0;this._state===ot&&t>n;n++)this._eachEntry(e[n],n)},N.prototype._eachEntry=function(t,e){var n=this._instanceConstructor,r=n.resolve;if(r===nt){var o=v(t);if(o===et&&t._state!==ot)this._settledAt(t._state,e,t._result);else if("function"!=typeof o)this._remaining--,this._result[e]=t;else if(n===pt){var i=new n(p);w(i,t,o),this._willSettleAt(i,e)}else this._willSettleAt(new n(function(e){e(t)}),e)}else this._willSettleAt(r(t),e)},N.prototype._settledAt=function(t,e,n){var r=this.promise;r._state===ot&&(this._remaining--,t===st?j(r,n):this._result[e]=n),0===this._remaining&&S(r,this._result)},N.prototype._willSettleAt=function(t,e){var n=this;E(t,void 0,function(t){n._settledAt(it,e,t)},function(t){n._settledAt(st,e,t)})};var dt=W,vt={Promise:pt,polyfill:dt};"function"==typeof define&&define.amd?define(function(){return vt}):"undefined"!=typeof module&&module.exports?module.exports=vt:"undefined"!=typeof this&&(this.ES6Promise=vt),dt()}).call(this);
+if(!utils.global.Promise){
+
+	if(utils.isNode){
+		utils.global.Promise = require('es6-promise').Promise;
+	} else {
+		/*!
+		 * @overview es6-promise - a tiny implementation of Promises/A+.
+		 * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
+		 * @license   Licensed under MIT license
+		 *            See https://raw.githubusercontent.com/jakearchibald/es6-promise/master/LICENSE
+		 * @version   3.2.1
+		 */
+		(function(){"use strict";function t(t){return"function"==typeof t||"object"==typeof t&&null!==t}function e(t){return"function"==typeof t}function n(t){G=t}function r(t){Q=t}function o(){return function(){process.nextTick(a)}}function i(){return function(){B(a)}}function s(){var t=0,e=new X(a),n=document.createTextNode("");return e.observe(n,{characterData:!0}),function(){n.data=t=++t%2}}function u(){var t=new MessageChannel;return t.port1.onmessage=a,function(){t.port2.postMessage(0)}}function c(){return function(){setTimeout(a,1)}}function a(){for(var t=0;J>t;t+=2){var e=tt[t],n=tt[t+1];e(n),tt[t]=void 0,tt[t+1]=void 0}J=0}function f(){try{var t=require,e=t("vertx");return B=e.runOnLoop||e.runOnContext,i()}catch(n){return c()}}function l(t,e){var n=this,r=new this.constructor(p);void 0===r[rt]&&k(r);var o=n._state;if(o){var i=arguments[o-1];Q(function(){x(o,r,i,n._result)})}else E(n,r,t,e);return r}function h(t){var e=this;if(t&&"object"==typeof t&&t.constructor===e)return t;var n=new e(p);return g(n,t),n}function p(){}function _(){return new TypeError("You cannot resolve a promise with itself")}function d(){return new TypeError("A promises callback cannot return that same promise.")}function v(t){try{return t.then}catch(e){return ut.error=e,ut}}function y(t,e,n,r){try{t.call(e,n,r)}catch(o){return o}}function m(t,e,n){Q(function(t){var r=!1,o=y(n,e,function(n){r||(r=!0,e!==n?g(t,n):S(t,n))},function(e){r||(r=!0,j(t,e))},"Settle: "+(t._label||" unknown promise"));!r&&o&&(r=!0,j(t,o))},t)}function b(t,e){e._state===it?S(t,e._result):e._state===st?j(t,e._result):E(e,void 0,function(e){g(t,e)},function(e){j(t,e)})}function w(t,n,r){n.constructor===t.constructor&&r===et&&constructor.resolve===nt?b(t,n):r===ut?j(t,ut.error):void 0===r?S(t,n):e(r)?m(t,n,r):S(t,n)}function g(e,n){e===n?j(e,_()):t(n)?w(e,n,v(n)):S(e,n)}function A(t){t._onerror&&t._onerror(t._result),T(t)}function S(t,e){t._state===ot&&(t._result=e,t._state=it,0!==t._subscribers.length&&Q(T,t))}function j(t,e){t._state===ot&&(t._state=st,t._result=e,Q(A,t))}function E(t,e,n,r){var o=t._subscribers,i=o.length;t._onerror=null,o[i]=e,o[i+it]=n,o[i+st]=r,0===i&&t._state&&Q(T,t)}function T(t){var e=t._subscribers,n=t._state;if(0!==e.length){for(var r,o,i=t._result,s=0;s<e.length;s+=3)r=e[s],o=e[s+n],r?x(n,r,o,i):o(i);t._subscribers.length=0}}function M(){this.error=null}function P(t,e){try{return t(e)}catch(n){return ct.error=n,ct}}function x(t,n,r,o){var i,s,u,c,a=e(r);if(a){if(i=P(r,o),i===ct?(c=!0,s=i.error,i=null):u=!0,n===i)return void j(n,d())}else i=o,u=!0;n._state!==ot||(a&&u?g(n,i):c?j(n,s):t===it?S(n,i):t===st&&j(n,i))}function C(t,e){try{e(function(e){g(t,e)},function(e){j(t,e)})}catch(n){j(t,n)}}function O(){return at++}function k(t){t[rt]=at++,t._state=void 0,t._result=void 0,t._subscribers=[]}function Y(t){return new _t(this,t).promise}function q(t){var e=this;return new e(I(t)?function(n,r){for(var o=t.length,i=0;o>i;i++)e.resolve(t[i]).then(n,r)}:function(t,e){e(new TypeError("You must pass an array to race."))})}function F(t){var e=this,n=new e(p);return j(n,t),n}function D(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}function K(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}function L(t){this[rt]=O(),this._result=this._state=void 0,this._subscribers=[],p!==t&&("function"!=typeof t&&D(),this instanceof L?C(this,t):K())}function N(t,e){this._instanceConstructor=t,this.promise=new t(p),this.promise[rt]||k(this.promise),Array.isArray(e)?(this._input=e,this.length=e.length,this._remaining=e.length,this._result=new Array(this.length),0===this.length?S(this.promise,this._result):(this.length=this.length||0,this._enumerate(),0===this._remaining&&S(this.promise,this._result))):j(this.promise,U())}function U(){return new Error("Array Methods must be provided an Array")}function W(){var t;if("undefined"!=typeof global)t=global;else if("undefined"!=typeof self)t=self;else try{t=Function("return this")()}catch(e){throw new Error("polyfill failed because global object is unavailable in this environment")}var n=t.Promise;(!n||"[object Promise]"!==Object.prototype.toString.call(n.resolve())||n.cast)&&(t.Promise=pt)}var z;z=Array.isArray?Array.isArray:function(t){return"[object Array]"===Object.prototype.toString.call(t)};var B,G,H,I=z,J=0,Q=function(t,e){tt[J]=t,tt[J+1]=e,J+=2,2===J&&(G?G(a):H())},R="undefined"!=typeof window?window:void 0,V=R||{},X=V.MutationObserver||V.WebKitMutationObserver,Z="undefined"==typeof self&&"undefined"!=typeof process&&"[object process]"==={}.toString.call(process),$="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof importScripts&&"undefined"!=typeof MessageChannel,tt=new Array(1e3);H=Z?o():X?s():$?u():void 0===R&&"function"==typeof require?f():c();var et=l,nt=h,rt=Math.random().toString(36).substring(16),ot=void 0,it=1,st=2,ut=new M,ct=new M,at=0,ft=Y,lt=q,ht=F,pt=L;L.all=ft,L.race=lt,L.resolve=nt,L.reject=ht,L._setScheduler=n,L._setAsap=r,L._asap=Q,L.prototype={constructor:L,then:et,"catch":function(t){return this.then(null,t)}};var _t=N;N.prototype._enumerate=function(){for(var t=this.length,e=this._input,n=0;this._state===ot&&t>n;n++)this._eachEntry(e[n],n)},N.prototype._eachEntry=function(t,e){var n=this._instanceConstructor,r=n.resolve;if(r===nt){var o=v(t);if(o===et&&t._state!==ot)this._settledAt(t._state,e,t._result);else if("function"!=typeof o)this._remaining--,this._result[e]=t;else if(n===pt){var i=new n(p);w(i,t,o),this._willSettleAt(i,e)}else this._willSettleAt(new n(function(e){e(t)}),e)}else this._willSettleAt(r(t),e)},N.prototype._settledAt=function(t,e,n){var r=this.promise;r._state===ot&&(this._remaining--,t===st?j(r,n):this._result[e]=n),0===this._remaining&&S(r,this._result)},N.prototype._willSettleAt=function(t,e){var n=this;E(t,void 0,function(t){n._settledAt(it,e,t)},function(t){n._settledAt(st,e,t)})};var dt=W,vt={Promise:pt,polyfill:dt};"function"==typeof define&&define.amd?define(function(){return vt}):"undefined"!=typeof module&&module.exports?module.exports=vt:"undefined"!=typeof this&&(this.ES6Promise=vt),dt()}).call(this);
 
+	}
 }
 
-var promiseExec = function(sql, params){
+var promiseExec = function(sql, params, counterStep, counterTotal){
 	 return new utils.global.Promise(function(resolve, reject){
         alasql(sql, params, function(data,err) {
              if(err) {
                  reject(err);
              } else {
-                 resolve(data);
+				if (counterStep && counterTotal && alasql.options.progress !== false) {
+					alasql.options.progress(counterStep, counterTotal);
+				}
+                resolve(data);
              }
         });
     });
 }
 
+var promiseAll = function(sqlParamsArray){
+	if(sqlParamsArray.length<1){
+		return ;
+	}
+
+	var active, sql, params;
+
+	var execArray = []; 
+
+	for (var i = 0; i < sqlParamsArray.length; i++) {
+		active = sqlParamsArray[i];
+
+		if(typeof active === 'string'){
+			active = [active];
+		}
+
+		if(!utils.isArray(active) || active.length<1 || 2<active.length){
+			throw new Error('Error in .promise parameter');
+		}
+
+		sql = active[0];
+		params = active[1]||undefined;
+
+		execArray.push(promiseExec(sql, params, i, sqlParamsArray.length));
+	}
+
+	return utils.global.Promise.all(execArray); 
+}
+
+/**
 var promiseChain = function(progress, sqlParamsArray, lastPromise){
 	var active, sql, params;
 	if(sqlParamsArray.length<1){
@@ -4496,7 +4532,7 @@ var promiseChain = function(progress, sqlParamsArray, lastPromise){
 
 	return promiseChain(progress, sqlParamsArray, lastPromise.then(function(){return promiseExec(sql, params)}));
 
-}
+}*/
 
 alasql.promise = function(sql, params) {
 	if(typeof Promise === "undefined"){
@@ -4510,13 +4546,15 @@ alasql.promise = function(sql, params) {
 	if(!utils.isArray(sql) || sql.length<1 || typeof params !== "undefined"){
 		throw new Error('Error in .promise parameters');
 	}
-
+	/*
 	var progress = {idx: 0, total: sql.length};
 	if (alasql.options.progress !== false) {
     alasql.options.progress(progress.total, progress.idx++);
 	}
+	*/
+	return promiseAll(sql);
 
-	return promiseChain(progress, sql);
+	//return promiseChain(progress, sql);
 };
 
 /*
@@ -5639,7 +5677,8 @@ alasql.srch.SHARP = function(val,args) {
 
 alasql.srch.PARENT = function(/*val,args,stope*/) {
 	// TODO: implement
-	console.log('PARENT not implemented');
+	console.log('PARENT not implemented', arguments);
+
 	return {status: -1, values: []};
 };
 
@@ -7988,7 +8027,7 @@ yy.Select.prototype.compileGroup = function(query) {
 		var aft = '', aft2='';
 
 		if(typeof query.groupStar !== 'undefined') {
-			aft2 += 'for(var f in p[\''+query.groupStar+'\']) {g[f]=p[\''+query.groupStar+'\'][f];};';
+			aft2 += 'for(var f in p[\''+query.groupStar+'\']) {if(/^__proto__$/.test(f))Object.defineProperty(g,f,{writable:true,enumerable:true,configurable:true});g[f]=p[\''+query.groupStar+'\'][f];};';
 		};
 
 		/*
@@ -8201,7 +8240,7 @@ function compileSelectStar (query, alias, joinstar) {
 		} else {
 
 			// if column not exists, then copy all
-			sp += 'var w=p["'+alias+'"];for(var k in w){r[k]=w[k]};';
+			sp += 'var w=p["'+alias+'"];for(var k in w){if(/^__proto__$/.test(k))Object.defineProperty(r,k,{writable:true,enumerable:true,configurable:true});r[k]=w[k]};';
 
 			query.dirtyColumns = true;
 		}
@@ -8446,7 +8485,7 @@ yy.Select.prototype.compileSelectGroup1 = function(query) {
 
 		if(col instanceof yy.Column && col.columnid === '*') {
 
-			s += 'for(var k in g) {r[k]=g[k]};';
+			s += 'for(var k in g) {if(/^__proto__$/.test(k))Object.defineProperty(r,k,{writable:true,enumerable:true,configurable:true});r[k]=g[k]};';
 			return '';
 
 		} else {
@@ -9803,7 +9842,7 @@ yy.UniOp.prototype.toJS = function(context, tableid, defcols) {
 yy.Column = function(params) { return yy.extend(this, params); }
 yy.Column.prototype.toString = function(dontas) {
 	var s;
-	if(this.columnid === +this.columnid) {
+	if(this.columnid == +this.columnid) { // jshint ignore:line
 		s = '['+this.columnid+']';
 	} else {
 		s = this.columnid;
@@ -11133,7 +11172,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			// Do UPDATE!!!
 
 			table.update(function(t){
-				for(var f in r) t[f] = r[f];
+				for(var f in r) {if(/^__proto__$/.test(f))Object.defineProperty(t,f,{writable:true,enumerable:true,configurable:true});t[f] = r[f];}
 			},table.data.indexOf(toreplace),params);
 		} else {
 			table.data.push(r);
@@ -13694,7 +13733,7 @@ function loghtml(res) {
 			s += '<tr><th>'+(i+1);
 			cols.forEach(function(colid){
 				s += '<td> ';
-				if(+res[i][colid] === +res[i][colid]) {
+				if(res[i][colid] == +res[i][colid]) {       // jshint ignore:line
 					s += '<div style="text-align:right">';
 					if(typeof res[i][colid] === 'undefined'){
 						s += 'NULL';
@@ -14004,7 +14043,7 @@ alasql.into.SQL = function(filename, opts, data, columns, cb) {
 alasql.into.HTML = function(selector, opts, data, columns, cb) {
 	var res = 1;
 	if(typeof exports != 'object') {
-		var opt = {};
+		var opt = {headers:true};
 		alasql.utils.extend(opt, opts);
 
 		var sel = document.querySelector(selector);
@@ -14108,7 +14147,7 @@ alasql.into.CSV = function(filename, opts, data, columns, cb) {
 		filename = undefined;
 	}
 
-	var opt = {};
+	var opt = {headers:true};
 	//opt.separator = ','; 
   opt.separator = ';';
 	opt.quote = '"';
@@ -14160,7 +14199,7 @@ alasql.into.XLS = function(filename, opts, data, columns, cb) {
 	};
 
 	// Default sheet
-	var sheet = {};
+	var sheet = {headers:true};
 	if(typeof sheets['Sheet1'] != 'undefined') {
 		sheet = sheets[0];
 	} else {
@@ -15024,6 +15063,13 @@ alasql.from.TABLETOP = function(key, opts, cb, idx, query) {
 	var opt = {headers:true, simpleSheet:true, key:key};
 	alasql.utils.extend(opt, opts);
 	opt.callback = function(data){
+		for(var i=0; i<data.length; i++) {
+			for (var prop in data[i]) {
+	        	if(data[i][prop] == +data[i][prop] && data[i].hasOwnProperty(prop)){ // jshint ignore:line
+					data[i][prop] = +data[i][prop];
+				}
+			}
+	    }
 		res = data;
 		if(cb){
 			res = cb(res, idx, query);
@@ -15031,7 +15077,7 @@ alasql.from.TABLETOP = function(key, opts, cb, idx, query) {
 	};
 
 	Tabletop.init(opt);
-	return res;
+	return null;
 };
 
 alasql.from.HTML = function(selector, opts, cb, idx, query) {