summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-01-13 10:31:04 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-01-13 10:31:04 +0100
commitdc86cbd1e275f01840b304751a02ecbe4043c51e (patch)
treee209ec2a077be264fc654fa0d595007eed3469db /core
parent67168e12e6d786e916ffdbf72cda5e69be0a680e (diff)
parent1d2bef0a0116eefdd81221ba7502497845f0747b (diff)
downloadnextcloud-server-dc86cbd1e275f01840b304751a02ecbe4043c51e.tar.gz
nextcloud-server-dc86cbd1e275f01840b304751a02ecbe4043c51e.zip
Merge pull request #13271 from owncloud/fix-table-prefix-oracle-master
Use a special filter expression for Oracle to filter the prefix - fixes ...
Diffstat (limited to 'core')
-rw-r--r--core/command/db/converttype.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index 8d1560b0511..9d03b705d12 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -228,8 +228,9 @@ class ConvertType extends Command {
}
protected function getTables(Connection $db) {
+ $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
$db->getConfiguration()->
- setFilterSchemaAssetsExpression('/^'.$this->config->getSystemValue('dbtableprefix', 'oc_').'/');
+ setFilterSchemaAssetsExpression($filterExpression);
return $db->getSchemaManager()->listTableNames();
}