wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11336 from nextcloud/bugfix/3342/database-name-prefix-sqlite

Browse source 
Allow --database-name and --database-table-prefix for sqlite from occ
This commit is contained in:
Morris Jobke 2018-10-02 21:44:03 +02:00 committed by GitHub
commit 19d552e00b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/private/DB/ConnectionFactory.php
View file

@ -38,6 +38,12 @@ use OC\SystemConfig;
* Takes care of creating and configuring Doctrine connections.
*/
class ConnectionFactory {
/** @var string default database name */
const DEFAULT_DBNAME = 'owncloud';
/** @var string default database table prefix */
const DEFAULT_DBTABLEPREFIX = 'oc_';
/**
* @var array
*
@ -186,7 +192,7 @@ class ConnectionFactory {
'user' => $this->config->getValue('dbuser', ''),
'password' => $this->config->getValue('dbpassword', ''),
];
$name = $this->config->getValue('dbname', 'owncloud');
$name = $this->config->getValue('dbname', self::DEFAULT_DBNAME);
if ($this->normalizeType($type) === 'sqlite3') {
$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
@ -197,7 +203,7 @@ class ConnectionFactory {
$connectionParams['dbname'] = $name;
}
$connectionParams['tablePrefix'] = $this->config->getValue('dbtableprefix', 'oc_');
$connectionParams['tablePrefix'] = $this->config->getValue('dbtableprefix', self::DEFAULT_DBTABLEPREFIX);
$connectionParams['sqlite.journal_mode'] = $this->config->getValue('sqlite.journal_mode', 'WAL');
//additional driver options, eg. for mysql ssl

42
lib/private/Setup/Sqlite.php
View file

@ -20,8 +20,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\Setup;
use OC\DB\ConnectionFactory;
class Sqlite extends AbstractDatabase {
public $dbprettyname = 'Sqlite';
@ -30,16 +33,43 @@ class Sqlite extends AbstractDatabase {
}
public function initialize($config) {
/*
* Web: When using web based installer its not possible to set dbname
* or dbtableprefix. Defaults used from ConnectionFactory and dbtype = 'sqlite'
* is written to config.php.
*
* Cli: When --database-name or --database-table-prefix empty or default
* dbtype = 'sqlite' is written to config.php. If you choose a value different
* from default these values are written to config.php. This is required because
* in connection factory configuration is obtained from config.php.
*/
$this->dbName = empty($config['dbname'])
? ConnectionFactory::DEFAULT_DBNAME
: $config['dbname'];
$this->tablePrefix = empty($config['dbtableprefix'])
? ConnectionFactory::DEFAULT_DBTABLEPREFIX
: $config['dbtableprefix'];
if ($this->dbName !== ConnectionFactory::DEFAULT_DBNAME) {
$this->config->setValue('dbname', $this->dbName);
}
if ($this->tablePrefix !== ConnectionFactory::DEFAULT_DBTABLEPREFIX) {
$this->config->setValue('dbtableprefix', $this->tablePrefix);
}
}
public function setupDatabase($username) {
$datadir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data');
$datadir = $this->config->getValue(
'datadirectory',
\OC::$SERVERROOT . '/data'
);
//delete the old sqlite database first, might cause infinte loops otherwise
if(file_exists("$datadir/owncloud.db")) {
unlink("$datadir/owncloud.db");
$sqliteFile = $datadir . '/' . $this->dbName . 'db';
if (file_exists($sqliteFile)) {
unlink($sqliteFile);
}
//in case of sqlite, we can always fill the database
error_log("creating sqlite db");
}
}