Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MariaDB improvements, support 10.3 #3283

Merged
merged 1 commit into from
Sep 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,18 @@ jobs:
addons:
mariadb: 10.2

- stage: Test
php: 7.2
env: DB=mariadb MARIADB_VERSION=10.3
addons:
mariadb: 10.3

- stage: Test
php: 7.2
env: DB=mariadb.mysqli MARIADB_VERSION=10.3
addons:
mariadb: 10.3

- stage: Test
php: 7.1
env: DB=pgsql POSTGRESQL_VERSION=9.2 COVERAGE=yes
Expand Down
5 changes: 5 additions & 0 deletions docs/en/reference/platforms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ MySQL
- ``MySQL57Platform`` for version 5.7 (5.7.9 GA) and above.
- ``MySQL80Platform`` for version 8.0 (8.0 GA) and above.

MariaDB
^^^^^

- ``MariaDb1027Platform`` for version 10.2 (10.2.7 GA) and above.

Oracle
^^^^^^

Expand Down
10 changes: 1 addition & 9 deletions lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,13 @@
/**
* Provides the behavior, features and SQL dialect of the MariaDB 10.2 (10.2.7 GA) database platform.
*
* Note: Should not be used with versions prior ro 10.2.7.
* Note: Should not be used with versions prior to 10.2.7.
*
* @author Vanvelthem Sébastien
* @link www.doctrine-project.org
*/
final class MariaDb1027Platform extends MySqlPlatform
{
/**
* {@inheritdoc}
*/
public function hasNativeJsonType() : bool
{
return false;
}

/**
* {@inheritdoc}
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
namespace Doctrine\Tests\DBAL\Platforms;

use Doctrine\DBAL\Platforms\MariaDb1027Platform;
use Doctrine\DBAL\Schema\Comparator;
use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\Type;

class MariaDb1027PlatformTest extends AbstractMySQLPlatformTestCase
Expand Down