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

Author: glo60612

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

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

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

@@ -81,9 +81,10 @@ public function getTableOptions($tableName, $resource)
      *
      * @param  string $tableName
      * @param  string $resource
+     * @param array $tablesWithJsonTypeField
      * @return array
      */
-    public function readColumns($tableName, $resource)
+    public function readColumns($tableName, $resource, $tablesWithJsonTypeField = [])
     {
         $columns = [];
         $adapter = $this->resourceConnection->getConnection($resource);
@@ -108,6 +109,9 @@ public function readColumns($tableName, $resource)
         $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

@@ -68,16 +68,26 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function build(Schema $schema)
+    public function build(Schema $schema, $declarativeSchema = null)
     {
+        $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);
+                $columnsData = $this->dbSchemaReader->readColumns($tableName, $resource, $tablesWithJsonTypeField);
                 $indexesData = $this->dbSchemaReader->readIndexes($tableName, $resource);
                 $constrainsData = $this->dbSchemaReader->readConstraints($tableName, $resource);
 

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

@@ -63,7 +63,7 @@ public function __construct(
     public function getDbConfig()
     {
         $schema = $this->schemaFactory->create();
-        $schema = $this->dbSchemaBuilder->build($schema);
+        $schema = $this->dbSchemaBuilder->build($schema, $this->getDeclarationConfig());
         return $schema;
     }