skip changes AC-11654: Integration test failing testDbSchemaUpToDate …

…due to JSON column type
magento · Jun 4, 2024 · f20e1d6 · f20e1d6
1 parent 42b1c58
commit f20e1d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php
@@ -67,9 +67,8 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function build(Schema $schema, $tablesWithJsonTypeField = [])
+    public function build(Schema $schema)
     {
         foreach ($this->sharding->getResources() as $resource) {
             foreach ($this->dbSchemaReader->readTables($resource) as $tableName) {
@@ -96,16 +95,9 @@ public function build(Schema $schema, $tablesWithJsonTypeField = [])
                         '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;

diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfig.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfig.php
@@ -62,17 +62,8 @@ 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, $tablesWithJsonTypeField);
+        $schema = $this->dbSchemaBuilder->build($schema);
         return $schema;
     }