Skip to content

Commit af33358

Browse files
author
samj
committed
Adds NOT BETWEEN scenario to yy.Op.toString() logic
1 parent 3391079 commit af33358

File tree

7 files changed

+30
-14
lines changed

7 files changed

+30
-14
lines changed

dist/alasql-worker.js

100755100644
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
//! AlaSQL v0.6.1 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
1+
//! AlaSQL v0.6.1-develop-33910799undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
22
/*
33
@module alasql
4-
@version 0.6.1
4+
@version 0.6.1-develop-33910799undefined
55
66
AlaSQL - JavaScript SQL database
77
© 2014-2016 Andrey Gershun & Mathias Rangel Wulff

dist/alasql-worker.min.js

100755100644
+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/alasql.fs.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
//! AlaSQL v0.6.1 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
1+
//! AlaSQL v0.6.1-develop-33910799undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
22
/*
33
@module alasql
4-
@version 0.6.1
4+
@version 0.6.1-develop-33910799undefined
55

66
AlaSQL - JavaScript SQL database
77
© 2014-2016 Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
142142
Current version of alasql
143143
@constant {string}
144144
*/
145-
alasql.version = '0.6.1';
145+
alasql.version = '0.6.1-develop-33910799undefined';
146146

147147
/**
148148
Debug flag
@@ -10796,7 +10796,7 @@ yy.Op.prototype.toString = function() {
1079610796

1079710797
return s;
1079810798
}
10799-
if (this.op === 'BETWEEN') {
10799+
if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
1080010800
var s = this.left.toString() + ' ' + this.op + ' '
1080110801
+ this.right1.toString() + ' AND ' + this.right2.toString();
1080210802

dist/alasql.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
//! AlaSQL v0.6.1 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
1+
//! AlaSQL v0.6.1-develop-33910799undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
22
/*
33
@module alasql
4-
@version 0.6.1
4+
@version 0.6.1-develop-33910799undefined
55

66
AlaSQL - JavaScript SQL database
77
© 2014-2016 Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
142142
Current version of alasql
143143
@constant {string}
144144
*/
145-
alasql.version = '0.6.1';
145+
alasql.version = '0.6.1-develop-33910799undefined';
146146

147147
/**
148148
Debug flag
@@ -10791,7 +10791,7 @@ yy.Op.prototype.toString = function() {
1079110791

1079210792
return s;
1079310793
}
10794-
if (this.op === 'BETWEEN') {
10794+
if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
1079510795
var s = this.left.toString() + ' ' + this.op + ' '
1079610796
+ this.right1.toString() + ' AND ' + this.right2.toString();
1079710797

dist/alasql.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/50expression.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ yy.Op.prototype.toString = function() {
263263

264264
return s;
265265
}
266-
if (this.op === 'BETWEEN') {
266+
if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
267267
var s = this.left.toString() + ' ' + this.op + ' '
268268
+ this.right1.toString() + ' AND ' + this.right2.toString();
269269

test/test810.js

+16
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,22 @@ describe('Test ' + test + ' - yy.Op for BETWEEN returning correct toString() res
2020
var result = betweenOp.toString();
2121

2222

23+
assert.equal(result, expectedResult);
24+
});
25+
26+
it('yy.Op.toString() returns correct value when op === NOT BETWEEN', function() {
27+
var expectedResult = "id NOT BETWEEN 1 AND 3"
28+
29+
var betweenOp = new alasql.yy.Op({
30+
"left": new alasql.yy.Column({columnid: "id"}),
31+
"op": "NOT BETWEEN",
32+
"right1": new alasql.yy.NumValue({value: 1}),
33+
"right2": new alasql.yy.NumValue({value: 3})
34+
});
35+
36+
var result = betweenOp.toString();
37+
38+
2339
assert.equal(result, expectedResult);
2440
});
2541
});

0 commit comments

Comments
 (0)