mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

[stable12] Ask the schema whether the table and column exist
This commit is contained in:
Morris Jobke 2017-09-11 23:20:58 +02:00 committed by GitHub
parent c81829fd74 e88a4a0b3d
commit 0c43183ac9
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/private/Repair/Owncloud/SaveAccountsTableData.php
View File

@ -23,8 +23,8 @@
namespace OC\Repair\Owncloud;
use Doctrine\DBAL\Exception\InvalidFieldNameException;
use Doctrine\DBAL\Exception\TableNotFoundException;
use OC\DB\Connection;
use OC\DB\MDB2SchemaManager;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IConfig;
use OCP\IDBConnection;
@ -40,7 +40,7 @@ class SaveAccountsTableData implements IRepairStep {
const BATCH_SIZE = 75;
/** @var IDBConnection */
/** @var IDBConnection|Connection */
protected $db;
/** @var IConfig */
@ -86,20 +86,18 @@ class SaveAccountsTableData implements IRepairStep {
* @return bool
*/
protected function shouldRun() {
$query = $this->db->getQueryBuilder();
$query->select('*')
->from('accounts')
->where($query->expr()->isNotNull('user_id'))
->setMaxResults(1);
// This is the equivalent of the new migration code that is used in 13+
$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
$this->db->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
$schema = $this->db->getSchemaManager()->createSchema();
try {
$query->execute();
return true;
} catch (InvalidFieldNameException $e) {
return false;
} catch (TableNotFoundException $e) {
$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'accounts';
if (!$schema->hasTable($tableName)) {
return false;
}
$table = $schema->getTable($tableName);
return $table->hasColumn('user_id');
}
/**