alasql 0.0.50 → 0.0.52

package/src/420from.js

@@ -48,10 +48,13 @@ yy.Select.prototype.compileFrom = function(query) {
 			joinmode: 'INNER',
 			onmiddlefn: returnTrue,			
 			srcwherefns: '',	// for optimization
-			srcwherefn: returnTrue			
+			srcwherefn: returnTrue,
+//			columns: []			
 		};
 
 		if(tq instanceof yy.Table) {
+			// Get columns from table
+			source.columns = alasql.databases[source.databaseid].tables[source.tableid].columns;
 //			console.log('test',alasql.options.autocommit);
 //				console.log(997,alasql.databases[source.databaseid].engineid);
 // console.log(0,source.databaseid);
@@ -89,14 +92,23 @@ yy.Select.prototype.compileFrom = function(query) {
 				};
 			}
 		} else if(tq instanceof yy.Select) {
+			if(typeof tq.modifier == 'undefined') {
+				tq.modifier = 'RECORDSET'; // Subqueries always return recordsets
+			}
+
 			source.subquery = tq.compile(query.database.databaseid);
+			source.columns = source.subquery.query.columns;
+//			console.log(101,source.columns);
+//			tq.columns;
+
 			source.datafn = function(query, params, cb, idx, alasql) {
 //				return source.subquery(query.params, cb, idx, query);
 				var res;
 				source.subquery(query.params, function(data){
-	//				console.log(512,data);
-					if(cb) res = cb(data,idx,query);
-					return data;
+					res = data.data;
+					if(cb) res = cb(res,idx,query);
+					return res;
+//					return data.data;
 				});
 //					console.log(515,res);
 				return res;
@@ -163,6 +175,7 @@ yy.Select.prototype.compileFrom = function(query) {
 };
 
 alasql.prepareFromData = function(data,array) {
+//console.log(177,data,array);
 	var res = data;
 	if(typeof data == "string") {
 		res = data.split(/\r?\n/);

package/src/421join.js

@@ -39,9 +39,12 @@ yy.Select.prototype.compileJoins = function(query) {
 				applymode: jn.applymode,
 				onmiddlefn: returnTrue,
 				srcwherefns: '',	// for optimization
-				srcwherefn: returnTrue
+				srcwherefn: returnTrue,
+				columns: [] // TODO check this
 			};
 			source.applyselect = jn.select.compile(query.database.databaseid);
+			source.columns = source.applyselect.query.columns;
+
 			source.datafn = function(query,params,cb,idx, alasql) {
 				var res;
 				if(cb) res = cb(res,idx,query);
@@ -60,7 +63,8 @@ yy.Select.prototype.compileJoins = function(query) {
 				joinmode: jn.joinmode,
 				onmiddlefn: returnTrue,
 				srcwherefns: '',	// for optimization
-				srcwherefn: returnTrue
+				srcwherefn: returnTrue,
+				columns: []				
 			};
 			//
 
@@ -69,6 +73,9 @@ yy.Select.prototype.compileJoins = function(query) {
 				throw new Error('Table \''+source.tableid+
 				'\' is not exists in database \''+source.databaseid)+'\'';
 			};
+
+			source.columns = alasql.databases[source.databaseid].tables[source.tableid].columns;
+
 			// source.data = query.database.tables[source.tableid].data;
 			if(alasql.options.autocommit && alasql.databases[source.databaseid].engineid) {
 //				console.log(997,alasql.databases[source.databaseid].engineid);
@@ -106,13 +113,16 @@ yy.Select.prototype.compileJoins = function(query) {
 				joinmode: jn.joinmode,
 				onmiddlefn: returnTrue,
 				srcwherefns: '',	// for optimization
-				srcwherefn: returnTrue
+				srcwherefn: returnTrue,
+				columns: []
 			};
 			source.subquery = tq.compile(query.database.databaseid);
+			source.columns = source.subquery.query.columns;
+			
 //			if(jn instanceof yy.Apply) {
 				source.datafn = function(query, params, cb, idx, alasql) {
 //					return cb(null,idx,alasql);
-					return source.subquery(query.params, null, cb, idx);
+					return source.subquery(query.params, null, cb, idx).data;
 				}				
 			// } else {
 			// 	source.datafn = function(query, params, cb, idx, alasql) {

package/src/423groupby.js

@@ -72,7 +72,7 @@ if(false) {
 //console.log(agroup);
 
 		// Start of group function
-		s += 'var g=this.xgroups[';
+		s += 'var acc,g=this.xgroups[';
 
 	//	var gcols = this.group.map(function(col){return col.columnid}); // Group fields with r
 		// Array with group columns from record
@@ -155,7 +155,9 @@ if(false) {
 					aft += ',g[\''+colas+'\']='+col.expression.toJavaScript('g',-1); 
 					return '';
 				} else if(col.aggregatorid == 'REDUCE') {
-					return '\''+colas+'\':alasql.aggr[\''+col.funcid+'\']('+colexp+'),'; 
+					query.removeKeys.push('_REDUCE_'+colas);
+					return '\''+colas+'\':alasql.aggr[\''+col.funcid+'\']('+colexp+',undefined,(acc={})),'
+					+'\'__REDUCE__'+colas+'\':acc,'; 
 				}
 				return '';
 			} else return '';
@@ -261,7 +263,7 @@ if(false) {
 				} else if(col.aggregatorid == 'AGGR') {
 					return pre+'g[\''+colas+'\']='+col.expression.toJavaScript('g',-1)+';'+post; 
 				} else if(col.aggregatorid == 'REDUCE') {
-					return pre+'g[\''+colas+'\']=alasql.aggr.'+col.funcid+'('+colexp+',g[\''+colas+'\']);'+post; 
+					return pre+'g[\''+colas+'\']=alasql.aggr.'+col.funcid+'('+colexp+',g[\''+colas+'\'],g[\'__REDUCE__'+colas+'\']);'+post; 
 				}
 				return '';
 			} else return '';

package/src/424select.js

@@ -20,9 +20,21 @@ function compileSelectStar (query,alias) {
 //	if(!alias) {
 //		sp += 'for(var k1 in p) var w=p[k1];for(var k2 in w){r[k2]=w[k2]};';
 //	} else 	{
-		if(query.aliases[alias].tableid) {
-			var columns = alasql.databases[query.aliases[alias].databaseid].tables[query.aliases[alias].tableid].columns;
-		};
+
+		// TODO move this out of this function 
+		query.ixsources = {};
+		query.sources.forEach(function(source){
+			query.ixsources[source.alias] = source;
+		});
+
+		var columns = query.ixsources[alias].columns;
+
+//		if(columns.length == 0 && query.aliases[alias].tableid) {
+//			var columns = alasql.databases[query.aliases[alias].databaseid].tables[query.aliases[alias].tableid].columns;
+//		};
+
+
+
 		// Check if this is a Table or other
 
 		if(columns && columns.length > 0) {
@@ -45,8 +57,10 @@ function compileSelectStar (query,alias) {
 			});
 //console.log(999,columns);			
 		} else {
+//					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;
 		}
@@ -219,7 +233,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 {
@@ -297,3 +311,20 @@ yy.Select.prototype.compileSelectGroup2 = function(query) {
 //	console.log('selectg:',s);
 	return new Function('g,params,alasql',s+'return r');
 }
+
+// SELECY * REMOVE [COLUMNS] col-list, LIKE ''
+yy.Select.prototype.compileRemoveColumns = function(query) {
+	if(typeof this.removecolumns != 'undefined') {
+		query.removeKeys = query.removeKeys.concat(
+			this.removecolumns.filter(function (column) {
+				return (typeof column.like == 'undefined');
+			}).map(function(column){return column.columnid}));
+
+//console.log(query.removeKeys,this.removecolumns);				
+		query.removeLikeKeys = this.removecolumns.filter(function (column) {
+				return (typeof column.like != 'undefined');
+			}).map(function(column){
+				return new RegExp(column.like.value.replace(/\%/g,'.*'),'g');
+			});
+	}
+}

package/src/55functions.js

@@ -172,4 +172,16 @@ alasql.aggr.GROUP_CONCAT = function(v,s){
     if(typeof s == "undefined") return v; else return s+','+v;
 };
 
+alasql.aggr.MEDIAN = function(v,s,acc){
+// Init
+if(typeof acc.arr == 'undefined') {
+  acc.arr = [v];
+  return v; 
+// Pass
+} else {
+  acc.arr.push(v);
+  var p = acc.arr.sort();
+  return p[(p.length/2|0)];     
+};
+};
 

package/src/70insert.js

@@ -132,7 +132,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/src/72delete.js

@@ -1,3 +1,208 @@
+<<<<<<< HEAD
+/*
+//
+// DELETE for Alasql.js
+// Date: 03.11.2014
+// (c) 2014, Andrey Gershun
+//
+*/
+
+yy.Delete = function (params) { return yy.extend(this, params); }
+yy.Delete.prototype.toString = function() {
+	var s = 'DELETE FROM '+this.table.toString();
+	if(this.where) s += ' WHERE '+this.where.toString();
+	return s;
+}
+
+yy.Delete.prototype.compile = function (databaseid) {
+//  console.log(11,this);
+	databaseid = this.table.databaseid || databaseid;
+	var tableid = this.table.tableid;
+	var statement;
+			var db = alasql.databases[databaseid];
+
+
+
+	if(this.where) {
+//		try {
+//		console.log(this, 22, this.where.toJavaScript('r',''));
+//	} catch(err){console.log(444,err)};
+//		var query = {};
+		wherefn = new Function('r,params','return ('+this.where.toJavaScript('r','')+')');
+//		console.log(wherefn);
+		statement = (function (params, cb) {
+			if(db.engineid && alasql.engines[db.engineid].deleteFromTable) {
+				return alasql.engines[db.engineid].deleteFromTable(databaseid, tableid, wherefn, params, cb);
+			}
+
+			if(alasql.options.autocommit && db.engineid && db.engineid == 'LOCALSTORAGE') {
+				alasql.engines[db.engineid].loadTableData(databaseid,tableid);
+			}
+
+			var table = db.tables[tableid];
+//			table.dirty = true;
+			var orignum = table.data.length;
+
+			var newtable = [];			
+			for(var i=0, ilen=table.data.length;i<ilen;i++) {
+				if(wherefn(table.data[i],params)) {
+					// Check for transaction - if it is not possible then return all back
+					if(table.delete) {
+						table.delete(i);
+					} else {
+						// SImply do not push
+					}
+				} else newtable.push(table.data[i]);
+			}
+//			table.data = table.data.filter(function(r){return !;});
+			table.data = newtable;
+			var res = orignum - table.data.length;
+			if(alasql.options.autocommit && db.engineid && db.engineid == 'LOCALSTORAGE') {
+				alasql.engines[db.engineid].saveTableData(databaseid,tableid);
+			}
+
+//			console.log('deletefn',table.data.length);
+			if(cb) cb(res);
+			return res;
+		});
+// .bind(query);
+
+// 		if(!this.queries) return;
+// 			query.queriesfn = this.queries.map(function(q) {
+// 			return q.compile(alasql.useid);
+// 		});
+
+	} else {
+		statement = function (params, cb) {
+			if(alasql.options.autocommit && db.engineid) {
+				alasql.engines[db.engineid].loadTableData(databaseid,tableid);
+			}
+
+			var table = db.tables[tableid];
+			table.dirty = true;
+			var orignum = db.tables[tableid].data.length;
+
+			table.deleteall();
+
+			if(alasql.options.autocommit && db.engineid) {
+				alasql.engines[db.engineid].saveTableData(databaseid,tableid);
+			}
+
+			if(cb) cb(orignum);
+			return orignum;
+		};
+	};
+
+	return statement;
+
+};
+
+yy.Delete.prototype.execute = function (databaseid, params, cb) {
+	return this.compile(databaseid)(params,cb);
+}
+||||||| merged common ancestors
+/*
+//
+// DELETE for Alasql.js
+// Date: 03.11.2014
+// (c) 2014, Andrey Gershun
+//
+*/
+
+yy.Delete = function (params) { return yy.extend(this, params); }
+yy.Delete.prototype.toString = function() {
+	var s = 'DELETE FROM '+this.table.toString();
+	if(this.where) s += ' WHERE '+this.where.toString();
+	return s;
+}
+
+yy.Delete.prototype.compile = function (databaseid) {
+//  console.log(11,this);
+	databaseid = this.table.databaseid || databaseid;
+	var tableid = this.table.tableid;
+	var statement;
+			var db = alasql.databases[databaseid];
+
+
+
+	if(this.where) {
+//		try {
+//		console.log(this, 22, this.where.toJavaScript('r',''));
+//	} catch(err){console.log(444,err)};
+//		var query = {};
+		wherefn = new Function('r,params','return ('+this.where.toJavaScript('r','')+')');
+//		console.log(wherefn);
+		statement = (function (params, cb) {
+			if(db.engineid && alasql.engines[db.engineid].deleteFromTable) {
+				return alasql.engines[db.engineid].deleteFromTable(databaseid, tableid, wherefn, params, cb);
+			}
+
+			if(alasql.options.autocommit && db.engineid && db.engineid == 'LOCALSTORAGE') {
+				alasql.engines[db.engineid].loadTableData(databaseid,tableid);
+			}
+
+			var table = db.tables[tableid];
+//			table.dirty = true;
+			var orignum = table.data.length;
+
+			var newtable = [];			
+			for(var i=0, ilen=table.data.length;i<ilen;i++) {
+				if(wherefn(table.data[i],params)) {
+					// Check for transaction - if it is not possible then return all back
+					if(table.delete) {
+						table.delete(i);
+					} else {
+						// SImply do not push
+					}
+				} else newtable.push(table.data[i]);
+			}
+//			table.data = table.data.filter(function(r){return !;});
+			table.data = newtable;
+			var res = orignum - table.data.length;
+			if(alasql.options.autocommit && db.engineid && db.engineid == 'LOCALSTORAGE') {
+				alasql.engines[db.engineid].saveTableData(databaseid,tableid);
+			}
+
+//			console.log('deletefn',table.data.length);
+			if(cb) cb(res);
+			return res;
+		});
+// .bind(query);
+
+// 		if(!this.queries) return;
+// 			query.queriesfn = this.queries.map(function(q) {
+// 			return q.compile(alasql.useid);
+// 		});
+
+	} else {
+		statement = function (params, cb) {
+			if(alasql.options.autocommit && db.engineid) {
+				alasql.engines[db.engineid].loadTableData(databaseid,tableid);
+			}
+
+			var table = db.tables[tableid];
+			table.dirty = true;
+			var orignum = db.tables[tableid].data.length;
+
+			table.deleteall();
+
+			if(alasql.options.autocommit && db.engineid) {
+				alasql.engines[db.engineid].saveTableData(databaseid,tableid);
+			}
+
+			if(cb) cb(orignum);
+			return orignum;
+		};
+	};
+
+	return statement;
+
+};
+
+yy.Delete.prototype.execute = function (databaseid, params, cb) {
+	return this.compile(databaseid)(params,cb);
+}
+=======
 /*
 //
 // DELETE for Alasql.js
@@ -100,3 +305,4 @@ yy.Delete.prototype.compile = function (databaseid) {
 yy.Delete.prototype.execute = function (databaseid, params, cb) {
 	return this.compile(databaseid)(params,cb);
 }
+>>>>>>> release/0.0.46

package/src/84from.js

@@ -75,6 +75,7 @@ alasql.from.HTML = function(selector, opts, cb, idx, query) {
 alasql.from.RANGE = function(start, finish, cb, idx, query) {
 	var res = [];
 	for(i=start;i<=finish;i++) res.push(i);
+//	res = new alasql.Recordset({data:res,columns:{columnid:'_'}});	
 	if(cb) res = cb(res, idx, query);
 	return res;
 }

package/src/alasqlparser.jison

@@ -88,7 +88,7 @@ NOT\s+LIKE									    return 'NOT_LIKE'
 'CLOSE'											return 'CLOSE'
 'COLLATE'										return 'COLLATE'
 "COLUMN"										return "COLUMN"
-"COLUMNS"										return "COLUMNS"
+"COLUMNS"										return "COLUMN"
 "COMMIT"										return "COMMIT"
 "CONSTRAINT"									return "CONSTRAINT"
 "CONTENT"										return "CONTENT"
@@ -150,8 +150,6 @@ NOT\s+LIKE									    return 'NOT_LIKE'
 'LEFT'											return 'LEFT'
 'LIKE'											return 'LIKE'
 'LIMIT'											return 'LIMIT'
-'SOURCE'										return 'SOURCE'
-'STRATEGY'										return 'STRATEGY'
 "MATCHED"										return "MATCHED"
 'MATRIX'										return 'MATRIX'	
 "MAX"											return "MAX"
@@ -185,6 +183,7 @@ NOT\s+LIKE									    return 'NOT_LIKE'
 'REDUCE'                                        return 'REDUCE'
 'REFERENCES'                                    return 'REFERENCES'
 'RELATIVE'                                      return 'RELATIVE'
+'REMOVE'                                        return 'REMOVE'
 'RENAME'                                        return 'RENAME'
 'REQUIRE'                                       return 'REQUIRE'
 'RESTORE'                                       return 'RESTORE'
@@ -201,6 +200,8 @@ NOT\s+LIKE									    return 'NOT_LIKE'
 'SETS'                                        	return 'SETS'
 'SHOW'                                        	return 'SHOW'
 'SOME'                                        	return 'SOME'
+'SOURCE'										return 'SOURCE'
+'STRATEGY'										return 'STRATEGY'
 'STORE'                                        	return 'STORE'
 "SUM"											return "SUM"
 'TABLE'											return 'TABLE'
@@ -460,11 +461,11 @@ WithTable
 /* SELECT */
 
 Select
-	: SelectClause IntoClause FromClause WhereClause GroupClause OrderClause LimitClause UnionClause 
+	: SelectClause RemoveClause? IntoClause FromClause WhereClause GroupClause OrderClause LimitClause UnionClause 
 		{   
 			yy.extend($$,$1); yy.extend($$,$2); yy.extend($$,$3); yy.extend($$,$4); 
 		    yy.extend($$,$5); yy.extend($$,$6);yy.extend($$,$7); 
-		    yy.extend($$,$8); 
+		    yy.extend($$,$8); yy.extend($$,$9); 
 		    $$ = $1;
 /*		    if(yy.exists) $$.exists = yy.exists;
 		    delete yy.exists;
@@ -474,6 +475,25 @@ Select
 	| SearchClause SearchFrom? SearchLet? SearchWhile? SearchLimit? SearchStrategy? SearchTimeout?
 	;
 
+RemoveClause
+	: REMOVE COLUMN? RemoveColumnsList
+		{ $$ = {removecolumns:$3}; } 
+	;
+
+RemoveColumnsList
+	: RemoveColumnsList COMMA RemoveColumn
+		{ $$ = $1; $$.push($3); }
+	| RemoveColumn
+		{ $$ = [$1]; }
+	;
+
+RemoveColumn
+	: Column
+		{ $$ = $1; }
+	| LIKE StringValue
+		{ $$ = {like:$2}; }	
+	;
+
 SearchClause
 	: SearchSelector
 	;
@@ -1804,9 +1824,9 @@ ShowTables
 	;
 
 ShowColumns
-	: SHOW COLUMNS FROM Table
+	: SHOW COLUMN FROM Table
 		{ $$ = new yy.ShowColumns({table: $4});}
-	| SHOW COLUMNS FROM Table FROM Literal
+	| SHOW COLUMN FROM Table FROM Literal
 		{ $$ = new yy.ShowColumns({table: $4, databaseid:$6});}
 	;