Merge pull request #3309 from nextcloud/ref/deprecations

remove DBAL deprecations

Author: dartcafe

lib/Db/TableManager.php

@@ -179,14 +179,14 @@ public function createTable(string $tableName, array $columns): array {
 		foreach ($columns as $columnName => $columnDefinition) {
 			if ($table->hasColumn($columnName)) {
 				$column = $table->getColumn($columnName);
-				if ($column->getType()->getName() !== $columnDefinition['type']) {
-					$messages[] = 'Migrated type of ' . $table->getName() . '[\'' . $columnName . '\'] from ' . $column->getType()->getName() . ' to ' . $columnDefinition['type'];
+				if (Type::lookupName($column->getType()) !== $columnDefinition['type']) {
+					$messages[] = 'Migrated type of ' . $table->getName() . '[\'' . $columnName . '\'] from ' . Type::lookupName($column->getType()) . ' to ' . $columnDefinition['type'];
 					$column->setType(Type::getType($columnDefinition['type']));
 				}
 				$column->setOptions($columnDefinition['options']);
 
 				// force change to current options definition
-				$table->changeColumn($columnName, $columnDefinition['options']);
+				$table->modifyColumn($columnName, $columnDefinition['options']);
 			} else {
 				$table->addColumn($columnName, $columnDefinition['type'], $columnDefinition['options']);
 				$messages[] = 'Added ' . $table->getName() . ', ' . $columnName . ' (' . $columnDefinition['type'] . ')';

lib/Migration/TableSchema.php

@@ -282,13 +282,13 @@ public static function createOrUpdateSchema(ISchemaWrapper &$schema): array {
 				if ($table->hasColumn($columnName)) {
 					$column = $table->getColumn($columnName);
 					$column->setOptions($columnDefinition['options']);
-					if ($column->getType()->getName() !== $columnDefinition['type']) {
+					if (Type::lookupName($column->getType()) !== $columnDefinition['type']) {
 						$messages[] = 'Migrating type of ' . $tableName . ', ' . $columnName . ' to ' . $columnDefinition['type'];
 						$column->setType(Type::getType($columnDefinition['type']));
 					}
 
 					// force change to current options definition
-					$table->changeColumn($columnName, $columnDefinition['options']);
+					$table->modifyColumn($columnName, $columnDefinition['options']);
 				} else {
 					$table->addColumn($columnName, $columnDefinition['type'], $columnDefinition['options']);
 				}

lib/Migration/Version050100Date20230515083001.php

@@ -98,14 +98,14 @@ public function createTable(string $tableName, array $columns): array {
 		foreach ($columns as $columnName => $columnDefinition) {
 			if ($table->hasColumn($columnName)) {
 				$column = $table->getColumn($columnName);
-				if ($column->getType()->getName() !== $columnDefinition['type']) {
-					$messages[] = 'Migrated type of ' . $table->getName() . '[\'' . $columnName . '\'] from ' . $column->getType()->getName() . ' to ' . $columnDefinition['type'];
+				if (Type::lookupName($column->getType()) !== $columnDefinition['type']) {
+					$messages[] = 'Migrated type of ' . $table->getName() . '[\'' . $columnName . '\'] from ' . Type::lookupName($column->getType()) . ' to ' . $columnDefinition['type'];
 					$column->setType(Type::getType($columnDefinition['type']));
 				}
 				$column->setOptions($columnDefinition['options']);
 
 				// force change to current options definition
-				$table->changeColumn($columnName, $columnDefinition['options']);
+				$table->modifyColumn($columnName, $columnDefinition['options']);
 			} else {
 				$table->addColumn($columnName, $columnDefinition['type'], $columnDefinition['options']);
 				$messages[] = 'Added ' . $table->getName() . ', ' . $columnName . ' (' . $columnDefinition['type'] . ')';

lib/Migration/Version060100Date20240209073304.php

@@ -84,14 +84,14 @@ public function createTable(string $tableName, array $columns): array {
 		foreach ($columns as $columnName => $columnDefinition) {
 			if ($table->hasColumn($columnName)) {
 				$column = $table->getColumn($columnName);
-				if ($column->getType()->getName() !== $columnDefinition['type']) {
-					$messages[] = 'Migrated type of ' . $table->getName() . '[\'' . $columnName . '\'] from ' . $column->getType()->getName() . ' to ' . $columnDefinition['type'];
+				if (Type::lookupName($column->getType()) !== $columnDefinition['type']) {
+					$messages[] = 'Migrated type of ' . $table->getName() . '[\'' . $columnName . '\'] from ' . Type::lookupName($column->getType()) . ' to ' . $columnDefinition['type'];
 					$column->setType(Type::getType($columnDefinition['type']));
 				}
 				$column->setOptions($columnDefinition['options']);
 
 				// force change to current options definition
-				$table->changeColumn($columnName, $columnDefinition['options']);
+				$table->modifyColumn($columnName, $columnDefinition['options']);
 			} else {
 				$table->addColumn($columnName, $columnDefinition['type'], $columnDefinition['options']);
 				$messages[] = 'Added ' . $table->getName() . ', ' . $columnName . ' (' . $columnDefinition['type'] . ')';