Merge remote-tracking branch 'origin/AC-11654' into spartans_pr_15042024

Author: glo60612

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

@@ -67,8 +67,9 @@ public function __construct(
 
     /**
      * @inheritdoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function build(Schema $schema)
+    public function build(Schema $schema, $tablesWithJsonTypeField = [])
     {
         foreach ($this->sharding->getResources() as $resource) {
             foreach ($this->dbSchemaReader->readTables($resource) as $tableName) {
@@ -95,9 +96,16 @@ public function build(Schema $schema)
                         '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);
+        $schema = $this->dbSchemaBuilder->build($schema, $tablesWithJsonTypeField);
         return $schema;
     }