Fixed bug with .valueOf issue #142

AlaSQL · Apr 22, 2015 · d0c6127 · d0c6127
1 parent f347c7f
commit d0c6127
Show file tree

Hide file tree

Showing 12 changed files with 117 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@
 * Fixed MIN and MAX functions and aggregators #93
 * Found UPDATE bug with column/columnid
 
+* Todo: INFORMATION_SCHEMA PSEUDO DATABASE
+* columns
+* Fonts
+* Vertices
+
 ### 0.0.49 "Beijing" (19.04.2015 - 21.04.2015)
 * CREATE CLASS
 * INSERT INTO class

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.min.js b/dist/alasql.min.js
diff --git a/package.json b/package.json
@@ -7,7 +7,17 @@
     "example": "examples",
     "test": "test"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "dom-storage":"2.0.1",
+    "gulp":"3.8.11",
+    "gulp-changed":"1.2.1",
+    "gulp-concat-sourcemap":"1.3.1",
+    "gulp-shell":"0.4.1",
+    "jison":"0.4.15",
+    "lodash":"3.7.0",
+    "xlsjs":"0.7.15",
+    "xlsx":"0.8.0"
+    },
   "engines": [
     "node"
   ],

diff --git a/src/426orderby.js b/src/426orderby.js
@@ -41,15 +41,15 @@ yy.Select.prototype.compileOrder = function (query) {
 				// COLLATE NOCASE
 				if(ord.nocase) dg += '.toUpperCase()';
 
-				s += 'if(a[\''+columnid+"']"+dg+(ord.direction == 'ASC'?'>':'<')+'b[\''+columnid+"']"+dg+')return 1;';
-				s += 'if(a[\''+columnid+"']"+dg+'==b[\''+columnid+"']"+dg+'){';
+				s += 'if((a[\''+columnid+"']||'')"+dg+(ord.direction == 'ASC'?'>':'<')+'(b[\''+columnid+"']||'')"+dg+')return 1;';
+				s += 'if((a[\''+columnid+"']||'')"+dg+'==(b[\''+columnid+"']||'')"+dg+'){';
 
 			} else {
 				dg = '.valueOf()';
 				// COLLATE NOCASE
 				if(ord.nocase) dg += '.toUpperCase()';
-				s += 'if('+ord.toJavaScript('a','')+dg+(ord.direction == 'ASC'?'>':'<')+ord.toJavaScript('b','')+dg+')return 1;';
-				s += 'if('+ord.toJavaScript('a','')+dg+'=='+ord.toJavaScript('b','')+dg+'){';
+				s += 'if(('+ord.toJavaScript('a','')+"||'')"+dg+(ord.direction == 'ASC'?'>(':'<(')+ord.toJavaScript('b','')+"||'')"+dg+')return 1;';
+				s += 'if(('+ord.toJavaScript('a','')+"||'')"+dg+'==('+ord.toJavaScript('b','')+"||'')"+dg+'){';
 			}			
 
 //			if(columnid == '_') {

diff --git a/src/alasqlparser.jison b/src/alasqlparser.jison
@@ -2271,7 +2271,9 @@ CreateVertex
 		{ $$ = new yy.CreateVertex({class:$3}); yy.extend($$,$4); }
 	;
 CreateVertexSet
-	: SET SetColumnsList
+	: 
+		{$$ = undefined; }
+	| SET SetColumnsList
 		{ $$ = {sets:$2}; }
 	| CONTENT ExprList
 		{ $$ = {content:$2}; }

diff --git a/src/alasqlparser.js b/src/alasqlparser.js
diff --git a/test/test264.js b/test/test264.js
@@ -7,7 +7,7 @@ if(typeof exports === 'object') {
 
 if(typeof exports == 'object') {
 
-describe('Test 264 SPRINTF() function', function() {
+describe('Test 264 SELECT RECORDSET', function() {
 
   it('1. Test', function(done) {
   	var data = [{a:1,b:10},{b:2,a:45}];

diff --git a/test/test265.js b/test/test265.js
diff --git a/test/test301.js b/test/test301.js
@@ -18,6 +18,13 @@ describe('Test 301 Vertices and Edges', function() {
     var res = alasql('CREATE VERTEX Person SET name = "Olga",age=56,sex="F"');
     var res = alasql('CREATE VERTEX Person CONTENT {name:"Mike",age:45,sex:"M"},{name:"Paola",age:21,sex:"F"}');
     var res = alasql('CREATE VERTEX Person SELECT * FROM ?');
+    var res = alasql('CREATE VERTEX Person');
+    var res = alasql('CREATE VERTEX');
+    var res = alasql('SET @v1 = (CREATE VERTEX)');
+    var res = alasql('SET @v2 = (CREATE VERTEX)');
+    var res = alasql('SET @e12 = (CREATE EDGE FROM @v1 TO @v2)');
+    var res = alasql('SET @e12#name = "Lisa"');
+    var res = alasql('SET @e12#age = 43');
     done();    
   });