alasql 0.2.7 → 0.2.8

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.7 | © 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.7
+@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.7 | © 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.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.2.7 | © 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.7
+@version 0.2.8
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -140,7 +140,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.2.7';
+alasql.version = '0.2.8';
 
 /**
 	Debug flag
@@ -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;
@@ -8027,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];};';
 		};
 
 		/*
@@ -8240,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;
 		}
@@ -8485,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 {
@@ -11172,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);