sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add default for dbtableprefix

remotes/origin/fix-10825
Morris Jobke 2014-12-23 13:32:25 +07:00
parent 6fd1a9563e
commit 95374e1404
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/command/db/converttype.php
Unescape Escape View File

@ -229,7 +229,7 @@ class ConvertType extends Command {
protected function getTables(Connection $db) {
$db->getConfiguration()->
setFilterSchemaAssetsExpression('/^'.$this->config->getSystemValue('dbtableprefix').'/');
setFilterSchemaAssetsExpression('/^'.$this->config->getSystemValue('dbtableprefix', 'oc_').'/');
return $db->getSchemaManager()->listTableNames();
}

2
lib/private/db/mdb2schemawriter.php
Unescape Escape View File

@ -23,7 +23,7 @@ class OC_DB_MDB2SchemaWriter {
$xml->addChild('charset', 'utf8');
$conn->getConfiguration()->
setFilterSchemaAssetsExpression('/^' . $config->getSystemValue('dbtableprefix') . '/');
setFilterSchemaAssetsExpression('/^' . $config->getSystemValue('dbtableprefix', 'oc_') . '/');
foreach ($conn->getSchemaManager()->listTables() as $table) {
self::saveTable($table, $xml->addChild('table'));

4
lib/private/db/migrator.php
Unescape Escape View File

@ -77,7 +77,7 @@ class Migrator {
$tables = $targetSchema->getTables();
$this->connection->getConfiguration()->
setFilterSchemaAssetsExpression('/^' . $this->config->getSystemValue('dbtableprefix') . '/');
setFilterSchemaAssetsExpression('/^' . $this->config->getSystemValue('dbtableprefix', 'oc_') . '/');
$existingTables = $this->connection->getSchemaManager()->listTableNames();
foreach ($tables as $table) {
@ -162,7 +162,7 @@ class Migrator {
protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
$connection->getConfiguration()->
setFilterSchemaAssetsExpression('/^' . $this->config->getSystemValue('dbtableprefix') . '/');
setFilterSchemaAssetsExpression('/^' . $this->config->getSystemValue('dbtableprefix', 'oc_') . '/');
$sourceSchema = $connection->getSchemaManager()->createSchema();
// remove tables we don't know about

2
lib/private/db/pgsqltools.php
Unescape Escape View File

@ -34,7 +34,7 @@ class PgSqlTools {
public function resynchronizeDatabaseSequences(Connection $conn) {
$databaseName = $conn->getDatabase();
$conn->getConfiguration()->
setFilterSchemaAssetsExpression('/^' . $this->config->getSystemValue('dbtableprefix') . '/');
setFilterSchemaAssetsExpression('/^' . $this->config->getSystemValue('dbtableprefix', 'oc_') . '/');
foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
$sequenceName = $sequence->getName();