diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-03-03 16:43:47 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-03-03 16:43:47 +0100 |
| commit | 1761b162e65e24ade7c9db1d96341a49e29f653f (patch) | |
| tree | 2b7e47d02adea1aeab9e8a6dab4b9c7ff23f6ca8 | |
| parent | be27188649c25190aca19e1a4b3dbb58eef129f8 (diff) | |
| parent | 6be8ab65a5bd4e166a03b108477bc0e39cd35766 (diff) | |
| download | nextcloud-server-1761b162e65e24ade7c9db1d96341a49e29f653f.tar.gz nextcloud-server-1761b162e65e24ade7c9db1d96341a49e29f653f.zip | |
Merge pull request #14660 from metaworx/replace-static-dbtableprefix-with-config-dbtableprefix
use `dbtableprefix` for temp table and index names
| -rw-r--r-- | lib/private/db/migrator.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php index fcf5aae0258..f55b5078c0e 100644 --- a/lib/private/db/migrator.php +++ b/lib/private/db/migrator.php @@ -100,7 +100,7 @@ class Migrator { * @return string */ protected function generateTemporaryTableName($name) { - return 'oc_' . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS); + return $this->config->getSystemValue('dbtableprefix', 'oc_') . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS); } /** @@ -151,7 +151,7 @@ class Migrator { $indexName = $index->getName(); } else { // avoid conflicts in index names - $indexName = 'oc_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS); + $indexName = $this->config->getSystemValue('dbtableprefix', 'oc_') . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS); } $newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary()); } |