diff --git a/packages/strapi-hook-bookshelf/lib/index.js b/packages/strapi-hook-bookshelf/lib/index.js
index a5d651de30..42548eb2d4 100644
--- a/packages/strapi-hook-bookshelf/lib/index.js
+++ b/packages/strapi-hook-bookshelf/lib/index.js
@@ -461,7 +461,7 @@ module.exports = function(strapi) {
                         const connection = strapi.config.connections[definition.connection];
                         let columns = Object.keys(attributes).filter(attribute => ['string', 'text'].includes(attributes[attribute].type));
 
-                        if (!columns) {
+                        if (!columns.length) {
                           // No text columns founds, exit from creating Fulltext Index
                           return;
                         }
diff --git a/packages/strapi-hook-bookshelf/lib/utils/connectivity.js b/packages/strapi-hook-bookshelf/lib/utils/connectivity.js
index 31cbf709cb..34671904b7 100644
--- a/packages/strapi-hook-bookshelf/lib/utils/connectivity.js
+++ b/packages/strapi-hook-bookshelf/lib/utils/connectivity.js
@@ -5,6 +5,7 @@ const inquirer = require('inquirer');
 const rimraf = require('rimraf');
 
 module.exports = (scope, success, error) => {
+  // eslint-disable-next-line import/no-unresolved
   const knex = require('knex')({
     client: scope.client.module,
     connection: Object.assign({}, scope.database.settings, {