fix(db): Adapt migrations to new OCP\DB\Schema

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

Author: CarlSchwan

apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php

@@ -10,7 +10,6 @@
 namespace OCA\FederatedFileSharing\Migration;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
 use OCP\DB\ISchemaWrapper;
 use OCP\DB\Types;
 use OCP\IDBConnection;
@@ -32,9 +31,9 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		if ($schema->hasTable('federated_reshares')) {
 			$table = $schema->getTable('federated_reshares');
 			$remoteIdColumn = $table->getColumn('remote_id');
-			if ($remoteIdColumn && Type::lookupName($remoteIdColumn->getType()) !== Types::STRING) {
+			if ($remoteIdColumn->getType()->getName() !== Types::STRING) {
 				$remoteIdColumn->setNotnull(false);
-				$remoteIdColumn->setType(Type::getType(Types::STRING));
+				$remoteIdColumn->setType(Types::STRING);
 				$remoteIdColumn->setOptions(['length' => 255]);
 				$remoteIdColumn->setDefault('');
 				return $schema;

apps/files_sharing/lib/Migration/Version11300Date20201120141438.php

@@ -10,7 +10,6 @@
 namespace OCA\Files_Sharing\Migration;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
 use OCP\DB\ISchemaWrapper;
 use OCP\DB\Types;
 use OCP\IDBConnection;
@@ -91,9 +90,9 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		} else {
 			$table = $schema->getTable('share_external');
 			$remoteIdColumn = $table->getColumn('remote_id');
-			if ($remoteIdColumn && Type::lookupName($remoteIdColumn->getType()) !== Types::STRING) {
+			if ($remoteIdColumn->getType()->getName() !== Types::STRING) {
 				$remoteIdColumn->setNotnull(false);
-				$remoteIdColumn->setType(Type::getType(Types::STRING));
+				$remoteIdColumn->setType(Types::STRING);
 				$remoteIdColumn->setOptions(['length' => 255]);
 				$remoteIdColumn->setDefault('');
 			}

apps/settings/lib/SetupChecks/DatabasePendingBigIntConversions.php

@@ -9,10 +9,10 @@
 
 namespace OCA\Settings\SetupChecks;
 
-use Doctrine\DBAL\Types\BigIntType;
 use OC\Core\Command\Db\ConvertFilecacheBigInt;
 use OC\DB\Connection;
 use OC\DB\SchemaWrapper;
+use OCP\DB\Types;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IDBConnection;
 use OCP\IL10N;
@@ -57,7 +57,7 @@ protected function getBigIntConversionPendingColumns(): array {
 				$column = $table->getColumn($columnName);
 				$isAutoIncrement = $column->getAutoincrement();
 				$isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
-				if (!($column->getType() instanceof BigIntType) && !$isAutoIncrementOnSqlite) {
+				if ($column->getType()->getName() !== Types::BIGINT && !$isAutoIncrementOnSqlite) {
 					$pendingColumns[] = $tableName . '.' . $columnName;
 				}
 			}

apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php

@@ -9,9 +9,8 @@
 
 namespace OCA\TwoFactorBackupCodes\Migration;
 
-use Doctrine\DBAL\Types\Type;
-use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
 
@@ -35,7 +34,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 
 		$column = $table->getColumn('used');
 		if ($column->getType()->getName() !== Types::SMALLINT) {
-			$column->setType(Type::getType(Types::SMALLINT));
+			$column->setType(Types::SMALLINT);
 			$column->setOptions(['length' => 6]);
 		}
 

apps/workflowengine/lib/Migration/Version2000Date20190808074233.php

@@ -10,9 +10,9 @@
 namespace OCA\WorkflowEngine\Migration;
 
 use Closure;
-use Doctrine\DBAL\Schema\Table;
 use OCA\WorkflowEngine\Entity\File;
 use OCP\DB\ISchemaWrapper;
+use OCP\DB\Schema\ITable;
 use OCP\DB\Types;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -118,7 +118,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		return $schema;
 	}
 
-	protected function ensureEntityColumns(Table $table) {
+	protected function ensureEntityColumns(ITable $table): void {
 		if (!$table->hasColumn('entity')) {
 			$table->addColumn('entity', Types::STRING, [
 				'notnull' => true,

build/psalm-baseline.xml

@@ -2669,11 +2669,6 @@
       <code><![CDATA[$svg]]></code>
     </NullableReturnStatement>
   </file>
-  <file src="apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php">
-    <DeprecatedMethod>
-      <code><![CDATA[getName]]></code>
-    </DeprecatedMethod>
-  </file>
   <file src="apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php">
     <DeprecatedMethod>
       <code><![CDATA[generate]]></code>

core/Command/Db/ConvertFilecacheBigInt.php

@@ -7,7 +7,6 @@
 
 namespace OC\Core\Command\Db;
 
-use Doctrine\DBAL\Types\Type;
 use OC\DB\Connection;
 use OC\DB\SchemaWrapper;
 use OCP\DB\Types;
@@ -73,8 +72,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$column = $table->getColumn($columnName);
 				$isAutoIncrement = $column->getAutoincrement();
 				$isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
-				if (Type::lookupName($column->getType()) !== Types::BIGINT && !$isAutoIncrementOnSqlite) {
-					$column->setType(Type::getType(Types::BIGINT));
+				if ($column->getType()->getName() !== Types::BIGINT && !$isAutoIncrementOnSqlite) {
+					$column->setType(Types::BIGINT);
 					$column->setOptions(['length' => 20]);
 
 					$updates[] = '* ' . $tableName . '.' . $columnName;

core/Migrations/Version34000Date20260318095645.php

@@ -10,7 +10,6 @@
 namespace OC\Core\Migrations;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
 use OCP\DB\ISchemaWrapper;
 use OCP\DB\Types;
 use OCP\Migration\Attributes\ColumnType;
@@ -30,8 +29,8 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			$table = $schema->getTable('jobs');
 			$argumentColumn = $table->getColumn('argument');
 
-			if ($argumentColumn->getType() !== Type::getType(Types::TEXT)) {
-				$argumentColumn->setType(Type::getType(Types::TEXT));
+			if ($argumentColumn->getType()->getName() !== Types::TEXT) {
+				$argumentColumn->setType(Types::TEXT);
 				return $schema;
 			}
 		}

lib/private/Repair/Owncloud/MigratePropertiesTable.php

@@ -9,10 +9,9 @@
 
 namespace OC\Repair\Owncloud;
 
-use Doctrine\DBAL\Types\StringType;
-use Doctrine\DBAL\Types\Type;
 use OC\DB\Connection;
 use OC\DB\SchemaWrapper;
+use OCP\DB\Types;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 
@@ -39,8 +38,8 @@ public function run(IOutput $output): void {
 		$output->info('Update the oc_properties table schema.');
 		$table = $schema->getTable('oc_properties');
 		$column = $table->getColumn('propertyvalue');
-		if ($column->getType() instanceof StringType) {
-			$column->setType(Type::getType('text'));
+		if ($column->getType()->getName() === Types::STRING) {
+			$column->setType(Types::TEXT);
 			$column->setLength(null);
 		}
 

lib/public/Migration/BigIntMigration.php

@@ -7,9 +7,8 @@
 
 namespace OCP\Migration;
 
-use Doctrine\DBAL\Types\Type;
-use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
 
 /**
  * @since 13.0.0
@@ -41,8 +40,8 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 
 			foreach ($columns as $columnName) {
 				$column = $table->getColumn($columnName);
-				if (Type::lookupName($column->getType()) !== Types::BIGINT) {
-					$column->setType(Type::getType(Types::BIGINT));
+				if ($column->getType()->getName() !== Types::BIGINT) {
+					$column->setType(Types::BIGINT);
 					$column->setOptions(['length' => 20]);
 				}
 			}