Skip to content

Commit c0bbcc7

Browse files
committed
Remove "primary" option from schema builder as it is not used anymore
See doctrine/dbal@138eb85#diff-300f55366adb50a32a40882ebdc95c163b141f64cba5f45f20bda04a907b3eb3L82 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
1 parent a9ce824 commit c0bbcc7

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

lib/private/DB/MDB2SchemaReader.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ private function loadField($table, $xml) {
208208
break;
209209
case 'primary':
210210
$primary = $this->asBool($child);
211-
$options['primary'] = $primary;
211+
# $options['primary'] = true;
212+
# not used anymore https://github.com/doctrine/dbal/commit/138eb85234a1faeaa2e6a32cd7bcc66bb51c64e8#diff-300f55366adb50a32a40882ebdc95c163b141f64cba5f45f20bda04a907b3eb3L82
212213
break;
213214
case 'precision':
214215
$precision = (string)$child;
@@ -257,7 +258,8 @@ private function loadField($table, $xml) {
257258
if (!empty($options['autoincrement'])
258259
&& !empty($options['notnull'])
259260
) {
260-
$options['primary'] = true;
261+
# $options['primary'] = true;
262+
# not used anymore https://github.com/doctrine/dbal/commit/138eb85234a1faeaa2e6a32cd7bcc66bb51c64e8#diff-300f55366adb50a32a40882ebdc95c163b141f64cba5f45f20bda04a907b3eb3L82
261263
}
262264

263265
$table->addColumn($name, $type, $options);

tests/lib/DB/ConnectionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected static function dropTestTable() {
4444

4545
protected function setUp(): void {
4646
parent::setUp();
47-
$this->connection = \OC::$server->getDatabaseConnection();
47+
$this->connection = \OC::$server->get(\OC\DB\Connection::class);
4848
}
4949

5050
protected function tearDown(): void {

0 commit comments

Comments
 (0)