summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-01-07 20:13:16 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-01-07 20:13:16 +0100
commit1cc6fddead3f71d170557e99ef8676724cb58a6e (patch)
tree62afe797fb92bba787b98345264cbe10644c1863 /core
parente30740648686c6b9e6743f8551487274d43b006c (diff)
parent190cc2bb6762c5f505e1e90bd582caa4fecb9cce (diff)
downloadnextcloud-server-1cc6fddead3f71d170557e99ef8676724cb58a6e.tar.gz
nextcloud-server-1cc6fddead3f71d170557e99ef8676724cb58a6e.zip
Merge pull request #21498 from owncloud/cleanup-OC_DB
Cleanup OC_DB methods
Diffstat (limited to 'core')
-rw-r--r--core/command/db/converttype.php2
-rw-r--r--core/command/db/generatechangescript.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index dd91d86b8d7..77e614a5853 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -166,7 +166,7 @@ class ConvertType extends Command {
$this->validateInput($input, $output);
$this->readPassword($input, $output);
- $fromDB = \OC_DB::getConnection();
+ $fromDB = \OC::$server->getDatabaseConnection();
$toDB = $this->getToDBConnection($input, $output);
if ($input->getOption('clear-schema')) {
diff --git a/core/command/db/generatechangescript.php b/core/command/db/generatechangescript.php
index 956921206f9..c94a6a9b0e4 100644
--- a/core/command/db/generatechangescript.php
+++ b/core/command/db/generatechangescript.php
@@ -45,7 +45,7 @@ class GenerateChangeScript extends Command {
$file = $input->getArgument('schema-xml');
- $schemaManager = new \OC\DB\MDB2SchemaManager(\OC_DB::getConnection());
+ $schemaManager = new \OC\DB\MDB2SchemaManager(\OC::$server->getDatabaseConnection());
try {
$result = $schemaManager->updateDbFromStructure($file, true);