@@ -16,6 +16,8 @@ var modelGenerators = {
1616
1717var MIN_SERVER_VERSION = '1.10.0'
1818
19+ var Op = Sequelize . Op
20+
1921class SqlStoreError extends Error {
2022 constructor ( properties ) {
2123 super ( )
@@ -56,6 +58,7 @@ SqlStore.prototype.initialise = function (resourceConfig) {
5658 } else {
5759 var database = self . config . database || resourceConfig . resource
5860 var sequelizeArgs = [ database , self . config . username , self . config . password , {
61+ operatorsAliases : false ,
5962 dialect : self . config . dialect ,
6063 dialectOptions : self . config . dialectOptions ,
6164 host : self . config . host ,
@@ -307,11 +310,11 @@ SqlStore.prototype._scalarFilterElementToWhereObj = function (element) {
307310 var op = element . operator
308311 if ( ! op ) return value
309312
310- if ( op === '>' ) return { $gt : value }
311- if ( op === '<' ) return { $lt : value }
313+ if ( op === '>' ) return { [ Op . gt ] : value }
314+ if ( op === '<' ) return { [ Op . lt ] : value }
312315
313- var iLikeOperator = '$ like'
314- if ( self . sequelize . getDialect ( ) === 'postgres' ) iLikeOperator = '$ iLike'
316+ var iLikeOperator = Op . like
317+ if ( self . sequelize . getDialect ( ) === 'postgres' ) iLikeOperator = Op . iLike
315318
316319 if ( op === '~' ) {
317320 var caseInsensitiveEqualExpression = { }
@@ -337,7 +340,7 @@ SqlStore.prototype._filterElementToSearchBlock = function (filterElement) {
337340 if ( filterElement . length === 1 ) {
338341 return whereObjs [ 0 ]
339342 }
340- return { $or : whereObjs }
343+ return { [ Op . or ] : whereObjs }
341344}
342345
343346SqlStore . prototype . _getSearchBlock = function ( filter ) {
0 commit comments