mysql-simple-query
Advanced tools
Comparing version 1.0.17 to 1.0.18
{ | ||
"name": "mysql-simple-query", | ||
"version": "1.0.17", | ||
"version": "1.0.18", | ||
"description": "Simple query wrapper for mysql-promise to make querying, inserting, updating, and deleting easier for developers.", | ||
@@ -5,0 +5,0 @@ "main": "mysqlSimpleQuery.js", |
@@ -64,3 +64,7 @@ const dbQuery = require('./util/dbQuery'); | ||
whereBetween(key, array) { | ||
whereBetween(key, array, condition) { | ||
if (condition) { | ||
this.whereLikeCondition = condition; | ||
} | ||
this.whereBetweenStatement[key] = array; | ||
@@ -94,4 +98,10 @@ } | ||
parseWhereBetween() { | ||
let whereInStatementUsed = false; | ||
if(!isEmpty(this.whereInStatement)) { | ||
whereInStatementUsed = true; | ||
} | ||
if(!isEmpty(this.whereBetweenStatement)) { | ||
return dbQuery.parseWhereBetween(this.whereBetweenStatement, this.whereConditionUsed); | ||
return dbQuery.parseWhereBetween(this.whereBetweenStatement, whereInStatementUsed); | ||
} | ||
@@ -98,0 +108,0 @@ |
@@ -183,2 +183,18 @@ const expect = require('chai').expect; | ||
}); | ||
it('query with where in and where between clause', () => { | ||
const test = new mysqlSimpleQuery(); | ||
const size = '18x8.5'; | ||
const sizeArray = size.split('x'); | ||
const sizeFormatted = `${sizeArray[0]}.00x${sizeArray[1]}.00`; | ||
test.select('*'); | ||
test.from('table'); | ||
test.whereIn('size', [size, sizeFormatted]); | ||
test.whereBetween('offset', ['123', '456']); | ||
const testResults = test.query(); | ||
expect(testResults).to.equal('SELECT * FROM table WHERE size IN ("18x8.5","18.00x8.5.00") AND offset BETWEEN 123 AND 456;'); | ||
}); | ||
}); |
32918
842