diff --git a/packages/strapi-hook-knex/lib/index.js b/packages/strapi-hook-knex/lib/index.js index 8ac4877be1..4fca4e6398 100644 --- a/packages/strapi-hook-knex/lib/index.js +++ b/packages/strapi-hook-knex/lib/index.js @@ -91,25 +91,25 @@ module.exports = strapi => { password: _.get(connection.settings, 'password'), database: _.get(connection.settings, 'database'), charset: _.get(connection.settings, 'charset'), - schema: _.get(connection.settings, 'schema') || 'public', + schema: _.get(connection.settings, 'schema', 'public'), port: _.get(connection.settings, 'port'), socket: _.get(connection.settings, 'socketPath'), - ssl: _.get(connection.settings, 'ssl') || false, - timezone: _.get(connection.settings, 'timezone') || 'utc', + ssl: _.get(connection.settings, 'ssl', false), + timezone: _.get(connection.settings, 'timezone', 'utc'), }, - debug: _.get(connection.options, 'debug') || false, + debug: _.get(connection.options, 'debug', false), acquireConnectionTimeout: _.get(connection.options, 'acquireConnectionTimeout'), migrations: _.get(connection.options, 'migrations') }, strapi.config.hook.settings.knex); options.pool = { - min: _.get(connection.options, 'pool.min') || 0, - max: _.get(connection.options, 'pool.max') || 10, - acquireTimeoutMillis: _.get(connection.options, 'pool.acquireTimeoutMillis') || 2000, - createTimeoutMillis: _.get(connection.options, 'pool.createTimeoutMillis') || 2000, - idleTimeoutMillis: _.get(connection.options, 'pool.idleTimeoutMillis') || 30000, - reapIntervalMillis: _.get(connection.options, 'pool.reapIntervalMillis') || 1000, - createRetryIntervalMillis: _.get(connection.options, 'pool.createRetryIntervalMillis') || 200, + min: _.get(connection.options, 'pool.min', 0), + max: _.get(connection.options, 'pool.max', 10), + acquireTimeoutMillis: _.get(connection.options, 'pool.acquireTimeoutMillis', 2000), + createTimeoutMillis: _.get(connection.options, 'pool.createTimeoutMillis', 2000), + idleTimeoutMillis: _.get(connection.options, 'pool.idleTimeoutMillis', 30000), + reapIntervalMillis: _.get(connection.options, 'pool.reapIntervalMillis', 1000), + createRetryIntervalMillis: _.get(connection.options, 'pool.createRetryIntervalMillis', 200), }; if (options.client === 'pg') {