mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-03 23:00:14 -05:00
Fixed detection of Windows environment when connecting to SQLite temp DB
fixes https://github.com/TryGhost/Toolbox/issues/284 - this section of code rewrites `/tmp` in the SQlite filename to the temp dir - the fix was only intended for Windows environments, because they typically don't have a `/tmp` dir - this commit adds a `process.platform` check for Windows - it also moves the code into the DB connection file instead of the config lib
This commit is contained in:
parent
4ddba47b00
commit
82a60ae155
2 changed files with 13 additions and 9 deletions
|
@ -1,4 +1,8 @@
|
||||||
|
const _ = require('lodash');
|
||||||
const knex = require('knex');
|
const knex = require('knex');
|
||||||
|
const os = require('os');
|
||||||
|
|
||||||
|
const logging = require('@tryghost/logging');
|
||||||
const config = require('../../../shared/config');
|
const config = require('../../../shared/config');
|
||||||
let knexInstance;
|
let knexInstance;
|
||||||
|
|
||||||
|
@ -30,6 +34,15 @@ function configure(dbConfig) {
|
||||||
// Force bthreads to use child_process backend until a worker_thread-compatible version of sqlite3 is published
|
// Force bthreads to use child_process backend until a worker_thread-compatible version of sqlite3 is published
|
||||||
// https://github.com/mapbox/node-sqlite3/issues/1386
|
// https://github.com/mapbox/node-sqlite3/issues/1386
|
||||||
process.env.BTHREADS_BACKEND = 'child_process';
|
process.env.BTHREADS_BACKEND = 'child_process';
|
||||||
|
|
||||||
|
// In the default SQLite test config we set the path to /tmp/ghost-test.db,
|
||||||
|
// but this won't work on Windows, so we need to replace the /tmp bit with
|
||||||
|
// the Windows temp folder
|
||||||
|
const filename = dbConfig.connection.filename;
|
||||||
|
if (process.platform === 'win32' && _.isString(filename) && filename.match(/^\/tmp/)) {
|
||||||
|
dbConfig.connection.filename = filename.replace(/^\/tmp/, os.tmpdir());
|
||||||
|
logging.info(`Ghost DB path: ${dbConfig.connection.filename}`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (client === 'mysql2') {
|
if (client === 'mysql2') {
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const fs = require('fs-extra');
|
const fs = require('fs-extra');
|
||||||
const os = require('os');
|
|
||||||
const _ = require('lodash');
|
const _ = require('lodash');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -73,14 +72,6 @@ const sanitizeDatabaseProperties = function sanitizeDatabaseProperties(nconf) {
|
||||||
|
|
||||||
if (nconf.get('database:client') === 'sqlite3') {
|
if (nconf.get('database:client') === 'sqlite3') {
|
||||||
makePathsAbsolute(nconf, nconf.get('database:connection'), 'database:connection');
|
makePathsAbsolute(nconf, nconf.get('database:connection'), 'database:connection');
|
||||||
|
|
||||||
// In the default SQLite test config we set the path to /tmp/ghost-test.db,
|
|
||||||
// but this won't work on Windows, so we need to replace the /tmp bit with
|
|
||||||
// the Windows temp folder
|
|
||||||
const filename = nconf.get('database:connection:filename');
|
|
||||||
if (_.isString(filename) && filename.match(/^\/tmp/)) {
|
|
||||||
nconf.set('database:connection:filename', filename.replace(/^\/tmp/, os.tmpdir()));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue