Merge pull request #3246 from nextcloud/fix-sqlite-dependency

Remove useless dependency on SQLite (non-PDO)
nextcloud · Jan 26, 2017 · e21170b · e21170b
2 parents 43315e2 + 4536ead
commit e21170b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
@@ -125,8 +125,8 @@ protected function getAvailableDbDriversForPdo() {
 	public function getSupportedDatabases($allowAllDatabases = false) {
 		$availableDatabases = array(
 			'sqlite' =>  array(
-				'type' => 'class',
-				'call' => 'SQLite3',
+				'type' => 'pdo',
+				'call' => 'sqlite',
 				'name' => 'SQLite'
 			),
 			'mysql' => array(
@@ -163,9 +163,7 @@ public function getSupportedDatabases($allowAllDatabases = false) {
 				$type = $availableDatabases[$database]['type'];
 				$call = $availableDatabases[$database]['call'];
 
-				if($type === 'class') {
-					$working = $this->class_exists($call);
-				} elseif ($type === 'function') {
+				if ($type === 'function') {
 					$working = $this->is_callable($call);
 				} elseif($type === 'pdo') {
 					$working = in_array($call, $this->getAvailableDbDriversForPdo(), TRUE);

diff --git a/tests/lib/SetupTest.php b/tests/lib/SetupTest.php
@@ -53,18 +53,14 @@ public function testGetSupportedDatabasesWithOneWorking() {
 			->will($this->returnValue(
 				array('sqlite', 'mysql', 'oci')
 			));
-		$this->setupClass
-			->expects($this->once())
-			->method('class_exists')
-			->will($this->returnValue(true));
 		$this->setupClass
 			->expects($this->once())
 			->method('is_callable')
 			->will($this->returnValue(false));
 		$this->setupClass
 			->expects($this->any())
 			->method('getAvailableDbDriversForPdo')
-			->will($this->returnValue([]));
+			->will($this->returnValue(['sqlite']));
 		$result = $this->setupClass->getSupportedDatabases();
 		$expectedResult = array(
 			'sqlite' => 'SQLite'
@@ -80,10 +76,6 @@ public function testGetSupportedDatabasesWithNoWorking() {
 			->will($this->returnValue(
 				array('sqlite', 'mysql', 'oci', 'pgsql')
 			));
-		$this->setupClass
-			->expects($this->any())
-			->method('class_exists')
-			->will($this->returnValue(false));
 		$this->setupClass
 			->expects($this->any())
 			->method('is_callable')
@@ -104,18 +96,14 @@ public function testGetSupportedDatabasesWithAllWorking() {
 			->will($this->returnValue(
 				array('sqlite', 'mysql', 'pgsql', 'oci')
 			));
-		$this->setupClass
-			->expects($this->any())
-			->method('class_exists')
-			->will($this->returnValue(true));
 		$this->setupClass
 			->expects($this->any())
 			->method('is_callable')
 			->will($this->returnValue(true));
 		$this->setupClass
 			->expects($this->any())
 			->method('getAvailableDbDriversForPdo')
-			->will($this->returnValue(['mysql', 'pgsql']));
+			->will($this->returnValue(['sqlite', 'mysql', 'pgsql']));
 		$result = $this->setupClass->getSupportedDatabases();
 		$expectedResult = array(
 			'sqlite' => 'SQLite',