alasql 0.1.9 → 0.1.11

package/src/15utility.js

@@ -41,7 +41,7 @@ function n2u(s) {
 
 */    
 function und(s,r) {
-    return '(y='+s+',typeof y=="undefined"?undefined:'+r+')'
+    return '(y='+s+',typeof y=="undefined"?undefined:'+r+')';
 }
 
 
@@ -50,14 +50,14 @@ function und(s,r) {
     @function
     @return {boolean} Always true
 */
-function returnTrue () {return true};
+function returnTrue () {return true;}
 
 /**
     Return undefined. Stub for non-ecisting WHERE clause, because is faster then if(whenrfn) whenfn()
     @function
     @return {undefined} Always undefined
 */
-function returnUndefined() {};
+function returnUndefined() {}
 
 /**
     Escape quotes
@@ -72,7 +72,7 @@ function returnUndefined() {};
 var escapeq = utils.escapeq = function(s) {
 //    console.log(s);
     return s.replace(/\'/g,'\\\'');
-}
+};
 
 
 /**
@@ -87,7 +87,7 @@ var escapeq = utils.escapeq = function(s) {
  */
 var escapeqq = utils.undoubleq = function(s) {
     return s.replace(/(\')/g,'\'\'');
-}
+};
 
 /**
     Replace double quotes with single quote
@@ -100,7 +100,7 @@ var escapeqq = utils.undoubleq = function(s) {
  */
 var doubleq = utils.doubleq = function(s) {
     return s.replace(/(\'\')/g,'\\\'');
-}
+};
 
 
 /**
@@ -113,7 +113,7 @@ var doubleq = utils.doubleq = function(s) {
 */
  var doubleqq = utils.doubleqq = function(s) {
     return s.replace(/\'/g,"\'");
-}
+};
 
 /**
     Cut BOM first character for UTF-8 files (for merging two files)
@@ -140,12 +140,13 @@ var loadFile = utils.loadFile = function(path, asy, success, error) {
 
     if((typeof exports == 'object') || (typeof Meteor != 'undefined' && Meteor.isServer)) {
 
+        var fs;
         if(typeof Meteor != 'undefined') {
             /** For Meteor */
-            var fs = Npm.require('fs');
+            fs = Npm.require('fs');
         } else {
             /** For Node.js */
-            var fs = require('fs');
+            fs = require('fs');
         }
 
         /* If path is empty, than read data from stdin (for Node) */
@@ -224,7 +225,7 @@ var loadFile = utils.loadFile = function(path, asy, success, error) {
                 SELECT * FROM TXT('#one') -- read data from HTML element with id="one" 
             */
             if((path.substr(0,1) == '#') && (typeof document != 'undefined')) {
-                var data = document.querySelector(path).textContent;
+                data = document.querySelector(path).textContent;
                 success(data);
             } else {
                 /* 
@@ -296,14 +297,14 @@ var loadBinaryFile = utils.loadBinaryFile = function(path, asy, success, error)
                 if(err) {
                     throw err;
                 }
-                var arr = new Array();
+                var arr = [];
                 for(var i = 0; i != data.length; ++i) arr[i] = String.fromCharCode(data[i]);
                 success(arr.join(""));
             });
 
         } else {
             var data = fs.readFileSync(path);
-            var arr = new Array();
+            var arr = [];
             for(var i = 0; i != data.length; ++i) arr[i] = String.fromCharCode(data[i]);
             success(arr.join(""));
         }
@@ -333,7 +334,7 @@ var loadBinaryFile = utils.loadBinaryFile = function(path, asy, success, error)
             };
             reader.readAsBinaryString(files[0]);    
         }
-    };
+    }
 };
 
 
@@ -352,7 +353,7 @@ var removeFile = utils.removeFile = function(path,cb) {
         });
     } else {
         throw new Error('You can remove files only in Node.js and Apache Cordova');
-    };
+    }
 };
 
 
@@ -360,7 +361,7 @@ var deleteFile = utils.deleteFile = function(path,cb){
     if(typeof exports == 'object') {
         var fs = require('fs');
         fs.unlink(path, cb);
-    };
+    }
 };
 
 var fileExists = utils.fileExists = function(path,cb){
@@ -423,7 +424,7 @@ var saveFile = utils.saveFile = function(path, data, cb) {
         if(typeof exports == 'object') {
             // For Node.js
             var fs = require('fs');
-            var data = fs.writeFileSync(path,data);
+            data = fs.writeFileSync(path,data);
             if(cb) res = cb(res);
         } else if(typeof cordova == 'object') {
             // For Apache Cordova
@@ -518,7 +519,7 @@ var saveFile = utils.saveFile = function(path, data, cb) {
 	            if(cb) res = cb(res);                		
         	}
         }
-    };
+    }
 
     return res;
 };
@@ -558,11 +559,15 @@ function isIE () {
 
 var hash = utils.hash = function hash(str){
     var h = 0;
-    if (str.length == 0) return h;
+    
+    if (0 === str.length) 
+        return h;
+
     for (var i = 0; i < str.length; i++) {
         h = ((h<<5)-h)+str.charCodeAt(i);
         h = h & h; 
    	}
+    
     return h;
 };
 
@@ -670,18 +675,18 @@ var arrayIntersectDeep = utils.arrayIntersectDeep  = function(a,b) {
   Deep clone obects
  */
 var cloneDeep = utils.cloneDeep = function cloneDeep(obj) {
-    if(obj == null || typeof(obj) != 'object')
+    if(null === obj || 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;
-}
+};
 
 /**
   Check equality of objects
@@ -727,7 +732,7 @@ var equalDeep = utils.equalDeep = function equalDeep (x, y, deep) {
   COmpare two object in deep
  */
 var deepEqual = utils.deepEqual = function (x, y) {
-  if ((typeof x == "object" && x != null) && (typeof y == "object" && y != null)) {
+  if ((typeof x == "object" && null !== x) && (typeof y == "object" && null !== y)) {
     if (Object.keys(x).length != Object.keys(y).length)
       return false;
 
@@ -747,7 +752,7 @@ var deepEqual = utils.deepEqual = function (x, y) {
     return false;
   else
     return true;
-}
+};
 
 
 /**
@@ -759,17 +764,18 @@ var distinctArray = utils.distinctArray = function(data) {
     var uniq = {};
     // TODO: Speedup, because Object.keys is slow
     for(var i=0,ilen=data.length;i<ilen;i++) {
+        var uix;
         if(typeof data[i] == 'object') {
-            var uix = Object.keys(data[i]).sort().map(function(k){return k+'`'+data[i][k]}).join('`');
+            uix = Object.keys(data[i]).sort().map(function(k){return k+'`'+data[i][k]}).join('`');
         } else {
-            var uix = data[i];  
+            uix = data[i];  
         }
         uniq[uix] = data[i];
-    };
+    }
     var res = [];
     for(var key in uniq) res.push(uniq[key]);
     return res;
-}
+};
 
 
 /** 
@@ -783,27 +789,27 @@ 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;
-};;
+};
 
 /**
    Flat array by first row
  */
 var flatArray = utils.flatArray = function(a) {
 //console.log(684,a);
-    if(!a || a.length == 0) return [];
+    if(!a || 0 === a.length) return [];
 
     // For recordsets
     if(typeof a == 'object' && a instanceof alasql.Recordset) {
-        return a.data.map(function(ai){return ai[a.columns[0].columnid]});
+        return a.data.map(function(ai){return ai[a.columns[0].columnid];});
     }
     // Else for other arrays
     var key = Object.keys(a[0])[0];
     if(typeof key == 'undefined') return [];
-    return a.map(function(ai) {return ai[key]});
+    return a.map(function(ai) {return ai[key];});
 };
 
 /**
@@ -831,8 +837,8 @@ var xlsnc = utils.xlsnc = function(i) {
         if(i>26) {
             i=((i/26)|0)-1;
             addr = String.fromCharCode(65+i%26)+addr;
-        };
-    };
+        }
+    }
     return addr;
 };
 
@@ -857,7 +863,8 @@ var domEmptyChildren = utils.domEmptyChildren = function (container){
   var len = container.childNodes.length;
   while (len--) {
     container.removeChild(container.lastChild);
-  };
+  }
 };
 
 
+

package/src/38query.js

@@ -63,13 +63,12 @@ function queryfn(query,oldscope,cb, A,B) {
 		source.query = query;
 		var rs = source.datafn(query, query.params, queryfn2, idx, alasql); 
 //		console.log(333,rs);
-		if(typeof rs != undefined) {
+		if(typeof rs !== undefined) {
 			// TODO - this is a hack: check if result is array - check all cases and
 			// make it more logical
 			if((query.intofn || query.intoallfn) && rs instanceof Array) rs = rs.length;
 			result = rs;
 		}
-//		console.log(444,result);
 //
 // Ugly hack to use in query.wherefn and source.srcwherefns functions
 // constructions like this.queriesdata['test'].
@@ -78,12 +77,13 @@ function queryfn(query,oldscope,cb, A,B) {
 // 
 		source.queriesdata = query.queriesdata;  
 	});
-	if(slen == 0) result = queryfn3(query);
+	if(0 === slen) 
+		result = queryfn3(query);
+	
 	return result;
-};
+}
 
 function queryfn2(data,idx,query) {
-
 //console.log(56,arguments);
 //		console.log(78,data, idx,query);
 //console.trace();
@@ -113,7 +113,7 @@ function queryfn2(data,idx,query) {
 	if(query.sourceslen>0) return;
 
 	return queryfn3(query);
-};
+}
 
 function queryfn3(query) {
 //console.log(55,query);
@@ -149,7 +149,7 @@ function queryfn3(query) {
 //			console.log(query.havingfns);
 	if(query.groupfn) {
 		query.data = [];
-		if(query.groups.length == 0) {
+		if(0 === query.groups.length) {
 			var g = {};
 			if(query.selectGroup.length>0) {
 //				console.log(query.selectGroup);
@@ -160,10 +160,10 @@ function queryfn3(query) {
 						g[sg.nick] = undefined;
 					}
 				});
-			};
+			}
 			query.groups = [g];
 //			console.log();
-		};
+		}
 		// 	console.log('EMPTY',query.groups);
 		// 	debugger;
 		// if(false && (query.groups.length == 1) && (Object.keys(query.groups[0]).length == 0)) {
@@ -171,33 +171,33 @@ function queryfn3(query) {
 		// } else {
 			for(var i=0,ilen=query.groups.length;i<ilen;i++) {
 	//			console.log(query.groups[i]);
-				var g = query.groups[i];
+				g = query.groups[i];
 				if((!query.havingfn) || query.havingfn(g,query.params,alasql)) {
 	//				console.log(g);
 					var d = query.selectgfn(g,query.params,alasql);
 					query.data.push(d);
-				};
+				}
 			};
 		// }
 
 //			query.groups = query.groups.filter();
-	};
-
+	}
 	// Remove distinct values	
-	doDistinct(query);	
-
+	doDistinct(query);
 
 	// UNION / UNION ALL
 	if(query.unionallfn) {
 // TODO Simplify this part of program
+		var ud, nd;
 		if(query.corresponding) {
 			if(!query.unionallfn.query.modifier) query.unionallfn.query.modifier = undefined;
-			var ud = query.unionallfn(query.params);
+			ud = query.unionallfn(query.params);
 		} else {
 			if(!query.unionallfn.query.modifier) query.unionallfn.query.modifier = 'RECORDSET';
-			var nd = query.unionallfn(query.params);
-			var ud = [];
-			for(var i=0,ilen=nd.data.length;i<ilen;i++) {
+			nd = query.unionallfn(query.params);
+			ud = [];
+			ilen=nd.data.length
+			for(var i=0;i<ilen;i++) {
 				var r = {};
 				for(var j=0,jlen=Math.min(query.columns.length,nd.columns.length);j<jlen;j++) {
 					r[query.columns[j].columnid] = nd.data[i][nd.columns[j].columnid];
@@ -210,14 +210,16 @@ function queryfn3(query) {
 
 		if(query.corresponding) {
 			if(!query.unionfn.query.modifier) query.unionfn.query.modifier = 'ARRAY';
-			var ud = query.unionfn(query.params);
+			ud = query.unionfn(query.params);
 		} else {
 			if(!query.unionfn.query.modifier) query.unionfn.query.modifier = 'RECORDSET';
-			var nd = query.unionfn(query.params);
-			var ud = [];
-			for(var i=0,ilen=nd.data.length;i<ilen;i++) {
-				var r = {};
-				for(var j=0,jlen=Math.min(query.columns.length,nd.columns.length);j<jlen;j++) {
+			nd = query.unionfn(query.params);
+			ud = [];
+			ilen=nd.data.length
+			for(var i=0;i<ilen;i++) {
+				r = {};
+				jlen=Math.min(query.columns.length,nd.columns.length);
+				for(var j=0;j<jlen;j++) {
 					r[query.columns[j].columnid] = nd.data[i][nd.columns[j].columnid];
 				}
 				ud.push(r);
@@ -244,6 +246,7 @@ function queryfn3(query) {
 		}
 
 
+
 		query.data = arrayExceptDeep(query.data, ud);
 	} else if(query.intersectfn) {
 		if(query.corresponding) {

package/src/424select.js

@@ -64,7 +64,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;
 		}
@@ -287,7 +287,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 {