From a5f0cc653963210228b1992568286f6e4330aff3 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sun, 23 Sep 2018 15:52:28 +0200 Subject: [PATCH 1/3] --database-name or --database-table-prefix are ignored for sqlite The default implementation of initialize in AbstractDatabase writes database information to config.php. The method is overwritten in Sqlite but parent is never called. Database-Name and Database-Table-Prefix are never written to config.php. But from this point setup use values from config. Signed-off-by: Daniel Kesselberg --- lib/private/Setup/Sqlite.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/private/Setup/Sqlite.php b/lib/private/Setup/Sqlite.php index d95e70c8b0..406c1e6fc9 100644 --- a/lib/private/Setup/Sqlite.php +++ b/lib/private/Setup/Sqlite.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OC\Setup; class Sqlite extends AbstractDatabase { @@ -29,14 +30,11 @@ class Sqlite extends AbstractDatabase { return array(); } - public function initialize($config) { - } - public function setupDatabase($username) { $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")) { + if (file_exists("$datadir/owncloud.db")) { unlink("$datadir/owncloud.db"); } //in case of sqlite, we can always fill the database From 0ee191bf44a4204dae0dd5ee641ccbf6720e1341 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sun, 23 Sep 2018 18:15:57 +0200 Subject: [PATCH 2/3] Use const for dbname and dbtableprefix defaults Signed-off-by: Daniel Kesselberg --- lib/private/DB/ConnectionFactory.php | 10 +++++-- lib/private/Setup/Sqlite.php | 41 +++++++++++++++++++++++----- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/lib/private/DB/ConnectionFactory.php b/lib/private/DB/ConnectionFactory.php index 9fc2ed42c3..d6526a14b7 100644 --- a/lib/private/DB/ConnectionFactory.php +++ b/lib/private/DB/ConnectionFactory.php @@ -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 diff --git a/lib/private/Setup/Sqlite.php b/lib/private/Setup/Sqlite.php index 406c1e6fc9..f0682b807e 100644 --- a/lib/private/Setup/Sqlite.php +++ b/lib/private/Setup/Sqlite.php @@ -23,6 +23,8 @@ namespace OC\Setup; +use OC\DB\ConnectionFactory; + class Sqlite extends AbstractDatabase { public $dbprettyname = 'Sqlite'; @@ -30,14 +32,39 @@ class Sqlite extends AbstractDatabase { return array(); } - public function setupDatabase($username) { - $datadir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data'); + 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. + */ - //delete the old sqlite database first, might cause infinte loops otherwise - if (file_exists("$datadir/owncloud.db")) { - unlink("$datadir/owncloud.db"); + $this->dbName = $config['dbname'] ?? ConnectionFactory::DEFAULT_DBNAME; + $this->tablePrefix = $config['dbtableprefix'] ?? ConnectionFactory::DEFAULT_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' + ); + + $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"); } } From 9d7e51fd56e9ac1283fb84e2a9af966d1d1bb212 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sun, 23 Sep 2018 18:25:48 +0200 Subject: [PATCH 3/3] Use empty instead ?? because dbname is '' sometimes Signed-off-by: Daniel Kesselberg --- lib/private/Setup/Sqlite.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/private/Setup/Sqlite.php b/lib/private/Setup/Sqlite.php index f0682b807e..0debb3464a 100644 --- a/lib/private/Setup/Sqlite.php +++ b/lib/private/Setup/Sqlite.php @@ -44,8 +44,13 @@ class Sqlite extends AbstractDatabase { * in connection factory configuration is obtained from config.php. */ - $this->dbName = $config['dbname'] ?? ConnectionFactory::DEFAULT_DBNAME; - $this->tablePrefix = $config['dbtableprefix'] ?? ConnectionFactory::DEFAULT_DBTABLEPREFIX; + $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);