Skip to content

Commit f425262

Browse files
committed
Remove brackets around between clause
1 parent 7f6f87d commit f425262

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/template/templates.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export default {
22
between({field, start, end, notOperator}) {
3-
return `${field} ${notOperator} BETWEEN ( ${start} AND ${end} )`;
3+
return `${field} ${notOperator} BETWEEN ${start} AND ${end}`;
44
},
55

66
is({field, value, notOperator}) {

src/test/buildWhereClause.test.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ describe('testing buildWhereClause module', () => {
196196
b IS NOT null AND
197197
c NOT IN ('1', '2') AND
198198
(
199-
b NOT BETWEEN ( 15 AND 19 ) AND
200-
c BETWEEN ( '1' AND '2' )
199+
b NOT BETWEEN 15 AND 19 AND
200+
c BETWEEN '1' AND '2'
201201
)
202202
)
203203
`
@@ -259,8 +259,8 @@ describe('testing buildWhereClause module', () => {
259259
}
260260
],
261261
`
262-
birth BETWEEN ( '1975-01-01' AND '1999-12-31' )
263-
AND birth NOT BETWEEN ( '1975-01-01' AND '1999-12-31' )
262+
birth BETWEEN '1975-01-01' AND '1999-12-31'
263+
AND birth NOT BETWEEN '1975-01-01' AND '1999-12-31'
264264
`
265265
],
266266
])('testing with each utility', (received, expected) => {
@@ -283,7 +283,7 @@ describe('testing buildWhereClause module', () => {
283283
end: '5'
284284
},
285285
`
286-
A BETWEEN ( '2' AND '5' )
286+
A BETWEEN '2' AND '5'
287287
`
288288
],
289289
[
@@ -293,7 +293,7 @@ describe('testing buildWhereClause module', () => {
293293
end: 5
294294
},
295295
`
296-
A BETWEEN ( 2 AND 5 )
296+
A BETWEEN 2 AND 5
297297
`
298298
],
299299
[
@@ -302,7 +302,7 @@ describe('testing buildWhereClause module', () => {
302302
value: [2, 5],
303303
},
304304
`
305-
A BETWEEN ( 2 AND 5 )
305+
A BETWEEN 2 AND 5
306306
`
307307
],
308308
[
@@ -314,7 +314,7 @@ describe('testing buildWhereClause module', () => {
314314
},
315315
},
316316
`
317-
A BETWEEN ( 2 AND 5 )
317+
A BETWEEN 2 AND 5
318318
`
319319
]
320320
])('testing between module', (received, expected) => {
@@ -329,7 +329,7 @@ describe('testing buildWhereClause module', () => {
329329
end: new Date(2019, 10, 30)
330330
},
331331
`
332-
A BETWEEN ( '2019-11-15' AND '2019-11-30' )
332+
A BETWEEN '2019-11-15' AND '2019-11-30'
333333
`
334334
],
335335
[
@@ -341,7 +341,7 @@ describe('testing buildWhereClause module', () => {
341341
}
342342
},
343343
`
344-
A BETWEEN ( '2019-11-15' AND '2019-11-30' )
344+
A BETWEEN '2019-11-15' AND '2019-11-30'
345345
`
346346
],
347347

@@ -351,7 +351,7 @@ describe('testing buildWhereClause module', () => {
351351
value: [ new Date(2019, 10, 15), new Date(2019, 10, 30) ]
352352
},
353353
`
354-
A BETWEEN ( '2019-11-15' AND '2019-11-30' )
354+
A BETWEEN '2019-11-15' AND '2019-11-30'
355355
`
356356
],
357357
[
@@ -362,7 +362,7 @@ describe('testing buildWhereClause module', () => {
362362
format: 'MM-yyyy-dd',
363363
},
364364
`
365-
A BETWEEN ( '11-2019-15' AND '11-2019-30' )
365+
A BETWEEN '11-2019-15' AND '11-2019-30'
366366
`
367367
],
368368
[
@@ -375,7 +375,7 @@ describe('testing buildWhereClause module', () => {
375375
}
376376
},
377377
`
378-
A BETWEEN ( '11-2019-15' AND '11-2019-30' )
378+
A BETWEEN '11-2019-15' AND '11-2019-30'
379379
`
380380
],
381381

@@ -386,7 +386,7 @@ describe('testing buildWhereClause module', () => {
386386
value: [ new Date(2019, 10, 15), new Date(2019, 10, 30) ]
387387
},
388388
`
389-
A BETWEEN ( '11-2019-15' AND '11-2019-30' )
389+
A BETWEEN '11-2019-15' AND '11-2019-30'
390390
`
391391
],
392392
])('Testing DateBetween operator', (received, expected) => {

src/test/index.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ describe('testing json2sql module', () => {
198198
`
199199
SELECT A, B, count(D) AS CNT FROM STUDENTS
200200
WHERE NAME = 'Piyush' AND ROLL = 13 AND (A = 5 OR A = 10) AND
201-
BIRTH BETWEEN ( '1975-01-01' AND '1999-12-31' )
201+
BIRTH BETWEEN '1975-01-01' AND '1999-12-31'
202202
GROUP BY A, B, C
203203
ORDER BY A
204204
EXTERNAL NAME 'TestFuncs$MyMath.pow'

0 commit comments

Comments
 (0)