Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump doctrine/dbal to 3.3 in master #35234

Merged
merged 5 commits into from
Nov 22, 2022
Merged

Bump doctrine/dbal to 3.3 in master #35234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f61b865
Bump doctrine/dbal to 3.3 in master
come-nc Nov 17, 2022
9983af0
Switch to new 3rdparty branch
come-nc Nov 17, 2022
378630f
Fix psalm issues following doctrine/dbal bump
come-nc Nov 21, 2022
8a16e7e
Fix more psalm issues in OC\DB
come-nc Nov 21, 2022
beaa81e
Align 3rdparty with master
come-nc Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 389 files
13 changes: 8 additions & 5 deletions lib/private/DB/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@
use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Statement;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Diagnostics\IEventLogger;
use OCP\IRequestId;
use OCP\PreConditionNotMetException;
use OCP\Profiler\IProfiler;
use OC\DB\QueryBuilder\QueryBuilder;
use OC\SystemConfig;
use Psr\Log\LoggerInterface;
use OCP\Profiler\IProfiler;

class Connection extends \Doctrine\DBAL\Connection {
/** @var string */
Expand Down Expand Up @@ -124,12 +125,14 @@ public function __construct(
public function connect() {
try {
if ($this->_conn) {
/** @psalm-suppress InternalMethod */
return parent::connect();
}

// Only trigger the event logger for the initial connect call
$eventLogger = \OC::$server->getEventLogger();
$eventLogger = \OC::$server->get(IEventLogger::class);
$eventLogger->start('connect:db', 'db connection opened');
/** @psalm-suppress InternalMethod */
$status = parent::connect();
$eventLogger->end('connect:db');

Expand Down Expand Up @@ -291,7 +294,7 @@ public function executeStatement($sql, array $params = [], array $types = []): i
$sql = $this->adapter->fixupStatement($sql);
$this->queriesExecuted++;
$this->logQueryToFile($sql);
return parent::executeStatement($sql, $params, $types);
return (int)parent::executeStatement($sql, $params, $types);
}

protected function logQueryToFile(string $sql): void {
Expand Down Expand Up @@ -390,7 +393,7 @@ public function setValues($table, array $keys, array $values, array $updatePreco
return $insertQb->createNamedParameter($value, $this->getType($value));
}, array_merge($keys, $values))
);
return $insertQb->execute();
return $insertQb->executeStatement();
} catch (NotNullConstraintViolationException $e) {
throw $e;
} catch (ConstraintViolationException $e) {
Expand All @@ -416,7 +419,7 @@ public function setValues($table, array $keys, array $values, array $updatePreco
}
}
$updateQb->where($where);
$affected = $updateQb->execute();
$affected = $updateQb->executeStatement();

if ($affected === 0 && !empty($updatePreconditionValues)) {
throw new PreConditionNotMetException();
Expand Down
2 changes: 1 addition & 1 deletion lib/private/DB/Migrator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
use OCP\EventDispatcher\IEventDispatcher;

class Migrator {

/** @var Connection */
protected $connection;

Expand Down Expand Up @@ -138,6 +137,7 @@ protected function getDiff(Schema $targetSchema, Connection $connection) {
}
}

/** @psalm-suppress InternalMethod */
$comparator = new Comparator();
return $comparator->compare($sourceSchema, $targetSchema);
}
Expand Down