yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 11:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #591 from strapi/fix/mariadb

Browse Source 
Remove user key from generated databases.json file
This commit is contained in:
Jim LAURIE 2018-02-07 11:33:14 +01:00 committed by GitHub
commit e87ed71c07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-bookshelf/lib/utils/connectivity.js
View File

@ -10,7 +10,7 @@ const logger = require('strapi-utils').logger;
module.exports = (scope, success, error) => { module.exports = (scope, success, error) => {
const knex = require(path.resolve(`${scope.rootPath}/node_modules/knex`))({ const knex = require(path.resolve(`${scope.rootPath}/node_modules/knex`))({
client: scope.client.module, client: scope.client.module,
connection: Object.assign(scope.database.settings, { connection: Object.assign({}, scope.database.settings, {
user: scope.database.settings.username user: scope.database.settings.username
}) })
}); });