Remove OC_DB::getConnection

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')) {

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);

lib/private/db.php

@@ -35,13 +35,6 @@
  */
 class OC_DB {
 
-	/**
-	 * @return \OCP\IDBConnection
-	 */
-	static public function getConnection() {
-		return \OC::$server->getDatabaseConnection();
-	}
-
 	/**
 	 * get MDB2 schema manager
 	 *

lib/private/files/cache/storage.php

@@ -58,10 +58,10 @@ class Storage {
 		if ($row = self::getStorageById($this->storageId)) {
 			$this->numericId = $row['numeric_id'];
 		} else {
-			$connection = \OC_DB::getConnection();
+			$connection = \OC::$server->getDatabaseConnection();
 			$available = $isAvailable ? 1 : 0;
 			if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
-				$this->numericId = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*storages');
+				$this->numericId = $connection->lastInsertId('*PREFIX*storages');
 			} else {
 				if ($row = self::getStorageById($this->storageId)) {
 					$this->numericId = $row['numeric_id'];

lib/private/repair.php

@@ -136,10 +136,11 @@ class Repair extends BasicEmitter {
 	 * @return array of RepairStep instances
 	 */
 	public static function getBeforeUpgradeRepairSteps() {
+		$connection = \OC::$server->getDatabaseConnection();
 		$steps = [
 			new InnoDB(),
-			new Collation(\OC::$server->getConfig(), \OC_DB::getConnection()),
+			new Collation(\OC::$server->getConfig(), $connection),
-			new SqliteAutoincrement(\OC_DB::getConnection()),
+			new SqliteAutoincrement($connection),
 			new SearchLuceneTables(),
 		];
 

lib/private/repair/innodb.php

@@ -37,7 +37,7 @@ class InnoDB extends BasicEmitter implements \OC\RepairStep {
 	 * Fix mime types
 	 */
 	public function run() {
-		$connection = \OC_DB::getConnection();
+		$connection = \OC::$server->getDatabaseConnection();
 		if (!$connection->getDatabasePlatform() instanceof MySqlPlatform) {
 			$this->emit('\OC\Repair', 'info', array('Not a mysql database -> nothing to do'));
 			return;

lib/private/repair/searchlucenetables.php

@@ -52,10 +52,10 @@ class SearchLuceneTables extends BasicEmitter implements \OC\RepairStep {
 	 * search_lucene will then reindex the fileids without a status when the next indexing job is executed
 	 */
 	public function run() {
-		if (\OC_DB::tableExists('lucene_status')) {
+		$connection = \OC::$server->getDatabaseConnection();
+		if ($connection->tableExists('lucene_status')) {
 			$this->emit('\OC\Repair', 'info', array('removing duplicate entries from lucene_status'));
 
-			$connection = \OC_DB::getConnection();
 			$query = $connection->prepare('
 				DELETE FROM `*PREFIX*lucene_status`
 				WHERE `fileid` IN (

lib/private/server.php

@@ -242,8 +242,8 @@ class Server extends ServerContainer implements IServerContainer {
 		$this->registerService('SystemConfig', function ($c) use ($config) {
 			return new \OC\SystemConfig($config);
 		});
-		$this->registerService('AppConfig', function ($c) {
+		$this->registerService('AppConfig', function (Server $c) {
-			return new \OC\AppConfig(\OC_DB::getConnection());
+			return new \OC\AppConfig($c->getDatabaseConnection());
 		});
 		$this->registerService('L10NFactory', function ($c) {
 			return new \OC\L10N\Factory();

lib/private/share/share.php

@@ -436,7 +436,7 @@ class Share extends Constants {
 
 				// TODO: inject connection, hopefully one day in the future when this
 				// class isn't static anymore...
-				$conn = \OC_DB::getConnection();
+				$conn = \OC::$server->getDatabaseConnection();
 				$result = $conn->executeQuery(
 					'SELECT ' . $select . ' FROM `*PREFIX*share` ' . $where,
 					$arguments,

lib/private/tags.php

@@ -215,7 +215,7 @@ class Tags implements \OCP\ITags {
 		$entries = array();
 
 		try {
-			$conn = \OC_DB::getConnection();
+			$conn = \OC::$server->getDatabaseConnection();
 			$chunks = array_chunk($objIds, 900, false);
 			foreach ($chunks as $chunk) {
 				$result = $conn->executeQuery(

tests/lib/app.php

@@ -461,7 +461,7 @@ class Test_App extends \Test\TestCase {
 		$appConfig = $this->getMock(
 			'\OC\AppConfig',
 			array('getValues'),
-			array(\OC_DB::getConnection()),
+			array(\OC::$server->getDatabaseConnection()),
 			'',
 			false
 		);
@@ -488,8 +488,8 @@ class Test_App extends \Test\TestCase {
 	 * Restore the original app config service.
 	 */
 	private function restoreAppConfig() {
-		\OC::$server->registerService('AppConfig', function ($c) {
+		\OC::$server->registerService('AppConfig', function (\OC\Server $c) {
-			return new \OC\AppConfig(\OC_DB::getConnection());
+			return new \OC\AppConfig($c->getDatabaseConnection());
 		});
 		\OC::$server->registerService('AppManager', function (\OC\Server $c) {
 			return new \OC\App\AppManager($c->getUserSession(), $c->getAppConfig(), $c->getGroupManager(), $c->getMemCacheFactory());

tests/lib/db/mdb2schemamanager.php

@@ -32,7 +32,7 @@ class MDB2SchemaManager extends \Test\TestCase {
 
 	public function testAutoIncrement() {
 
-		$connection = \OC_DB::getConnection();
+		$connection = \OC::$server->getDatabaseConnection();
 		if ($connection->getDatabasePlatform() instanceof OraclePlatform) {
 			$this->markTestSkipped('Adding auto increment columns in Oracle is not supported.');
 		}

tests/lib/db/migrator.php

@@ -45,7 +45,7 @@ class Migrator extends \Test\TestCase {
 		parent::setUp();
 
 		$this->config = \OC::$server->getConfig();
-		$this->connection = \OC_DB::getConnection();
+		$this->connection = \OC::$server->getDatabaseConnection();
 		if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
 			$this->markTestSkipped('DB migration tests are not supported on OCI');
 		}

tests/lib/db/mysqlmigration.php

@@ -22,7 +22,7 @@ class TestMySqlMigration extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->connection = \OC_DB::getConnection();
+		$this->connection = \OC::$server->getDatabaseConnection();
 		if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) {
 			$this->markTestSkipped("Test only relevant on MySql");
 		}

tests/lib/db/sqlitemigration.php

@@ -22,7 +22,7 @@ class TestSqliteMigration extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->connection = \OC_DB::getConnection();
+		$this->connection = \OC::$server->getDatabaseConnection();
 		if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
 			$this->markTestSkipped("Test only relevant on Sqlite");
 		}

tests/lib/dbschema.php

@@ -51,7 +51,7 @@ class Test_DBSchema extends \Test\TestCase {
 	 * @medium
 	 */
 	public function testSchema() {
-		$platform = \OC_DB::getConnection()->getDatabasePlatform();
+		$platform = \OC::$server->getDatabaseConnection()->getDatabasePlatform();
 		$this->doTestSchemaCreating();
 		$this->doTestSchemaChanging();
 		$this->doTestSchemaDumping();
@@ -94,7 +94,7 @@ class Test_DBSchema extends \Test\TestCase {
 	 * @param string $table
 	 */
 	public function assertTableNotExist($table) {
-		$platform = \OC_DB::getConnection()->getDatabasePlatform();
+		$platform = \OC::$server->getDatabaseConnection()->getDatabasePlatform();
 		if ($platform instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
 			// sqlite removes the tables after closing the DB
 			$this->assertTrue(true);

tests/lib/repair/repaircollation.php

@@ -48,7 +48,7 @@ class TestRepairCollation extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->connection = \OC_DB::getConnection();
+		$this->connection = \OC::$server->getDatabaseConnection();
 		$this->config = \OC::$server->getConfig();
 		if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) {
 			$this->markTestSkipped("Test only relevant on MySql");

tests/lib/repair/repairinnodb.php

@@ -28,7 +28,7 @@ class RepairInnoDB extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->connection = \OC_DB::getConnection();
+		$this->connection = \OC::$server->getDatabaseConnection();
 		if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) {
 			$this->markTestSkipped("Test only relevant on MySql");
 		}

tests/lib/repair/repairsqliteautoincrement.php

@@ -38,7 +38,7 @@ class RepairSqliteAutoincrement extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->connection = \OC_DB::getConnection();
+		$this->connection = \OC::$server->getDatabaseConnection();
 		$this->config = \OC::$server->getConfig();
 		if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
 			$this->markTestSkipped("Test only relevant on Sqlite");

tests/lib/tags.php

@@ -60,7 +60,7 @@ class Test_Tags extends \Test\TestCase {
 	}
 
 	protected function tearDown() {
-		$conn = \OC_DB::getConnection();
+		$conn = \OC::$server->getDatabaseConnection();
 		$conn->executeQuery('DELETE FROM `*PREFIX*vcategory_to_object`');
 		$conn->executeQuery('DELETE FROM `*PREFIX*vcategory`');
 
@@ -199,7 +199,7 @@ class Test_Tags extends \Test\TestCase {
 		$tagId = $tagData[0]['id'];
 		$tagType = $tagData[0]['type'];
 
-		$conn = \OC_DB::getConnection();
+		$conn = \OC::$server->getDatabaseConnection();
 		$statement = $conn->prepare(
 				'INSERT INTO `*PREFIX*vcategory_to_object` ' .
 				'(`objid`, `categoryid`, `type`) VALUES ' .