Version 0.0.51

Author: agershun

alasql.js

@@ -105,9 +105,10 @@ yy.Select.prototype.compileFrom = function(query) {
 //				return source.subquery(query.params, cb, idx, query);
 				var res;
 				source.subquery(query.params, function(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;
@@ -174,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/);

console/alasql.min.js

@@ -122,7 +122,7 @@ yy.Select.prototype.compileJoins = function(query) {
 //			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) {

dist/alasql.js

@@ -57,7 +57,7 @@ function compileSelectStar (query,alias) {
 			});
 //console.log(999,columns);			
 		} else {
-					console.log(60,alias,columns);
+//					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]};';

dist/alasql.js.map

@@ -17,16 +17,13 @@ describe('Test 18', function() {
 		db.exec('INSERT INTO test VALUES (6)');
 		db.exec('INSERT INTO test VALUES (7)');
 		var res = db.exec('SELECT VALUE SUM(a*2+1) AS aa FROM (SELECT a FROM test) q');
-//		console.log(20,res);
-
 		assert.equal(res, 63);
 
 		var res = db.exec('SELECT q.x, w.y '+
 			' FROM '+
 			   ' (SELECT test.a AS x FROM test WHERE a<5) q, '+
 			   ' (SELECT test.a AS y FROM test WHERE test.a>3) w '
 		);
-
 		assert.equal(res.length, 16);
 
 		done();