chore: merge conflicts

Author: wojtek-krysiak

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@admin-bro/sequelize",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Sequelize adapter for AdminBro",
   "main": "index.js",
   "scripts": {

src/resource.js

@@ -179,8 +179,8 @@ class Resource extends BaseResource {
     const parsedParams = { ...params }
     this.properties().forEach((property) => {
       const value = parsedParams[property.name()]
-      if (['number', 'float', 'reference'].includes(property.type())) {
-        if (value === '') {
+      if (value === '') {
+        if (property.isArray() || property.type() !== 'string') {
           delete parsedParams[property.name()]
         }
       }

src/utils/convert-filter.js

@@ -19,7 +19,12 @@ const convertFilter = (filter) => {
       }
       return {
         [Op.and]: [
-          where(fn('LOWER', col(property.name())), { [Op.like]: fn('LOWER', `%${escape(value)}%`) }),
+          ...(memo[Op.and] || []),
+          where(
+            fn('LOWER', col(`${property.sequelizePath.Model.name}.${property.name()}`)),
+            Op.like,
+            fn('LOWER', `%${escape(value)}%`),
+          ),
         ],
         ...memo,
       }