fix(orm): Multiple fixes

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

Author: CarlSchwan

apps/twofactor_backupcodes/lib/Db/BackupCode.php

@@ -13,13 +13,12 @@
 use OCP\AppFramework\ORM\Attribute\Entity;
 use OCP\AppFramework\ORM\Attribute\Id;
 use OCP\DB\Schema\ColumnType;
-use OCP\Snowflake\ISnowflakeGenerator;
 
 #[Entity(name: 'twofactor_backupcodes')]
 final class BackupCode {
-	#[Id(generatorClass: ISnowflakeGenerator::class)]
-	#[Column(name: 'id', type: ColumnType::String, length: 64, nullable: false)]
-	public ?string $id = null;
+	#[Id]
+	#[Column(name: 'id', type: ColumnType::Integer, nullable: false)]
+	public ?int $id = null;
 
 	#[Column(name: 'user_id', type: ColumnType::String, length: 64, nullable: false)]
 	public string $userId;

lib/private/AppFramework/ORM/EntityInfo.php

@@ -85,7 +85,7 @@ public function __construct(
 			}
 
 			if ($propertyAttributes->id instanceof Id && !$propertyAttributes->column instanceof Column) {
-				throw new \RuntimeException($this->entityClass . ' has a Id attribute on ' . $property->getName() . ' but not the corresponding required Column attribute.');
+				throw new \RuntimeException($this->entityClass . ' has an Id attribute on ' . $property->getName() . ' but not the corresponding required Column attribute.');
 			}
 
 			if ($propertyAttributes->oneToOne instanceof OneToOne

lib/private/AppFramework/ORM/EntityManager.php

@@ -19,7 +19,6 @@
 use OCP\DB\Schema\ITable;
 use OCP\IDBConnection;
 use OCP\Server;
-use OCP\Snowflake\ISnowflakeGenerator;
 
 final class EntityManager {
 	public function __construct(
@@ -79,26 +78,26 @@ public function insert(object $entity): object {
 			if ($propertyAttributes->id !== null && $propertyAttributes->column !== null) {
 				$generatorClass = $propertyAttributes->id->generatorClass;
 				if ($generatorClass) {
-					if ($generatorClass === ISnowflakeGenerator::class) {
-						$generator = Server::get($generatorClass);
-						$values[$propertyAttributes->column->name] = $generator->nextId();
-						$property->setValue($entity, $insert->createNamedParameter($values[$propertyAttributes->column->name]));
-					}
-
+					$generator = Server::get($generatorClass);
+					$value = $generator->nextId();
+					$type = $this->getParameterType($propertyAttributes->column->type, false);
+					$values[$propertyAttributes->column->name] = $insert->createNamedParameter($value, $type);
+					$property->setValue($entity, $value);
 					continue;
 				}
 
 				if ($isComposite) {
 					// A composite primary key can't rely on a single autoincrement column: every
 					// part must already be set on the entity (e.g. a foreign key id, or a value
 					// assigned by the caller) before insert() is called.
+					/** @psalm-suppress MixedAssignment */
 					$value = $property->getValue($entity);
 					if ($value === null) {
 						throw new \LogicException($entity::class . '::' . $property->getName() . ' is part of a composite primary key and must be set before insert(); it cannot rely on DB autoincrement.');
 					}
 
 					if (!is_string($value) && !is_int($value)) {
-						throw new \LogicException($entity::class . '::' . $property->getName() . ' is part of a composite primary key and must be set to a int or string before insert();.');
+						throw new \LogicException($entity::class . '::' . $property->getName() . ' is part of a composite primary key and must be set to an int or string before insert().');
 					}
 
 					$type = $this->getParameterType($propertyAttributes->column->type, false);
@@ -222,10 +221,14 @@ public function delete(object $entity): void {
 		foreach ($entityInfo->propertiesAttributes as $propertyAttributes) {
 			if ($propertyAttributes->id !== null && $propertyAttributes->column !== null) {
 				$property = $propertyAttributes->property;
-				/** @var int|string $value */
+				/** @var int|string|null $value */
 				$value = $property->getValue($entity);
+				if ($value === null) {
+					throw new \LogicException('Trying to delete an entity with no primary key set.');
+				}
 
-				$delete->andWhere($delete->expr()->eq($propertyAttributes->column->name, $delete->createNamedParameter($value)));
+				$type = $this->getParameterType($propertyAttributes->column->type, false);
+				$delete->andWhere($delete->expr()->eq($propertyAttributes->column->name, $delete->createNamedParameter($value, $type)));
 				$foundId = true;
 			};
 		}

lib/private/AppFramework/ORM/PropertyAttributes.php

@@ -41,7 +41,7 @@ public function getOwningRelationTarget(): ?string {
 			return $this->manyToOne->targetEntity;
 		}
 
-		if ($this->oneToOne instanceof OneToOne && $this->oneToOne->invertedBy !== null) {
+		if ($this->oneToOne instanceof OneToOne && $this->oneToOne->mappedBy === null) {
 			return $this->oneToOne->targetEntity;
 		}
 

lib/private/Tags.php

@@ -242,7 +242,7 @@ public function add(string $name): false|int {
 			]);
 			return false;
 		}
-		$this->logger->debug(__METHOD__ . ' Added an tag with ' . $tag->id, ['app' => 'core']);
+		$this->logger->debug(__METHOD__ . ' Added a tag with ' . $tag->id, ['app' => 'core']);
 		return $tag->id ?? false;
 	}
 

lib/public/AppFramework/ORM/Repository.php

@@ -88,6 +88,11 @@ private function hydrateRow(string $entityClass, mixed $row): object {
 				continue;
 			}
 
+			if ($value === null) {
+				$entity->$property = null;
+				continue;
+			}
+
 			/** @psalm-suppress MixedAssignment $value is a raw DB driver value; each branch below settype()s or reconstructs it. */
 			$value = match ($type) {
 				ColumnType::Bigint, ColumnType::Smallint, ColumnType::Integer => (int)$value,
@@ -472,7 +477,8 @@ private function getJoinedSelectQueryBuilder(array $criteria, array $orderBy = [
 		}
 
 		foreach ($orderBy as $field => $direction) {
-			$qb->addOrderBy($qb->createNamedParameter($field), $direction === \SortDirection::Ascending ? 'ASC' : 'DESC');
+			$column = $entityInfo->mappingPropertyToColumn[$field];
+			$qb->addOrderBy('e.' . $column, $direction === \SortDirection::Ascending ? 'ASC' : 'DESC');
 		}
 
 		return [$qb, $relations];

lib/public/ITags.php

@@ -53,8 +53,8 @@ public function getTag(string $id);
 	 *
 	 * ```php
 	 * [
-	 * 	['id' => 0, 'name' = 'First tag', 'owner' = 'User A', 'type' => 'tagtype'],
-	 * 	['id' => 1, 'name' = 'Second tag', 'owner' = 'User B', 'type' => 'tagtype'],
+	 * 	['id' => 0, 'name' = 'First tag', 'owner' => 'User A', 'type' => 'tagtype'],
+	 * 	['id' => 1, 'name' = 'Second tag', 'owner' => 'User B', 'type' => 'tagtype'],
 	 * ]
 	 * ```
 	 *
@@ -136,7 +136,7 @@ public function rename(string|int $from, string $to): bool;
 	 * Add a list of new tags.
 	 *
 	 * @param string|list<string> $names A string with a name or an array of strings containing
-	 *                                   the name(s) of the to add.
+	 *                                   the name(s) of the tags to add.
 	 * @param bool $sync When true, save the tags
 	 * @param int|null $id int Optional object id to add to this|these tag(s)
 	 * @return bool Returns false on error.

tests/lib/AppFramework/ORM/RepositoryTest.php

@@ -137,7 +137,7 @@ final class TypoTarget {
 	public ?TypoOwning $owner = null;
 }
 
-#[Entity(name: 'repository_cascade_parent')]
+#[Entity(name: 'repository_casc_parent')]
 final class CascadeParent {
 	#[Id]
 	#[Column(name: 'id', type: ColumnType::Bigint)]
@@ -151,7 +151,7 @@ final class CascadeParent {
 	public ?CascadeChild $child = null;
 }
 
-#[Entity(name: 'repository_cascade_child')]
+#[Entity(name: 'repository_casc_child')]
 final class CascadeChild {
 	#[Id]
 	#[Column(name: 'id', type: ColumnType::Bigint)]
@@ -214,7 +214,7 @@ public static function setUpBeforeClass(): void {
 	public static function tearDownAfterClass(): void {
 		$entityManager = Server::get(EntityManager::class);
 		$prefix = Server::get(IConfig::class)->getSystemValueString('dbtableprefix', 'oc_');
-		foreach (static::$entitiesClasses as $entityClass) {
+		foreach (array_reverse(static::$entitiesClasses) as $entityClass) {
 			try {
 				$entityManager->dropTable($entityClass, $prefix);
 			} catch (\RuntimeException) {