Merge branch 'ntr/improve-order-state-e2e-test' into '6.0+ea'

NTR - Improve waiting in order state and variant e2e tests

See merge request shopware/6/product/platform!81

Content/Category/CategoryDefinition.php

@@ -23,7 +23,6 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\SearchRanking;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\WriteProtected;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\IdField;
-use Shopware\Core\Framework\DataAbstractionLayer\Field\IntField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ManyToManyAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ManyToOneAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\OneToManyAssociationField;
@@ -93,7 +92,6 @@ protected function defineFields(): FieldCollection
             new FkField('media_id', 'mediaId', MediaDefinition::class),
 
             (new BoolField('display_nested_products', 'displayNestedProducts'))->addFlags(new Required()),
-            (new IntField('auto_increment', 'autoIncrement'))->addFlags(new WriteProtected()),
 
             (new TranslatedField('breadcrumb'))->addFlags(new WriteProtected()),
             new TreeLevelField('level', 'level'),

Content/Category/CategoryEntity.php

@@ -19,11 +19,6 @@ class CategoryEntity extends Entity
      */
     protected $parentId;
 
-    /**
-     * @var int
-     */
-    protected $autoIncrement;
-
     /**
      * @var string|null
      */
@@ -279,16 +274,6 @@ public function setProducts(ProductCollection $products): void
         $this->products = $products;
     }
 
-    public function getAutoIncrement(): int
-    {
-        return $this->autoIncrement;
-    }
-
-    public function setAutoIncrement(int $autoIncrement): void
-    {
-        $this->autoIncrement = $autoIncrement;
-    }
-
     public function getNestedProducts(): ?ProductCollection
     {
         return $this->nestedProducts;

Content/Product/ProductDefinition.php

@@ -113,8 +113,6 @@ protected function defineFields(): FieldCollection
             (new BlacklistRuleField())->addFlags(new ReadProtected(SalesChannelApiSource::class)),
             (new WhitelistRuleField())->addFlags(new ReadProtected(SalesChannelApiSource::class)),
 
-            (new IntField('auto_increment', 'autoIncrement'))->addFlags(new WriteProtected()),
-
             //not inherited fields
             new BoolField('active', 'active'),
             (new IntField('stock', 'stock'))->addFlags(new Required()),

Content/Product/ProductEntity.php

@@ -39,11 +39,6 @@ class ProductEntity extends Entity
      */
     protected $childCount;
 
-    /**
-     * @var int
-     */
-    protected $autoIncrement;
-
     /**
      * @var string|null
      */
@@ -912,16 +907,6 @@ public function setCategoriesRo(CategoryCollection $categoriesRo): void
         $this->categoriesRo = $categoriesRo;
     }
 
-    public function getAutoIncrement(): int
-    {
-        return $this->autoIncrement;
-    }
-
-    public function setAutoIncrement(int $autoIncrement): void
-    {
-        $this->autoIncrement = $autoIncrement;
-    }
-
     public function getCoverId(): ?string
     {
         return $this->coverId;

Framework/DataAbstractionLayer/Dbal/Common/IteratorFactory.php

@@ -27,16 +27,8 @@ public function createIterator(EntityDefinition $definition): IterableQuery
         $query->from($escaped);
         $query->setMaxResults(50);
 
-        if ($definition->getFields()->has('autoIncrement')) {
-            $query->select([$escaped . '.auto_increment', 'LOWER(HEX(' . $escaped . '.id))']);
-            $query->andWhere($escaped . '.auto_increment > :lastId');
-            $query->addOrderBy($escaped . '.auto_increment');
-            $query->setParameter('lastId', 0);
-
-            return new LastIdQuery($query);
-        }
-
-        $query->select([$escaped . '.id', 'LOWER(HEX(' . $escaped . '.id))']);
+        $query->select('LOWER(HEX(' . $escaped . '.id))');
+        $query->orderBy($escaped . '.id', 'asc');
         $query->setFirstResult(0);
 
         return new OffsetQuery($query);

Framework/DataAbstractionLayer/Dbal/Common/OffsetQuery.php

@@ -2,8 +2,8 @@
 
 namespace Shopware\Core\Framework\DataAbstractionLayer\Dbal\Common;
 
+use Doctrine\DBAL\FetchMode;
 use Doctrine\DBAL\Query\QueryBuilder;
-use Shopware\Core\Framework\Doctrine\FetchModeHelper;
 
 class OffsetQuery implements IterableQuery
 {
@@ -24,8 +24,7 @@ public function __construct(QueryBuilder $query)
 
     public function fetch(): array
     {
-        $data = $this->query->execute()->fetchAll();
-        $data = FetchModeHelper::keyPair($data);
+        $data = $this->query->execute()->fetchAll(FetchMode::COLUMN);
 
         $this->offset += \count($data);
         $this->query->setFirstResult($this->offset);

Migration/Migration1565007156RemoveAutoIncrement.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace Shopware\Core\Migration;
+
+use Doctrine\DBAL\Connection;
+use Shopware\Core\Framework\Migration\MigrationStep;
+
+class Migration1565007156RemoveAutoIncrement extends MigrationStep
+{
+    public function getCreationTimestamp(): int
+    {
+        return 1565007156;
+    }
+
+    public function update(Connection $connection): void
+    {
+        // implement update
+    }
+
+    public function updateDestructive(Connection $connection): void
+    {
+        $connection->executeUpdate('ALTER TABLE product DROP COLUMN auto_increment');
+        $connection->executeUpdate('ALTER TABLE category DROP COLUMN auto_increment');
+    }
+}