summaryrefslogtreecommitdiffstats
path: root/core/command
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-01-09 14:17:14 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-01-09 14:17:14 +0100
commit1f1643b35fef94b64e6997e1af2a3ca87fe0d889 (patch)
tree8f8a766aa872e9350d4633e52bbee4af3485e19c /core/command
parentd2ca9e9c0faa3f6838482c14318a60b6c9e2a800 (diff)
parent95374e1404e6342dcd34d40bcb4d8acb197bf831 (diff)
downloadnextcloud-server-1f1643b35fef94b64e6997e1af2a3ca87fe0d889.tar.gz
nextcloud-server-1f1643b35fef94b64e6997e1af2a3ca87fe0d889.zip
Merge pull request #12995 from owncloud/tbelau666-master
Use Doctrines filter by table name
Diffstat (limited to 'core/command')
-rw-r--r--core/command/db/converttype.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index 617910b3a90..8d1560b0511 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -228,6 +228,8 @@ class ConvertType extends Command {
}
protected function getTables(Connection $db) {
+ $db->getConfiguration()->
+ setFilterSchemaAssetsExpression('/^'.$this->config->getSystemValue('dbtableprefix', 'oc_').'/');
return $db->getSchemaManager()->listTableNames();
}
@@ -264,7 +266,7 @@ class ConvertType extends Command {
$this->copyTable($fromDB, $toDB, $table, $input, $output);
}
if ($input->getArgument('type') === 'pgsql') {
- $tools = new \OC\DB\PgSqlTools;
+ $tools = new \OC\DB\PgSqlTools($this->config);
$tools->resynchronizeDatabaseSequences($toDB);
}
// save new database config