Merge pull request #6416 from nextcloud/make-sure-sqlite-works-without-content

Ask the schema whether the table and column exist

lib/private/Repair/Owncloud/SaveAccountsTableData.php

@@ -23,8 +23,6 @@
 
 namespace OC\Repair\Owncloud;
 
-use Doctrine\DBAL\Exception\InvalidFieldNameException;
-use Doctrine\DBAL\Exception\TableNotFoundException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IConfig;
 use OCP\IDBConnection;
@@ -86,20 +84,15 @@ class SaveAccountsTableData implements IRepairStep {
 	 * @return bool
 	 */
 	protected function shouldRun() {
-		$query = $this->db->getQueryBuilder();
+		$schema = $this->db->createSchema();
-		$query->select('*')
-			->from('accounts')
-			->where($query->expr()->isNotNull('user_id'))
-			->setMaxResults(1);
 
-		try {
+		$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'accounts';
-			$query->execute();
+		if (!$schema->hasTable($tableName)) {
-			return true;
-		} catch (InvalidFieldNameException $e) {
-			return false;
-		} catch (TableNotFoundException $e) {
 			return false;
 		}
+
+		$table = $schema->getTable($tableName);
+		return $table->hasColumn('user_id');
 	}
 
 	/**