SEARCH SET()

AlaSQL · May 5, 2015 · c476c8c · c476c8c
1 parent 3cee863
commit c476c8c
Show file tree

Hide file tree

Showing 10 changed files with 1,536 additions and 1,386 deletions.
diff --git a/alasql.js b/alasql.js
diff --git a/console/alasql.min.js b/console/alasql.min.js
diff --git a/dist/alasql.js b/dist/alasql.js
diff --git a/dist/alasql.js.map b/dist/alasql.js.map
diff --git a/dist/alasql.min.js b/dist/alasql.min.js
diff --git a/src/35search.js b/src/35search.js
@@ -223,7 +223,7 @@ yy.Search.prototype.execute = function (databaseid, params, cb) {
 
 
 		} else if(sel.srchid) {
-			var r = alasql.srch[sel.srchid.toUpperCase()](value,sel.args,stope);
+			var r = alasql.srch[sel.srchid.toUpperCase()](value,sel.args,stope,params);
 		} else {
 			throw new Error('Selector not found');
 		}
@@ -413,7 +413,35 @@ alasql.srch.AS = function(val,args) {
   return {status: 1, values: [val]};
 };
 
+// Transform expression
+alasql.srch.CLONEDEEP = function(val,args) {
+	// TODO something wrong
+	var z = cloneDeep(val);
+  return {status: 1, values: [z]};
+};
+
+// // Transform expression
+// alasql.srch.DELETE = function(val,args) {
+// 	// TODO something wrong
+// 	delete val;
+//   return {status: 1, values: []};
+// };
+
+
 alasql.srch.TO = function(val,args) {
   alasql.vars[args[0]].push(val);
   return {status: 1, values: [val]};
 };
+
+// Transform expression
+alasql.srch.SET = function(val,args,stope,params) {
+//	console.log(arguments);
+	var s = args.map(function(st){
+		return 'x[\''+st.column.columnid+'\']='+st.expression.toJavaScript('x','');
+	}).join(';');
+	var setfn = new Function('x,params,alasql',s);
+
+	setfn(val,params,alasql);
+
+  return {status: 1, values: [val]};
+};
diff --git a/src/alasqlparser.jison b/src/alasqlparser.jison
@@ -542,7 +542,9 @@ SearchSelector
 		{ $$ = {srchid:"IN"}; }
 	| DOLLAR 
 		{ $$ = {srchid:"CONTENT"}; }
-	| DOT DOT 
+/*	| DELETE LPAR RPAR
+		{ $$ = {srchid:"DELETE"}; }
+*/	| DOT DOT 
 		{ $$ = {srchid:"PARENT"}; }
 	| Json
 		{ $$ = {srchid:"EX",args:[new yy.Json({value:$1})]}; }
@@ -552,6 +554,8 @@ SearchSelector
 		{ $$ = {srchid:"AS", args:[$3]}; }	
 	| TO AT Literal
 		{ $$ = {srchid:"TO", args:[$3]}; }	
+	| SET LPAR SetColumnsList RPAR
+		{ $$ = {srchid:"SET", args:$3}; }	
 
 	| LPAR SearchSelector* RPAR PlusStar 
 		{ $$ = {selid:$4,args:$2 }; }

diff --git a/src/alasqlparser.js b/src/alasqlparser.js
diff --git a/test/test306.js b/test/test306.js
@@ -68,7 +68,8 @@ describe('Test 306 XML reader', function() {
 
   it('7. SEARCH INTO ',function(done){
      alasql('SEARCH XML /graph/edges/% INTO CSV({headers:true}) FROM XML("test306a.xml")',[],function(res){
-        console.log(res);
+//        console.log('>>',res,'<<');
+        assert(res == "id,source,target\n0,0,1\n");
 //         assert.deepEqual(res, [ { id: '0', source: '0', target: '1' } ]);
        done();    
      });

diff --git a/test/test307.js b/test/test307.js
@@ -0,0 +1,52 @@
+if(typeof exports === 'object') {
+	var assert = require("assert");
+	var alasql = require('..');
+} else {
+	__dirname = '.';
+};
+
+describe('Test 307 special selectors', function() {
+
+  it('0. Create database ',function(done){
+    alasql('CREATE DATABASE test307;USE test307');
+    done();
+  });
+
+
+  it('1. SET selector',function(done){
+    var data = [{a:1,b:10},{a:2,b:20}];
+    var res = alasql('SEARCH / set(b=a*3) FROM ?',[data]);
+    // console.log(res);
+    // console.log(data);
+    assert.deepEqual(res,[ { a: 1, b: 3 }, { a: 2, b: 6 } ]);
+    assert.deepEqual(data,[ { a: 1, b: 3 }, { a: 2, b: 6 } ]);
+    done();    
+  });
+
+  it('2. SET selector',function(done){
+    var data = [{a:1,b:10},{a:2,b:20}];
+    var res = alasql('SEARCH / clonedeep() set(b=a*3) FROM ?',[data]);
+    // console.log(res);
+    // console.log(data);
+    assert.deepEqual(res,[ { a: 1, b: 3 }, { a: 2, b: 6 } ]);
+    assert.deepEqual(data,[ { a: 1, b: 10 }, { a: 2, b: 20 } ]);
+    done();    
+  });
+
+  // it('3. DELETE selector',function(done){
+  //   var data = [{a:1,b:10},{a:2,b:20}];
+  //   var res = alasql('SEARCH / ok(a=1)  FROM ?',[data]);
+  //   console.log(res);
+  //   console.log(data);
+  //   // assert.deepEqual(res,[ { a: 1, b: 3 }, { a: 2, b: 6 } ]);
+  //   // assert.deepEqual(data,[ { a: 1, b: 10 }, { a: 2, b: 20 } ]);
+  //   done();    
+  // });
+
+  it('99. Drop database ',function(done){
+    alasql('DROP DATABASE test307');
+    done();
+  });
+
+});
+