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

Author: glo60612

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
      */
-    const MYSQL_TABLE_TYPE = 'BASE TABLE';
+    public const MYSQL_TABLE_TYPE = 'BASE TABLE';
 
     /**
      * @var ResourceConnection
@@ -81,7 +81,7 @@ public function getTableOptions($tableName, $resource)
      *
      * @param  string $tableName
      * @param  string $resource
-     * @param array $tablesWithJsonTypeField
+     * @param  array $tablesWithJsonTypeField
      * @return array
      */
     public function readColumns($tableName, $resource, $tablesWithJsonTypeField = [])
@@ -109,7 +109,8 @@ 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']) {
+            if (count($tablesWithJsonTypeField) > 0 && isset($tablesWithJsonTypeField[$tableName])
+                 && $tablesWithJsonTypeField[$tableName] == $columnDefinition['name']) {
                 $columnDefinition['type'] = 'json';
             }
             $column = $this->definitionAggregator->fromDefinition($columnDefinition);

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

@@ -71,7 +71,7 @@ public function __construct(
     public function build(Schema $schema, $declarativeSchema = null)
     {
         $tablesWithJsonTypeField = [];
-        if($declarativeSchema != null) {
+        if ($declarativeSchema != null) {
             foreach ($declarativeSchema->getTables() as $table) {
                 foreach ($table->getColumns() as $column) {
                     if ($column->getType() == 'json') {