Support for generated fields (#96)

cycle · Feb 8, 2024 · 4024d2e · 4024d2e
1 parent bb376d2
commit 4024d2e
Show file tree

Hide file tree

Showing 34 changed files with 314 additions and 47 deletions.
diff --git a/composer.json b/composer.json
@@ -7,8 +7,8 @@
     "prefer-stable": true,
     "require": {
         "php": ">=8.0",
-        "cycle/orm": "^2.2.0",
-        "cycle/schema-builder": "^2.6",
+        "cycle/orm": "^2.7",
+        "cycle/schema-builder": "^2.8",
         "doctrine/annotations": "^1.14.3 || ^2.0.1",
         "spiral/attributes": "^2.8|^3.0",
         "spiral/tokenizer": "^2.8|^3.0",

diff --git a/src/Annotation/Column.php b/src/Annotation/Column.php
@@ -11,9 +11,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target({"PROPERTY", "ANNOTATION", "CLASS"})
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]

diff --git a/src/Annotation/Embeddable.php b/src/Annotation/Embeddable.php
@@ -9,9 +9,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("CLASS")
  */
 #[\Attribute(\Attribute::TARGET_CLASS), NamedArgumentConstructor]

diff --git a/src/Annotation/Entity.php b/src/Annotation/Entity.php
@@ -9,9 +9,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("CLASS")
  */
 #[\Attribute(\Attribute::TARGET_CLASS), NamedArgumentConstructor]

diff --git a/src/Annotation/ForeignKey.php b/src/Annotation/ForeignKey.php
@@ -10,9 +10,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target({"PROPERTY", "ANNOTATION", "CLASS"})
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]

diff --git a/src/Annotation/GeneratedValue.php b/src/Annotation/GeneratedValue.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Annotation;
+
+use Cycle\ORM\Schema\GeneratedField;
+use Spiral\Attributes\NamedArgumentConstructor;
+
+/**
+ * @Annotation
+ * @NamedArgumentConstructor
+ * @Target({"PROPERTY"})
+ */
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+#[NamedArgumentConstructor]
+class GeneratedValue
+{
+    public function __construct(
+        protected bool $beforeInsert = false,
+        protected bool $onInsert = false,
+        protected bool $beforeUpdate = false,
+    ) {
+    }
+
+    public function getFlags(): ?int
+    {
+        if (!$this->beforeInsert && !$this->onInsert && !$this->beforeUpdate) {
+            return null;
+        }
+
+        return
+            ($this->beforeInsert ? GeneratedField::BEFORE_INSERT : 0) |
+            ($this->onInsert ? GeneratedField::ON_INSERT : 0) |
+            ($this->beforeUpdate ? GeneratedField::BEFORE_UPDATE : 0);
+    }
+}
diff --git a/src/Annotation/Inheritance/DiscriminatorColumn.php b/src/Annotation/Inheritance/DiscriminatorColumn.php
@@ -8,9 +8,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("CLASS")
  */
 #[\Attribute(\Attribute::TARGET_CLASS), NamedArgumentConstructor]

diff --git a/src/Annotation/Inheritance/JoinedTable.php b/src/Annotation/Inheritance/JoinedTable.php
@@ -10,9 +10,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("CLASS")
  */
 #[\Attribute(\Attribute::TARGET_CLASS), NamedArgumentConstructor]

diff --git a/src/Annotation/Inheritance/SingleTable.php b/src/Annotation/Inheritance/SingleTable.php
@@ -9,9 +9,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("CLASS")
  */
 #[\Attribute(\Attribute::TARGET_CLASS), NamedArgumentConstructor]

diff --git a/src/Annotation/Relation/BelongsTo.php b/src/Annotation/Relation/BelongsTo.php
@@ -11,9 +11,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("PROPERTY")
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY), NamedArgumentConstructor]

diff --git a/src/Annotation/Relation/Embedded.php b/src/Annotation/Relation/Embedded.php
@@ -9,9 +9,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("PROPERTY")
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY), NamedArgumentConstructor]

diff --git a/src/Annotation/Relation/HasMany.php b/src/Annotation/Relation/HasMany.php
@@ -10,9 +10,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("PROPERTY")
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY), NamedArgumentConstructor]

