yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove options pool for non sqlite3 clients (#6469)

Browse Source 
Signed-off-by: abelsoares <abelbarbosasoares@gmail.com>
This commit is contained in:
Abel Soares 2020-06-11 11:04:41 +01:00 committed by GitHub
parent aec77b1b95
commit af634b7f32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/strapi-connector-bookshelf/lib/knex.js
View File

@ -99,31 +99,13 @@ module.exports = strapi => {
timezone: _.get(connection.settings, 'timezone', 'utc'),
filename: _.get(connection.settings, 'filename', '.tmp/data.db'),
},
...connection.options,
debug: _.get(connection.options, 'debug', false),
acquireConnectionTimeout: _.get(connection.options, 'acquireConnectionTimeout'),
migrations: _.get(connection.options, 'migrations'),
useNullAsDefault: _.get(connection.options, 'useNullAsDefault'),
},
strapi.config.hook.settings.knex,
defaultConfig
);
if (connection.settings.client !== 'sqlite3') {
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
),
};
}
// Resolve path to the directory containing the database file.
const fileDirectory = options.connection.filename
? path.dirname(path.resolve(strapi.config.appPath, options.connection.filename))