refactor(dbal): Merge ColumnType and IType

Just make sure ColumnType has a method getName for compatibility purpose

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

Author: CarlSchwan

lib/composer/composer/autoload_classmap.php

@@ -377,7 +377,6 @@
     'OCP\\DB\\Schema\\IForeignKeyConstraint' => $baseDir . '/lib/public/DB/Schema/IForeignKeyConstraint.php',
     'OCP\\DB\\Schema\\IIndex' => $baseDir . '/lib/public/DB/Schema/IIndex.php',
     'OCP\\DB\\Schema\\ITable' => $baseDir . '/lib/public/DB/Schema/ITable.php',
-    'OCP\\DB\\Schema\\IType' => $baseDir . '/lib/public/DB/Schema/IType.php',
     'OCP\\DB\\Schema\\SchemaException' => $baseDir . '/lib/public/DB/Schema/SchemaException.php',
     'OCP\\DB\\Types' => $baseDir . '/lib/public/DB/Types.php',
     'OCP\\Dashboard\\IAPIWidget' => $baseDir . '/lib/public/Dashboard/IAPIWidget.php',
@@ -1790,7 +1789,6 @@
     'OC\\DB\\Schema\\ForeignKeyConstraint' => $baseDir . '/lib/private/DB/Schema/ForeignKeyConstraint.php',
     'OC\\DB\\Schema\\Index' => $baseDir . '/lib/private/DB/Schema/Index.php',
     'OC\\DB\\Schema\\Table' => $baseDir . '/lib/private/DB/Schema/Table.php',
-    'OC\\DB\\Schema\\Type' => $baseDir . '/lib/private/DB/Schema/Type.php',
     'OC\\DB\\SetTransactionIsolationLevel' => $baseDir . '/lib/private/DB/SetTransactionIsolationLevel.php',
     'OC\\Dashboard\\Manager' => $baseDir . '/lib/private/Dashboard/Manager.php',
     'OC\\DatabaseException' => $baseDir . '/lib/private/DatabaseException.php',

lib/composer/composer/autoload_static.php

@@ -418,7 +418,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\DB\\Schema\\IForeignKeyConstraint' => __DIR__ . '/../../..' . '/lib/public/DB/Schema/IForeignKeyConstraint.php',
         'OCP\\DB\\Schema\\IIndex' => __DIR__ . '/../../..' . '/lib/public/DB/Schema/IIndex.php',
         'OCP\\DB\\Schema\\ITable' => __DIR__ . '/../../..' . '/lib/public/DB/Schema/ITable.php',
-        'OCP\\DB\\Schema\\IType' => __DIR__ . '/../../..' . '/lib/public/DB/Schema/IType.php',
         'OCP\\DB\\Schema\\SchemaException' => __DIR__ . '/../../..' . '/lib/public/DB/Schema/SchemaException.php',
         'OCP\\DB\\Types' => __DIR__ . '/../../..' . '/lib/public/DB/Types.php',
         'OCP\\Dashboard\\IAPIWidget' => __DIR__ . '/../../..' . '/lib/public/Dashboard/IAPIWidget.php',
@@ -1831,7 +1830,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\DB\\Schema\\ForeignKeyConstraint' => __DIR__ . '/../../..' . '/lib/private/DB/Schema/ForeignKeyConstraint.php',
         'OC\\DB\\Schema\\Index' => __DIR__ . '/../../..' . '/lib/private/DB/Schema/Index.php',
         'OC\\DB\\Schema\\Table' => __DIR__ . '/../../..' . '/lib/private/DB/Schema/Table.php',
-        'OC\\DB\\Schema\\Type' => __DIR__ . '/../../..' . '/lib/private/DB/Schema/Type.php',
         'OC\\DB\\SetTransactionIsolationLevel' => __DIR__ . '/../../..' . '/lib/private/DB/SetTransactionIsolationLevel.php',
         'OC\\Dashboard\\Manager' => __DIR__ . '/../../..' . '/lib/private/Dashboard/Manager.php',
         'OC\\DatabaseException' => __DIR__ . '/../../..' . '/lib/private/DatabaseException.php',

lib/private/DB/Schema/Column.php

@@ -14,7 +14,6 @@
 use Doctrine\DBAL\Types\Type as DBALType;
 use OCP\DB\Schema\ColumnType;
 use OCP\DB\Schema\IColumn;
-use OCP\DB\Schema\IType;
 use OCP\DB\Schema\SchemaException;
 
 /**
@@ -34,11 +33,7 @@ public function getWrappedColumn(): DBALColumn {
 	}
 
 	#[\Override]
-	public function setType(string|IType|DBALType|ColumnType $type): self {
-		if ($type instanceof IType) {
-			$type = $type->getName();
-		}
-
+	public function setType(string|DBALType|ColumnType $type): self {
 		if ($type instanceof ColumnType) {
 			$type = $type->value;
 		}
@@ -98,12 +93,7 @@ public function setDefault(mixed $default): self {
 	}
 
 	#[\Override]
-	public function getType(): IType {
-		return new Type($this->column->getType());
-	}
-
-	#[\Override]
-	public function getColumnType(): ColumnType {
+	public function getType(): ColumnType {
 		return ColumnType::from(DBALType::lookupName($this->column->getType()));
 	}
 

lib/private/DB/Schema/Type.php

@@ -163,4 +163,11 @@ enum ColumnType: string {
 	 * @since 35.0.0
 	 */
 	case Json = 'json';
+
+	/**
+	 * @since 35.0.0
+	 */
+	public function getName(): string {
+		return $this->value;
+	}
 }

lib/public/DB/Schema/ColumnType.php

@@ -19,10 +19,10 @@
 #[Consumable(since: '35.0.0')]
 interface IColumn {
 	/**
-	 * @param \OCP\DB\Types::*|IType|ColumnType $type
+	 * @param \OCP\DB\Types::*|ColumnType $type
 	 * @since 35.0.0
 	 */
-	public function setType(string|IType|ColumnType $type): self;
+	public function setType(string|ColumnType $type): self;
 
 	/**
 	 * @since 35.0.0
@@ -62,19 +62,11 @@ public function setDefault(mixed $default): self;
 	/**
 	 * Returns the type of this column.
 	 *
-	 * Note that {@see IType::getName()} returns a `\OCP\DB\Types::*` value.
+	 * Note that {@see ColumnType::getName()} returns a `\OCP\DB\Types::*` value.
 	 *
 	 * @since 35.0.0
-	 * @note Prefer using getColumnType, this method is here for legacy compatibility.
 	 */
-	public function getType(): IType;
-
-	/**
-	 * Returns the type of this column.
-	 *
-	 * @since 35.0.0
-	 */
-	public function getColumnType(): ColumnType;
+	public function getType(): ColumnType;
 
 	/**
 	 * @return int|null

lib/public/DB/Schema/IColumn.php

@@ -131,6 +131,7 @@ public function renameIndex(string $oldName, ?string $newName = null): self;
 	 *     fixed?: bool,
 	 *     precision?: int,
 	 *     scale?: int,
+	 *     type?: Types::*|ColumnType,
 	 * } $options
 	 *
 	 * @throws SchemaException