Merge pull request #49 from moufmouf/mariadb

Adding tests for MariaDB

Author: moufmouf

.travis.yml

@@ -10,6 +10,14 @@ matrix:
       env: PREFER_LOWEST="" DB=mysql
     - php: 7.1
       env: PREFER_LOWEST="--prefer-lowest" DB=mysql
+    - php: 7.1
+      env: PREFER_LOWEST="" DB=mariadb
+      addons:
+        mariadb: '10.0'
+    - php: 7.1
+      env: PREFER_LOWEST="--prefer-lowest" DB=mariadb
+      addons:
+        mariadb: '10.0'
     - php: 7.1
       env: PREFER_LOWEST="--prefer-lowest" DB=oracle PHPUNITFILE="-c phpunit.oracle.xml"
       sudo: required

phpunit.mariadb.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="vendor/autoload.php"
+>
+    <testsuites>
+        <testsuite name="TDBM Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <php>
+        <!-- "Real" test database -->
+        <var name="db_host" value="127.0.0.1" />
+        <var name="db_username" value="root" />
+        <var name="db_password" value="root" />
+        <var name="db_name" value="tdbm_testcase" />
+        <var name="db_port" value="3306"/>
+        <var name="db_driver" value="pdo_mysql"/>
+    </php>
+    
+    <filter>
+  		<whitelist processUncoveredFilesFromWhitelist="true">
+    		<directory suffix=".php">src/</directory>
+    		<exclude>
+                <directory suffix=".php">src/Test</directory>
+    		</exclude>
+  		</whitelist>
+	</filter>
+    <logging>
+        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+</phpunit>

src/Utils/ScalarBeanPropertyDescriptor.php

@@ -5,6 +5,8 @@
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
+use Doctrine\DBAL\Types\DateTimeImmutableType;
+use Doctrine\DBAL\Types\DateTimeType;
 use Ramsey\Uuid\Uuid;
 use TheCodingMachine\TDBM\TDBMException;
 use TheCodingMachine\TDBM\Utils\Annotation\Annotation;
@@ -134,7 +136,8 @@ private function getAnnotations(): Annotations
      */
     public function hasDefault()
     {
-        return $this->column->getDefault() !== null || $this->hasUuidAnnotation();
+        // MariaDB 10.3 issue: it returns "NULL" (the string) instead of *null*
+        return ($this->column->getDefault() !== null && $this->column->getDefault() !== 'NULL') || $this->hasUuidAnnotation();
     }
 
     /**
@@ -162,12 +165,27 @@ public function assignToDefaultCode()
             }
         } else {
             $default = $this->column->getDefault();
-
-            if (in_array(strtoupper($default), ['CURRENT_TIMESTAMP' /* MySQL */, 'NOW()' /* PostgreSQL */, 'SYSDATE' /* Oracle */ ], true)) {
-                $defaultCode = 'new \DateTimeImmutable()';
+            $type = $this->column->getType();
+
+            if (in_array($type->getName(), [
+                'datetime',
+                'datetime_immutable',
+                'datetimetz',
+                'datetimetz_immutable',
+                'date',
+                'date_immutable',
+                'time',
+                'time_immutable',
+            ], true)) {
+                if (in_array(strtoupper($default), ['CURRENT_TIMESTAMP' /* MySQL */, 'NOW()' /* PostgreSQL */, 'SYSDATE' /* Oracle */ , 'CURRENT_TIMESTAMP()' /* MariaDB 10.3 */], true)) {
+                    $defaultCode = 'new \DateTimeImmutable()';
+                } else {
+                    throw new TDBMException('Unable to set default value for date. Database passed this default value: "'.$default.'"');
+                }
             } else {
                 $defaultCode = var_export($this->column->getDefault(), true);
             }
+
         }
 
         return sprintf($str, $this->getSetterName(), $defaultCode);

tests/phpunit-mariadb.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# Use this file to start a PostgreSQL database using Docker and then run the test suite on the PostgreSQL database.
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+cd ..
+
+docker run --name mariadb-tdbm-test -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -d mariadb:10.3
+
+# Let's wait for MariaDB to start
+sleep 20
+
+vendor/bin/phpunit -c phpunit.mariadb.xml
+
+docker stop mariadb-tdbm-test
+docker rm mariadb-tdbm-test