alasql 0.0.51 → 0.0.52

package/alasql.js

@@ -2,7 +2,7 @@
 // alasql.js
 // AlaSQL - JavaScript SQL database
 // Date: 22.04.2015
-// Version: 0.0.50
+// Version: 0.0.52
 // (ñ) 2014-2015, Andrey Gershun
 //
 
@@ -111,7 +111,7 @@ var alasql = function(sql, params, cb, scope) {
 };
 
 /** Current version of alasql */
-alasql.version = "0.0.51";
+alasql.version = "0.0.52";
 
 
 
@@ -3028,11 +3028,11 @@ var cloneDeep = utils.cloneDeep = function cloneDeep(obj) {
     if(obj == null || typeof(obj) != 'object')
         return 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;
@@ -3112,7 +3112,7 @@ var extend = utils.extend = function extend (a,b){
     if(typeof a == 'undefined') 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;
@@ -6443,7 +6443,7 @@ function compileSelectStar (query,alias) {
 //					console.log(60,alias,columns);
 
 			// 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]};';
 //console.log(777, sp);
 			query.dirtyColumns = true;
 		}
@@ -6616,7 +6616,7 @@ yy.Select.prototype.compileSelectGroup1 = function(query) {
 	self.columns.forEach(function(col,idx){
 //		console.log(col);
 		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]};';
 			s += 'for(var k in this.query.groupColumns){r[k]=g[this.query.groupColumns[k]]};';
 //			console.log(query);
 		} else {
@@ -9538,7 +9538,7 @@ yy.Insert.prototype.compile = function (databaseid) {
 					});
 				} else {
 //					console.log(222,values);
-//					sw = 'var w='+JSONtoJavaScript(values)+';for(var k in w){r[k]=w[k]};';
+//					sw = 'var w='+JSONtoJavaScript(values)+';for(var k in w){if(/^__proto__$/.test(k))Object.defineProperty(r,k,{writable:true,enumerable:true,configurable:true});r[k]=w[k]};';
 					sw = JSONtoJavaScript(values);
 				}
 			}

package/console/alasql.js

@@ -2,7 +2,7 @@
 // alasql.js
 // AlaSQL - JavaScript SQL database
 // Date: 16.04.2015
-// Version: 0.0.47
+// Version: 0.0.52
 // (ñ) 2014-2015, Andrey Gershun
 //
 
@@ -111,7 +111,7 @@ var alasql = function(sql, params, cb, scope) {
 };
 
 /** Current version of alasql */
-alasql.version = "0.0.47";
+alasql.version = "0.0.52";
 
 
 
@@ -2964,11 +2964,11 @@ var cloneDeep = utils.cloneDeep = function cloneDeep(obj) {
     if(obj == null || typeof(obj) != 'object')
         return 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;
@@ -3048,7 +3048,7 @@ var extend = utils.extend = function extend (a,b){
     if(typeof a == 'undefined') a = {};
     for(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;
@@ -6230,7 +6230,7 @@ function compileSelectStar (query,alias) {
 //console.log(999,columns);			
 		} 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]};';
 //console.log(777, sp);
 			query.dirtyColumns = true;
 		}
@@ -6403,7 +6403,7 @@ yy.Select.prototype.compileSelectGroup1 = function(query) {
 	self.columns.forEach(function(col,idx){
 //		console.log(col);
 		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]};';
 			s += 'for(var k in this.query.groupColumns){r[k]=g[this.query.groupColumns[k]]};';
 //			console.log(query);
 		} else {
@@ -9169,7 +9169,7 @@ yy.Insert.prototype.compile = function (databaseid) {
 					});
 				} else {
 //					console.log(222,values);
-//					sw = 'var w='+JSONtoJavaScript(values)+';for(var k in w){r[k]=w[k]};';
+//					sw = 'var w='+JSONtoJavaScript(values)+';for(var k in w){if(/^__proto__$/.test(k))Object.defineProperty(r,k,{writable:true,enumerable:true,configurable:true});r[k]=w[k]};';
 					sw = JSONtoJavaScript(values);
 				}
 			}