Merge v0.6.2

AlaSQL · May 31, 2020 · 574956b · 574956b
2 parents 51a1c42 + d40e199
commit 574956b
Show file tree

Hide file tree

Showing 16 changed files with 5,449 additions and 5,423 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
 
+### 0.6.2 (31.05.2020)
+
+
+- Add: Use NOT BETWEEN without parenthesis. 
+
+
 
 ### 0.6.1 (20.05.2020)
 

diff --git a/bower.json b/bower.json
@@ -57,5 +57,5 @@
 		"bin",
 		"lib"
 	],
-	"version": "0.6.1"
+	"version": "0.6.2"
 }
diff --git a/dist/alasql-worker.js b/dist/alasql-worker.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.6.1 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.6.2 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.6.1
+@version 0.6.2
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

diff --git a/dist/alasql-worker.min.js b/dist/alasql-worker.min.js
diff --git a/dist/alasql.fs.js b/dist/alasql.fs.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.6.1 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.6.2 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.6.1
+@version 0.6.2
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.6.1';
+alasql.version = '0.6.2';
 
 /**
 	Debug flag
@@ -10796,7 +10796,7 @@ yy.Op.prototype.toString = function() {
 
 		return s;
 	}
-	if (this.op === 'BETWEEN') {
+	if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
 		var s = this.left.toString() + ' ' + this.op + ' '
 			+ this.right1.toString() + ' AND ' + this.right2.toString();
 

diff --git a/dist/alasql.js b/dist/alasql.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.6.1 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.6.2 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.6.1
+@version 0.6.2
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.6.1';
+alasql.version = '0.6.2';
 
 /**
 	Debug flag
@@ -10791,7 +10791,7 @@ yy.Op.prototype.toString = function() {
 
 		return s;
 	}
-	if (this.op === 'BETWEEN') {
+	if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
 		var s = this.left.toString() + ' ' + this.op + ' '
 			+ this.right1.toString() + ' AND ' + this.right2.toString();
 

diff --git a/dist/alasql.min.js b/dist/alasql.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "alasql",
 	"description": "Use SQL to select and filter javascript data - including relational joins and search in nested objects (JSON). Export to and import from Excel and CSV",
-	"version": "0.6.1",
+	"version": "0.6.2",
 	"author": "Andrey Gershun <agershun@gmail.com>",
 	"contributors": [
 		"Mathias Rangel Wulff <m@rawu.dk>"

diff --git a/src/50expression.js b/src/50expression.js
@@ -263,7 +263,7 @@ yy.Op.prototype.toString = function() {
 
 		return s;
 	}
-	if (this.op === 'BETWEEN') {
+	if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
 		var s = this.left.toString() + ' ' + this.op + ' '
 			+ this.right1.toString() + ' AND ' + this.right2.toString();
 

diff --git a/test/coverage/coverage.json b/test/coverage/coverage.json