diff --git a/src/Annotation/Relation/HasOne.php b/src/Annotation/Relation/HasOne.php
@@ -11,9 +11,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("PROPERTY")
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY), NamedArgumentConstructor]

diff --git a/src/Annotation/Relation/Inverse.php b/src/Annotation/Relation/Inverse.php
@@ -11,9 +11,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target({"PROPERTY", "ANNOTATION"})
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY), NamedArgumentConstructor]

diff --git a/src/Annotation/Relation/ManyToMany.php b/src/Annotation/Relation/ManyToMany.php
@@ -11,9 +11,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("PROPERTY")
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY), NamedArgumentConstructor]

diff --git a/src/Annotation/Relation/Morphed/BelongsToMorphed.php b/src/Annotation/Relation/Morphed/BelongsToMorphed.php
@@ -13,9 +13,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("PROPERTY")
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY), NamedArgumentConstructor]

diff --git a/src/Annotation/Relation/Morphed/MorphedHasMany.php b/src/Annotation/Relation/Morphed/MorphedHasMany.php
@@ -12,9 +12,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("PROPERTY")
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY), NamedArgumentConstructor]

diff --git a/src/Annotation/Relation/Morphed/MorphedHasOne.php b/src/Annotation/Relation/Morphed/MorphedHasOne.php
@@ -12,9 +12,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("PROPERTY")
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY), NamedArgumentConstructor]

diff --git a/src/Annotation/Relation/RefersTo.php b/src/Annotation/Relation/RefersTo.php
@@ -11,9 +11,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("PROPERTY")
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY), NamedArgumentConstructor]

diff --git a/src/Annotation/Table.php b/src/Annotation/Table.php
@@ -11,9 +11,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target({"CLASS", "ANNOTATION"})
  */
 #[\Attribute(\Attribute::TARGET_CLASS), NamedArgumentConstructor]

diff --git a/src/Annotation/Table/Index.php b/src/Annotation/Table/Index.php
@@ -9,9 +9,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("ANNOTATION", "CLASS")
  */
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE), NamedArgumentConstructor]

diff --git a/src/Annotation/Table/PrimaryKey.php b/src/Annotation/Table/PrimaryKey.php
@@ -9,9 +9,7 @@
 
 /**
  * @Annotation
- *
  * @NamedArgumentConstructor
- *
  * @Target("ANNOTATION", "CLASS")
  */
 #[\Attribute(\Attribute::TARGET_CLASS), NamedArgumentConstructor]

diff --git a/src/Configurator.php b/src/Configurator.php
@@ -8,11 +8,13 @@
 use Cycle\Annotated\Annotation\Embeddable;
 use Cycle\Annotated\Annotation\Entity;
 use Cycle\Annotated\Annotation\ForeignKey;
+use Cycle\Annotated\Annotation\GeneratedValue;
 use Cycle\Annotated\Annotation\Relation as RelationAnnotation;
 use Cycle\Annotated\Exception\AnnotationException;
 use Cycle\Annotated\Exception\AnnotationRequiredArgumentsException;
 use Cycle\Annotated\Exception\AnnotationWrongTypeArgumentException;
 use Cycle\Annotated\Utils\EntityUtils;
+use Cycle\ORM\Schema\GeneratedField;
 use Cycle\Schema\Definition\Entity as EntitySchema;
 use Cycle\Schema\Definition\ForeignKey as ForeignKeySchema;
 use Cycle\Schema\Definition\Field;
@@ -22,7 +24,6 @@
 use Doctrine\Common\Annotations\Reader as DoctrineReader;
 use Doctrine\Inflector\Inflector;
 use Doctrine\Inflector\Rules\English\InflectorFactory;
-use Exception;
 use Spiral\Attributes\ReaderInterface;
 
 final class Configurator
