Merge remote-tracking branch 'origin/master'

Author: peldax

src/Bean.php

@@ -11,15 +11,16 @@ abstract class Bean implements \CoolBeans\Contract\Row, \IteratorAggregate
     protected \ReflectionClass $reflection;
     protected \CoolBeans\Contract\PrimaryKey $primaryKey;
 
-    public function __construct(
+    final public function __construct(
         protected \Nette\Database\Table\ActiveRow $row,
+        private bool $extraColumns = false,
     )
     {
         $this->reflection = new \ReflectionClass(static::class);
         $this->primaryKey = \CoolBeans\Contract\PrimaryKey::create($this->row);
 
-        if (\CoolBeans\Config::$validateColumns) {
-            $this->validateMissingColumns();
+        if (\CoolBeans\Config::$validateColumns && !$this->extraColumns) {
+            $this->validateMissingProperties();
         }
 
         if (\CoolBeans\Config::$validateTableName) {
@@ -112,6 +113,14 @@ public function refresh() : void
         $this->initiateProperties();
     }
 
+    /**
+     * Returns internal Nette row.
+     */
+    public function getInternalRow() : \Nette\Database\Table\ActiveRow
+    {
+        return $this->row;
+    }
+
     /**
      * Selects referenced row from $table where <referencedRowPrimary> = $throughColumn
      */
@@ -134,7 +143,7 @@ protected function related(string $table, ?string $throughColumn = null) : \Nett
      * Foo -> foo
      * FooBar -> foo_bar
      */
-    protected function validateTableName() : void
+    private function validateTableName() : void
     {
         $tableName = $this->getTableName();
         $className = $this->reflection->getShortName();
@@ -152,7 +161,7 @@ protected function validateTableName() : void
     /**
      * Validates whether every column in database have its column property.
      */
-    protected function validateMissingColumns() : void
+    private function validateMissingProperties() : void
     {
         foreach ($this->row->toArray() as $name => $value) {
             if (!$this->offsetExists($name)) {
@@ -164,7 +173,7 @@ protected function validateMissingColumns() : void
     /**
      * Initiates values into column properties.
      */
-    protected function initiateProperties() : void
+    private function initiateProperties() : void
     {
         foreach ($this->reflection->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) {
             $type = $property->getType();

src/Command/SqlGeneratorCommand.php

@@ -300,6 +300,19 @@ private static function getDataType(\ReflectionProperty $property) : string
                 $enum = new \ReflectionEnum($type->getName());
 
                 if ((string) $enum->getBackingType() === 'string') {
+                    $cases = $enum->getCases();
+
+                    // save large enums as varchar
+                    if (\count($cases) > 10) {
+                        $longestOption = 0;
+
+                        foreach ($enum->getCases() as $case) {
+                            $longestOption = \max($longestOption, \strlen($case->getBackingValue()));
+                        }
+
+                        return 'VARCHAR(' . $longestOption . ')';
+                    }
+
                     $options = [];
 
                     foreach ($enum->getCases() as $case) {
@@ -309,14 +322,11 @@ private static function getDataType(\ReflectionProperty $property) : string
                     return 'ENUM(\'' . \implode('\',\'', $options) . '\')';
                 }
 
+                // max number of digits in backing of integer
                 $longestOption = 0;
 
                 foreach ($enum->getCases() as $case) {
-                    $length = \mb_strlen((string) $case->getBackingValue());
-
-                    if ($length > $longestOption) {
-                        $longestOption = $length;
-                    }
+                    $longestOption = \max($longestOption, \strlen((string) $case->getBackingValue()));
                 }
 
                 return 'TINYINT(' . $longestOption . ')';
@@ -352,7 +362,7 @@ private static function getClassIndex(\ReflectionClass $bean) : array
     {
         $return = [];
 
-        foreach ($bean->getAttributes(\CoolBeans\Attribute\ClassIndex::class) as $i => $attribute) {
+        foreach (self::getClassAttributes($bean, \CoolBeans\Attribute\ClassIndex::class) as $i => $attribute) {
             $indexName = 'index_' . $bean->getShortName() . '_' . $i;
             $columns = $attribute->newInstance()->columns;
             self::validateColumnsExists($bean, $columns);
@@ -385,7 +395,7 @@ private static function getClassUnique(\ReflectionClass $bean) : array
     {
         $return = [];
 
-        foreach ($bean->getAttributes(\CoolBeans\Attribute\ClassUniqueConstraint::class) as $index => $attribute) {
+        foreach (self::getClassAttributes($bean, \CoolBeans\Attribute\ClassUniqueConstraint::class) as $index => $attribute) {
             $constraintName = 'unique_' . $bean->getShortName() . '_' . $index;
             $columns = $attribute->newInstance()->columns;
             self::validateColumnsExists($bean, $columns);
@@ -413,6 +423,7 @@ private static function getCheck(\ReflectionProperty $property, string $beanName
             $type->getName() === 'string' &&
             \count($property->getAttributes(\CoolBeans\Attribute\AllowEmptyString::class)) === 0) {
             $constraintName = 'check_' . $beanName . '_' . $property->getName() . '_string_not_empty';
+
             $return[] = self::INDENTATION . 'CONSTRAINT `' . $constraintName . '` CHECK (`' . $property->name . '` != \'\')';
         }
 
@@ -423,7 +434,7 @@ private static function getClassCheck(\ReflectionClass $bean) : array
     {
         $return = [];
 
-        foreach ($bean->getAttributes(\CoolBeans\Attribute\ClassCheckConstraint::class) as $index => $attribute) {
+        foreach (self::getClassAttributes($bean, \CoolBeans\Attribute\ClassCheckConstraint::class) as $index => $attribute) {
             $constraintName = 'check_' . $bean->getShortName() . '_' . $index;
 
             $return[] = self::INDENTATION . 'CONSTRAINT `' . $constraintName . '` CHECK (' . $attribute->newInstance()->expression . ')';
@@ -554,4 +565,17 @@ private function getBeans(string $destination) : array
 
         return $beans;
     }
+
+    private static function getClassAttributes(\ReflectionClass $bean, string $attributeClass) : array
+    {
+        $return = $bean->getAttributes($attributeClass);
+        $parent = $bean->getParentClass();
+
+        while ($parent instanceof \ReflectionClass) {
+            $return = \array_merge($return, $parent->getAttributes($attributeClass));
+            $parent = $parent->getParentClass();
+        }
+
+        return $return;
+    }
 }

src/Selection.php

@@ -12,6 +12,7 @@ abstract class Selection implements \CoolBeans\Contract\Selection
 
     final public function __construct(
         protected \Nette\Database\Table\Selection $selection,
+        private bool $extraColumns = false,
     )
     {
         if (\CoolBeans\Config::$validateTableName) {
@@ -33,6 +34,7 @@ public function getTableName() : string
     public function select(string $select) : static
     {
         $this->selection->select($select);
+        $this->extraColumns = true;
 
         return $this;
     }
@@ -80,9 +82,9 @@ public function group(string $group) : static
     /**
      * Function to pass order query.
      */
-    public function order(string $order) : static
+    public function order(string $order, string|int|float|array|\BackedEnum|\DateTime ...$params) : static
     {
-        $this->selection->order($order);
+        $this->selection->order($order, ...$params);
 
         return $this;
     }
@@ -112,7 +114,7 @@ public function alias(string $tableChain, string $alias) : static
      */
     public function fetch() : ?\CoolBeans\Bean
     {
-        return static::createRow($this->selection->fetch());
+        return $this->createRow($this->selection->fetch());
     }
 
     /**
@@ -185,7 +187,7 @@ public function current() : ?\CoolBeans\Bean
         $current = $this->selection->current();
 
         return $current instanceof \Nette\Database\Table\ActiveRow ?
-            static::createRow($current) :
+            $this->createRow($current) :
             null;
     }
 
@@ -197,15 +199,23 @@ public function next() : void
         $this->selection->next();
     }
 
+    /**
+     * Returns internal Nette selection.
+     */
+    final public function getInternalSelection() : \Nette\Database\Table\Selection
+    {
+        return $this->selection;
+    }
+
     /**
      * Function to return specific Row class.
      */
-    final protected static function createRow(?\Nette\Database\Table\ActiveRow $row) : ?\CoolBeans\Bean
+    final protected function createRow(?\Nette\Database\Table\ActiveRow $row) : ?\CoolBeans\Bean
     {
         $rowClassName = static::ROW_CLASS;
 
         return $row instanceof \Nette\Database\Table\ActiveRow
-            ? new $rowClassName($row)
+            ? new $rowClassName($row, $this->extraColumns)
             : null;
     }