Merge pull request #4947 from magento-techdivision/MC-17633-MariaDB-Declarative-Schema-is-always-not-up-to-date

[techdivision] MC-17633: After running setup:upgrade, setup:db:check still says: Declarative Schema is not up to date (MariaDB issue)

Author: rganin

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

@@ -6,13 +6,11 @@
 
 namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Holds different definitions and apply them depends on column, constraint, index types.
- * Converts object to definition, and definition to array.
- *
- * @inheritdoc
  */
 class DefinitionAggregator implements DbDefinitionProcessorInterface
 {
@@ -21,14 +19,28 @@ class DefinitionAggregator implements DbDefinitionProcessorInterface
      */
     private $definitionProcessors;
 
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var string
+     */
+    private $dbVersion;
+
     /**
      * Constructor.
      *
+     * @param ResourceConnection $resourceConnection
      * @param DbDefinitionProcessorInterface[] $definitionProcessors
      */
-    public function __construct(array $definitionProcessors)
-    {
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        array $definitionProcessors
+    ) {
         $this->definitionProcessors = $definitionProcessors;
+        $this->resourceConnection = $resourceConnection;
     }
 
     /**
@@ -60,6 +72,61 @@ public function fromDefinition(array $data)
         }
 
         $definitionProcessor = $this->definitionProcessors[$type];
+        if (isset($data['default'])) {
+            $data['default'] = $this->processDefaultValue($data);
+        }
+
         return $definitionProcessor->fromDefinition($data);
     }
+
+    /**
+     * Get DB version
+     *
+     * @return string
+     */
+    private function getDatabaseVersion(): string
+    {
+        if (!$this->dbVersion) {
+            $this->dbVersion = $this->resourceConnection->getConnection('default')
+                ->fetchPairs("SHOW variables LIKE 'version'")['version'];
+        }
+
+        return $this->dbVersion;
+    }
+
+    /**
+     * Processes `$value` to be compatible with MySQL.
+     *
+     * @param array $data
+     * @return string|null|bool
+     */
+    protected function processDefaultValue(array $data)
+    {
+        $defaultValue = $data['default'];
+        if ($defaultValue === null || $data['default'] === false) {
+            return $defaultValue;
+        }
+        if ($defaultValue === "'NULL'") {
+            return "NULL";
+        }
+        if ($defaultValue === "NULL" && strpos($this->getDatabaseVersion(), 'MariaDB') !== false) {
+            return null;
+        }
+        /*
+         * MariaDB replaces some defaults by their respective functions, e.g. `DEFAULT CURRENT_TIMESTAMP` ends up being
+         * `current_timestamp()`  in the information schema.
+         */
+        $defaultValue = strtr(
+            $defaultValue,
+            [
+                'current_timestamp()' => 'CURRENT_TIMESTAMP',
+                'curdate()' => 'CURRENT_DATE',
+                'curtime()' => 'CURRENT_TIME'
+            ]
+        );
+        //replace escaped single quotes
+        $defaultValue = str_replace("'", "", $defaultValue);
+
+        return $defaultValue;
+    }
 }