B2B-1712: Magento setup upgrade failed when new auto incremental field added to an existing table

- add integration tests

Author: joanhe

dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php

@@ -207,4 +207,67 @@ public function testCreateTableColumnWithExpressionAsColumnDefaultValue()
         $this->assertEquals('varchar', $stringColumn['DATA_TYPE'], 'Incorrect column type');
         $this->assertEquals('default test text', $stringColumn['DEFAULT'], 'Incorrect column default string value');
     }
+
+    /**
+     * Test get auto increment field
+     *
+     * @param array $options
+     * @param string|bool $expected
+     * @throws \Zend_Db_Exception
+     * @dataProvider getAutoIncrementFieldDataProvider
+     */
+    public function testGetAutoIncrementField(array $options, $expected)
+    {
+        $adapter = $this->getDbAdapter();
+        $tableName = 'table_auto_increment_field';
+
+        $table = $adapter
+            ->newTable($tableName)
+            ->addColumn(
+                'row_id',
+                Table::TYPE_INTEGER,
+                null,
+                $options,
+                'Row Id'
+            )
+            ->addColumn(
+                'created_at',
+                Table::TYPE_DATETIME,
+                null,
+                ['default' => new \Zend_Db_Expr('CURRENT_TIMESTAMP')]
+            )
+            ->addColumn(
+                'integer_column',
+                Table::TYPE_INTEGER,
+                11,
+                ['default' => 123456]
+            )->addColumn(
+                'string_column',
+                Table::TYPE_TEXT,
+                255,
+                ['default' => 'default test text']
+            )
+            ->setComment('Test table column with expression as column default value');
+        $adapter->createTable($table);
+        $autoIncrementField = $adapter->getAutoIncrementField($tableName);
+        $this->assertEquals($expected, $autoIncrementField);
+
+        //clean up database from test table
+        $adapter->dropTable($tableName);
+
+    }
+
+    public function getAutoIncrementFieldDataProvider()
+    {
+        return [
+            'auto increment field' => [
+                'field options' => ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+                'expected result' => 'row_id',
+            ],
+            'non auto increment field' => [
+                'field options' => ['unsigned' => true, 'nullable' => false,],
+                'expected result' => false,
+            ]
+        ];
+    }
 }

dev/tests/integration/testsuite/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaWriterTest.php

@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Ddl\Table;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test DB schema writer
+ *
+ * @magentoDbIsolation disabled
+ */
+class DbSchemaWriterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var DbSchemaWriter
+     */
+    private $dbSchemaWriter;
+
+    protected function setUp(): void
+    {
+        set_error_handler(null);
+        $this->resourceConnection = Bootstrap::getObjectManager()->get(ResourceConnection::class);
+        $this->dbSchemaWriter = Bootstrap::getObjectManager()->get(DbSchemaWriter::class);
+    }
+
+    protected function tearDown(): void
+    {
+        restore_error_handler();
+    }
+
+    /**
+     * Retrieve database adapter instance
+     *
+     * @return \Magento\Framework\DB\Adapter\Pdo\Mysql
+     */
+    private function getDbAdapter()
+    {
+        return $this->resourceConnection->getConnection();
+    }
+
+    /**
+     * Test reset auto increment
+     *
+     * @param array $options
+     * @param string|bool $expected
+     * @throws \Zend_Db_Exception
+     * @dataProvider getAutoIncrementFieldDataProvider
+     */
+    public function testResetAutoIncrement(array $options, $expected)
+    {
+        $adapter = $this->getDbAdapter();
+        $tableName = 'table_auto_increment_field';
+
+        $table = $adapter
+            ->newTable($tableName)
+            ->addColumn(
+                'row_id',
+                Table::TYPE_INTEGER,
+                null,
+                $options,
+                'Row Id'
+            )
+            ->addColumn(
+                'created_at',
+                Table::TYPE_DATETIME,
+                null,
+                ['default' => new \Zend_Db_Expr('CURRENT_TIMESTAMP')]
+            )
+            ->addColumn(
+                'integer_column',
+                Table::TYPE_INTEGER,
+                11,
+                ['default' => 123456]
+            )->addColumn(
+                'string_column',
+                Table::TYPE_TEXT,
+                255,
+                ['default' => 'default test text']
+            )
+            ->setComment('Test table column with expression as column default value');
+        $adapter->createTable($table);
+
+        $dbStatement = $this->dbSchemaWriter->resetAutoIncrement($tableName, 'default');
+        $this->assertEquals($expected, $dbStatement->getStatement());
+
+        //clean up database from test table
+        $adapter->dropTable($tableName);
+
+    }
+
+    public function getAutoIncrementFieldDataProvider()
+    {
+        return [
+            'auto increment field' => [
+                'field options' => ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+                'expected result' => 'AUTO_INCREMENT = 0',
+            ],
+            'non auto increment field' => [
+                'field options' => ['unsigned' => true, 'nullable' => false,],
+                'expected result' => 'AUTO_INCREMENT = 1',
+            ]
+        ];
+    }
+}