AC-11654::Integration test failing testDbSchemaUpToDate due to JSON column type

Author: glo60612

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaReaderInterface.php

@@ -38,10 +38,9 @@ public function readConstraints($tableName, $resource);
      *
      * @param  string $tableName
      * @param  string $resource
-     * @param  object $declarativeSchema
      * @return array
      */
-    public function readColumns($tableName, $resource, $declarativeSchema);
+    public function readColumns($tableName, $resource);
 
     /**
      * Show table options like engine, partitioning, etc.

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaReader.php

@@ -21,7 +21,7 @@ class DbSchemaReader implements DbSchemaReaderInterface
     /**
      * Table type in information_schema.TABLES which allows to identify only tables and ignore views
      */
-    public const MYSQL_TABLE_TYPE = 'BASE TABLE';
+    const MYSQL_TABLE_TYPE = 'BASE TABLE';
 
     /**
      * @var ResourceConnection
@@ -81,10 +81,9 @@ public function getTableOptions($tableName, $resource)
      *
      * @param  string $tableName
      * @param  string $resource
-     * @param  array $tablesWithJsonTypeField
      * @return array
      */
-    public function readColumns($tableName, $resource, $tablesWithJsonTypeField = [])
+    public function readColumns($tableName, $resource)
     {
         $columns = [];
         $adapter = $this->resourceConnection->getConnection($resource);
@@ -109,10 +108,6 @@ public function readColumns($tableName, $resource, $tablesWithJsonTypeField = []
         $columnsDefinition = $adapter->fetchAssoc($stmt);
 
         foreach ($columnsDefinition as $columnDefinition) {
-            if (count($tablesWithJsonTypeField) > 0 && isset($tablesWithJsonTypeField[$tableName])
-                 && $tablesWithJsonTypeField[$tableName] == $columnDefinition['name']) {
-                $columnDefinition['type'] = 'json';
-            }
             $column = $this->definitionAggregator->fromDefinition($columnDefinition);
             $columns[$column['name']] = $column;
         }

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php

@@ -67,28 +67,17 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function build(Schema $schema, $declarativeSchema = null)
+    public function build(Schema $schema, $tablesWithJsonTypeField = [])
     {
-        $tablesWithJsonTypeField = [];
-        if ($declarativeSchema != null) {
-            foreach ($declarativeSchema->getTables() as $table) {
-                foreach ($table->getColumns() as $column) {
-                    if ($column->getType() == 'json') {
-                        $tablesWithJsonTypeField[$table->getName()] = $column->getName();
-                    }
-                }
-            }
-        }
         foreach ($this->sharding->getResources() as $resource) {
             foreach ($this->dbSchemaReader->readTables($resource) as $tableName) {
                 $columns = [];
                 $indexes = [];
                 $constraints = [];
 
                 $tableOptions = $this->dbSchemaReader->getTableOptions($tableName, $resource);
-                $columnsData = $this->dbSchemaReader->readColumns($tableName, $resource, $tablesWithJsonTypeField);
+                $columnsData = $this->dbSchemaReader->readColumns($tableName, $resource);
                 $indexesData = $this->dbSchemaReader->readIndexes($tableName, $resource);
                 $constrainsData = $this->dbSchemaReader->readConstraints($tableName, $resource);
 
@@ -106,9 +95,16 @@ public function build(Schema $schema, $declarativeSchema = null)
                         'collation' => $tableOptions['collation']
                     ]
                 );
+                $isJsonType = false;
+                if (count($tablesWithJsonTypeField) > 0 && isset($tablesWithJsonTypeField[$tableName])) {
+                    $isJsonType = true;
+                }
 
                 // Process columns
                 foreach ($columnsData as $columnData) {
+                    if ($isJsonType && $tablesWithJsonTypeField[$tableName] == $columnData['name']) {
+                        $columnData['type'] = 'json';
+                    }
                     $columnData['table'] = $table;
                     $column = $this->elementFactory->create($columnData['type'], $columnData);
                     $columns[$column->getName()] = $column;

lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfig.php

@@ -62,8 +62,17 @@ public function __construct(
      */
     public function getDbConfig()
     {
+        $declarativeSchema = $this->getDeclarationConfig();
+        $tablesWithJsonTypeField = [];
+        foreach ($declarativeSchema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column->getType() == 'json') {
+                    $tablesWithJsonTypeField[$table->getName()] = $column->getName();
+                }
+            }
+        }
         $schema = $this->schemaFactory->create();
-        $schema = $this->dbSchemaBuilder->build($schema, $this->getDeclarationConfig());
+        $schema = $this->dbSchemaBuilder->build($schema, $tablesWithJsonTypeField);
         return $schema;
     }