@@ -91,7 +92,7 @@ public function initFields(EntitySchema $entity, \ReflectionClass $class, string
         foreach ($class->getProperties() as $property) {
             try {
                 $column = $this->reader->firstPropertyMetadata($property, Column::class);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 throw new AnnotationException($e->getMessage(), $e->getCode(), $e);
             } catch (\ArgumentCountError $e) {
                 throw AnnotationRequiredArgumentsException::createFor($property, Column::class, $e);
@@ -221,6 +222,9 @@ public function initField(string $name, Column $column, \ReflectionClass $class,
         $field->setType($column->getType());
         $field->setColumn($columnPrefix . ($column->getColumn() ?? $this->inflector->tableize($name)));
         $field->setPrimary($column->isPrimary());
+        if ($this->isOnInsertGeneratedField($field)) {
+            $field->setGenerated(GeneratedField::ON_INSERT);
+        }
 
         $field->setTypecast($this->resolveTypecast($column->getTypecast(), $class));
 
@@ -286,6 +290,20 @@ public function initForeignKeys(Entity $ann, EntitySchema $entity, \ReflectionCl
         }
     }
 
+    public function initGeneratedFields(EntitySchema $entity, \ReflectionClass $class): void
+    {
+        foreach ($class->getProperties() as $property) {
+            try {
+                $generated = $this->reader->firstPropertyMetadata($property, GeneratedValue::class);
+                if ($generated !== null) {
+                    $entity->getFields()->get($property->getName())->setGenerated($generated->getFlags());
+                }
+            } catch (\Throwable $e) {
+                throw new AnnotationException($e->getMessage(), (int) $e->getCode(), $e);
+            }
+        }
+    }
+
     /**
      * Resolve class or role name relative to the current class.
      */
@@ -368,4 +386,12 @@ private function getPropertyMetadata(\ReflectionProperty $property, string $name
             throw new AnnotationException($e->getMessage(), $e->getCode(), $e);
         }
     }
+
+    private function isOnInsertGeneratedField(Field $field): bool
+    {
+        return match ($field->getType()) {
+            'serial', 'bigserial', 'smallserial' => true,
+            default => $field->isPrimary()
+        };
+    }
 }
diff --git a/src/Entities.php b/src/Entities.php
@@ -84,6 +84,9 @@ public function run(Registry $registry): Registry
                 continue;
             }
 
+            // generated fields
+            $this->generator->initGeneratedFields($e, $class);
+
             // register entity (OR find parent)
             $registry->register($e);
             $registry->linkTable($e, $e->getDatabase(), $e->getTableName());
@@ -99,7 +102,7 @@ public function run(Registry $registry): Registry
     private function normalizeNames(Registry $registry): Registry
     {
         foreach ($this->locator->getClasses() as $class) {
-            if (! $registry->hasEntity($class->getName())) {
+            if (!$registry->hasEntity($class->getName())) {
                 continue;
             }
 

diff --git a/src/Exception/AnnotationRequiredArgumentsException.php b/src/Exception/AnnotationRequiredArgumentsException.php
@@ -12,7 +12,7 @@ public static function createFor(\ReflectionProperty $property, string $annotati
 
         $requiredArguments = [];
         foreach ($column->getConstructor()->getParameters() as $parameter) {
-            if (! $parameter->isOptional()) {
+            if (!$parameter->isOptional()) {
                 $requiredArguments[] = $parameter->getName();
             }
         }

diff --git a/tests/Annotated/Fixtures/Fixtures25/PostgreSQL/WithGeneratedSerial.php b/tests/Annotated/Fixtures/Fixtures25/PostgreSQL/WithGeneratedSerial.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures25\PostgreSQL;
+
+use Cycle\Annotated\Annotation\Column;
+use Cycle\Annotated\Annotation\Entity;
+
+/**
+ * @Entity(role="withGeneratedSerial", table="with_generated_serial")
+ */
+#[Entity(role: 'withGeneratedSerial', table: 'with_generated_serial')]
+class WithGeneratedSerial
+{
+    /**
+     * @Column(type="primary")
+     */
+    #[Column(type: 'primary')]
+    public int $id;
+
+    /**
+     * @Column(type="smallserial", name="small_serial")
+     */
+    #[Column(type: 'smallserial', name: 'small_serial')]
+    public int $smallSerial;
+
+    /**
+     * @Column(type="serial")
+     */
+    #[Column(type: 'serial')]
+    public int $serial;
+
+    /**
+     * @Column(type="bigserial", name="big_serial")
+     */
+    #[Column(type: 'bigserial', name: 'big_serial')]
+    public int $bigSerial;
+}