Drop support for SQL Anywhere <16

UPGRADE.md

@@ -8,6 +8,21 @@ All implementations of the `PingableConnection` and `ServerInfoAwareConnection`
 
 All implementations of the `VersionAwarePlatformDriver` interface have to implement the methods defined in the `Driver` interface as well.
 
+## BC BREAK: Removed support for SQL Anywhere 12 and older
+
+DBAL now requires SQL Anywhere 16 or newer, support for unmaintained versions has been dropped.
+If you are using any of the legacy versions, you have to upgrade to a newer SQL Anywhere version (16+).
+`Doctrine\DBAL\Platforms\SQLAnywherePlatform` and `Doctrine\DBAL\Platforms\Keywords\SQLAnywhereKeywords` now represent SQL Anywhere 16.
+
+The following classes have been removed:
+
+ * `Doctrine\DBAL\Platforms\SQLAnywhere11Platform`
+ * `Doctrine\DBAL\Platforms\SQLAnywhere12Platform`
+ * `Doctrine\DBAL\Platforms\SQLAnywhere16Platform`
+ * `Doctrine\DBAL\Platforms\Keywords\SQLAnywhere11Keywords`
+ * `Doctrine\DBAL\Platforms\Keywords\SQLAnywhere12Keywords`
+ * `Doctrine\DBAL\Platforms\Keywords\SQLAnywhere16Keywords`
+
 ## BC BREAK: Removed support for SQL Server 2005 and older
 
 DBAL now requires SQL Server 2008 or newer, support for unmaintained versions has been dropped.

docs/en/reference/configuration.rst

@@ -331,14 +331,9 @@ sqlanywhere
 Depending on the used underlying platform version, you can specify
 any other connection parameter that is supported by the particular
 platform version via the ``driverOptions`` option.
-You can find a list of supported connection parameters for each
-platform version here:
-
-- `SQL Anywhere 10.0.1 <http://dcx.sybase.com/index.html#1001/en/dbdaen10/da-conmean.html>`_
-- `SQL Anywhere 11.0.0 <http://dcx.sybase.com/index.html#1100/en/dbadmin_en11/conmean.html>`_
-- `SQL Anywhere 11.0.1 <http://dcx.sybase.com/index.html#1101/en/dbadmin_en11/conmean.html>`_
-- `SQL Anywhere 12.0.0 <http://dcx.sybase.com/index.html#1200/en/dbadmin/da-conparm.html>`_
-- `SQL Anywhere 12.0.1 <http://dcx.sybase.com/index.html#1201/en/dbadmin/da-conparm.html>`_
+You can find a list of supported connection parameters for the
+currently supported platform here:
+
 - `SAP Sybase SQL Anywhere 16.0 <http://dcx.sybase.com/index.html#sa160/en/dbadmin/da-conparm.html>`_
 
 Automatic platform version detection

docs/en/reference/platforms.rst

@@ -63,10 +63,7 @@ PostgreSQL
 SAP Sybase SQL Anywhere
 ^^^^^^^^^^^^^^^^^^^^^^^
 
--  ``SQLAnywherePlatform`` for version 10 and above (deprecated).
--  ``SQLAnywhere11Platform`` for version 11 and above (deprecated).
--  ``SQLAnywhere12Platform`` for version 12 and above (deprecated).
--  ``SQLAnywhere16Platform`` for version 16 and above.
+-  ``SQLAnywherePlatform`` for version 16 and above.
 
 SQLite
 ^^^^^^

docs/en/reference/types.rst

@@ -729,9 +729,7 @@ Please also notice the mapping specific footnotes for additional information.
 |                   |               +--------------------------+         |                                                          |
 |                   |               | **Oracle**               |         |                                                          |
 |                   |               +--------------------------+---------+----------------------------------------------------------+
-|                   |               | **SQL Anywhere**         | < 12    | ``DATETIME``  [15]_ [16]_                                |
-|                   |               |                          +---------+----------------------------------------------------------+
-|                   |               |                          | >= 12   | ``TIMESTAMP WITH TIME ZONE``                             |
+|                   |               | **SQL Anywhere**         | "all"   | ``TIMESTAMP WITH TIME ZONE``                             |
 +-------------------+---------------+--------------------------+---------+----------------------------------------------------------+
 | **time**          | ``\DateTime`` | **MySQL**                | *all*   | ``TIME``                                                 |
 |                   |               +--------------------------+         |                                                          |

lib/Doctrine/DBAL/Driver/AbstractSQLAnywhereDriver.php

@@ -5,14 +5,10 @@ namespace Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Platforms\SQLAnywhere11Platform;
-use Doctrine\DBAL\Platforms\SQLAnywhere12Platform;
-use Doctrine\DBAL\Platforms\SQLAnywhere16Platform;
 use Doctrine\DBAL\Platforms\SQLAnywherePlatform;
 use Doctrine\DBAL\Schema\SQLAnywhereSchemaManager;
 use Doctrine\DBAL\VersionAwarePlatformDriver;
 use function preg_match;
-use function version_compare;
 
 /**
  * Abstract base implementation of the {@link Doctrine\DBAL\Driver} interface for SAP Sybase SQL Anywhere based drivers.
@@ -87,12 +83,6 @@ abstract class AbstractSQLAnywhereDriver implements ExceptionConverterDriver, Ve
         $version      = $majorVersion . '.' . $minorVersion . '.' . $patchVersion . '.' . $buildVersion;
 
         switch (true) {
-            case version_compare($version, '16', '>='):
-                return new SQLAnywhere16Platform();
-            case version_compare($version, '12', '>='):
-                return new SQLAnywhere12Platform();
-            case version_compare($version, '11', '>='):
-                return new SQLAnywhere11Platform();
             default:
                 return new SQLAnywherePlatform();
         }
@@ -113,7 +103,7 @@ abstract class AbstractSQLAnywhereDriver implements ExceptionConverterDriver, Ve
      */
     public function getDatabasePlatform()
     {
-        return new SQLAnywhere12Platform();
+        return new SQLAnywherePlatform();
     }
 
     /**

lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhereKeywords.php

@@ -28,6 +28,7 @@ class SQLAnywhereKeywords extends KeywordList
             'ALTER',
             'AND',
             'ANY',
+            'ARRAY',
             'AS',
             'ASC',
             'ATTACH',
@@ -68,6 +69,7 @@ class SQLAnywhereKeywords extends KeywordList
             'CURRENT_USER',
             'CURSOR',
             'DATE',
+            'DATETIMEOFFSET',
             'DBSPACE',
             'DEALLOCATE',
             'DEC',
@@ -114,7 +116,6 @@ class SQLAnywhereKeywords extends KeywordList
             'IF',
             'IN',
             'INDEX',
-            'INDEX_LPAREN',
             'INNER',
             'INOUT',
             'INSENSITIVE',
@@ -127,20 +128,22 @@ class SQLAnywhereKeywords extends KeywordList
             'INTEGRATED',
             'INTERSECT',
             'INTO',
-            'IQ',
             'IS',
             'ISOLATION',
             'JOIN',
+            'JSON',
             'KERBEROS',
             'KEY',
             'LATERAL',
             'LEFT',
             'LIKE',
+            'LIMIT',
             'LOCK',
             'LOGIN',
             'LONG',
             'MATCH',
             'MEMBERSHIP',
+            'MERGE',
             'MESSAGE',
             'MODE',
             'MODIFY',
@@ -158,6 +161,8 @@ class SQLAnywhereKeywords extends KeywordList
             'OFF',
             'ON',
             'OPEN',
+            'OPENSTRING',
+            'OPENXML',
             'OPTION',
             'OPTIONS',
             'OR',
@@ -194,6 +199,8 @@ class SQLAnywhereKeywords extends KeywordList
             'RIGHT',
             'ROLLBACK',
             'ROLLUP',
+            'ROW',
+            'ROWTYPE',
             'SAVE',
             'SAVEPOINT',
             'SCROLL',
@@ -205,6 +212,7 @@ class SQLAnywhereKeywords extends KeywordList
             'SHARE',
             'SMALLINT',
             'SOME',
+            'SPATIAL',
             'SQLCODE',
             'SQLSTATE',
             'START',
@@ -212,7 +220,6 @@ class SQLAnywhereKeywords extends KeywordList
             'SUBTRANS',
             'SUBTRANSACTION',
             'SYNCHRONIZE',
-            'SYNTAX_ERROR',
             'TABLE',
             'TEMPORARY',
             'THEN',
@@ -222,6 +229,7 @@ class SQLAnywhereKeywords extends KeywordList
             'TO',
             'TOP',
             'TRAN',
+            'TREAT',
             'TRIGGER',
             'TRUNCATE',
             'TSEQUAL',
@@ -230,6 +238,7 @@ class SQLAnywhereKeywords extends KeywordList
             'UNIQUE',
             'UNIQUEIDENTIFIER',
             'UNKNOWN',
+            'UNNEST',
             'UNSIGNED',
             'UPDATE',
             'UPDATING',
@@ -241,6 +250,7 @@ class SQLAnywhereKeywords extends KeywordList
             'VARBIT',
             'VARCHAR',
             'VARIABLE',
+            'VARRAY',
             'VARYING',
             'VIEW',
             'WAIT',
@@ -250,9 +260,6 @@ class SQLAnywhereKeywords extends KeywordList
             'WHILE',
             'WINDOW',
             'WITH',
-            'WITH_CUBE',
-            'WITH_LPAREN',
-            'WITH_ROLLUP',
             'WITHIN',
             'WORK',
             'WRITETEXT',

lib/Doctrine/DBAL/Platforms/SQLAnywhere11Platform.php

-<?php
-
-namespace Doctrine\DBAL\Platforms;
-
-/**
- * The SQLAnywhere11Platform provides the behavior, features and SQL dialect of the
- * SAP Sybase SQL Anywhere 11 database platform.
- *
- * @deprecated Use SQLAnywhere 16 or newer
- */
-class SQLAnywhere11Platform extends SQLAnywherePlatform
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getRegexpExpression()
-    {
-        return 'REGEXP';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getReservedKeywordsClass()
-    {
-        return Keywords\SQLAnywhere11Keywords::class;
-    }
-}

lib/Doctrine/DBAL/Platforms/SQLAnywhere12Platform.php

-<?php
-
-namespace Doctrine\DBAL\Platforms;
-
-use Doctrine\DBAL\Schema\Index;
-use Doctrine\DBAL\Schema\Sequence;
-
-/**
- * The SQLAnywhere12Platform provides the behavior, features and SQL dialect of the
- * SAP Sybase SQL Anywhere 12 database platform.
- *
- * @deprecated Use SQLAnywhere 16 or newer
- */
-class SQLAnywhere12Platform extends SQLAnywhere11Platform
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getCreateSequenceSQL(Sequence $sequence)
-    {
-        return 'CREATE SEQUENCE ' . $sequence->getQuotedName($this) .
-            ' INCREMENT BY ' . $sequence->getAllocationSize() .
-            ' START WITH ' . $sequence->getInitialValue() .
-            ' MINVALUE ' . $sequence->getInitialValue();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAlterSequenceSQL(Sequence $sequence)
-    {
-        return 'ALTER SEQUENCE ' . $sequence->getQuotedName($this) .
-            ' INCREMENT BY ' . $sequence->getAllocationSize();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDateTimeTzFormatString()
-    {
-        return 'Y-m-d H:i:s.uP';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDateTimeTzTypeDeclarationSQL(array $fieldDeclaration)
-    {
-        return 'TIMESTAMP WITH TIME ZONE';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDropSequenceSQL($sequence)
-    {
-        if ($sequence instanceof Sequence) {
-            $sequence = $sequence->getQuotedName($this);
-        }
-
-        return 'DROP SEQUENCE ' . $sequence;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getListSequencesSQL($database)
-    {
-        return 'SELECT sequence_name, increment_by, start_with, min_value FROM SYS.SYSSEQUENCE';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSequenceNextValSQL($sequenceName)
-    {
-        return 'SELECT ' . $sequenceName . '.NEXTVAL';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsSequences()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getAdvancedIndexOptionsSQL(Index $index)
-    {
-        if (! $index->isPrimary() && $index->isUnique() && $index->hasFlag('with_nulls_not_distinct')) {
-            return ' WITH NULLS NOT DISTINCT' . parent::getAdvancedIndexOptionsSQL($index);
-        }
-
-        return parent::getAdvancedIndexOptionsSQL($index);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getReservedKeywordsClass()
-    {
-        return Keywords\SQLAnywhere12Keywords::class;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function initializeDoctrineTypeMappings()
-    {
-        parent::initializeDoctrineTypeMappings();
-        $this->doctrineTypeMapping['timestamp with time zone'] = 'datetime';
-    }
-}

lib/Doctrine/DBAL/Platforms/SQLAnywhere16Platform.php

-<?php
-
-namespace Doctrine\DBAL\Platforms;
-
-use Doctrine\DBAL\Schema\Index;
-use UnexpectedValueException;
-
-/**
- * The SQLAnywhere16Platform provides the behavior, features and SQL dialect of the
- * SAP Sybase SQL Anywhere 16 database platform.
- */
-class SQLAnywhere16Platform extends SQLAnywhere12Platform
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function getAdvancedIndexOptionsSQL(Index $index)
-    {
-        if ($index->hasFlag('with_nulls_distinct') && $index->hasFlag('with_nulls_not_distinct')) {
-            throw new UnexpectedValueException(
-                'An Index can either have a "with_nulls_distinct" or "with_nulls_not_distinct" flag but not both.'
-            );
-        }
-
-        if (! $index->isPrimary() && $index->isUnique() && $index->hasFlag('with_nulls_distinct')) {
-            return ' WITH NULLS DISTINCT' . parent::getAdvancedIndexOptionsSQL($index);
-        }
-
-        return parent::getAdvancedIndexOptionsSQL($index);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getReservedKeywordsClass()
-    {
-        return Keywords\SQLAnywhere16Keywords::class;
-    }
-}

lib/Doctrine/DBAL/Platforms/SQLAnywherePlatform.php

@@ -10,10 +10,12 @@ use Doctrine\DBAL\Schema\Constraint;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Identifier;
 use Doctrine\DBAL\Schema\Index;
+use Doctrine\DBAL\Schema\Sequence;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\TransactionIsolationLevel;
 use InvalidArgumentException;
+use UnexpectedValueException;
 use function array_merge;
 use function array_unique;
 use function array_values;
@@ -32,9 +34,7 @@ use function substr;
 
 /**
  * The SQLAnywherePlatform provides the behavior, features and SQL dialect of the
- * SAP Sybase SQL Anywhere 10 database platform.
- *
- * @deprecated Use SQLAnywhere 16 or newer
+ * SAP Sybase SQL Anywhere 16 database platform.
  */
 class SQLAnywherePlatform extends AbstractPlatform
 {
@@ -509,7 +509,7 @@ class SQLAnywherePlatform extends AbstractPlatform
      */
     public function getDateTimeTzFormatString()
     {
-        return $this->getDateTimeFormatString();
+        return 'Y-m-d H:i:s.uP';
     }
 
     /**
@@ -1000,6 +1000,14 @@ SQL
         return 'HASH(' . $column . ", 'MD5')";
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getRegexpExpression()
+    {
+        return 'REGEXP';
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -1183,6 +1191,70 @@ SQL
         return $this->getTableConstraintDeclarationSQL($index, $name);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getCreateSequenceSQL(Sequence $sequence)
+    {
+        return 'CREATE SEQUENCE ' . $sequence->getQuotedName($this) .
+            ' INCREMENT BY ' . $sequence->getAllocationSize() .
+            ' START WITH ' . $sequence->getInitialValue() .
+            ' MINVALUE ' . $sequence->getInitialValue();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAlterSequenceSQL(Sequence $sequence)
+    {
+        return 'ALTER SEQUENCE ' . $sequence->getQuotedName($this) .
+            ' INCREMENT BY ' . $sequence->getAllocationSize();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDropSequenceSQL($sequence)
+    {
+        if ($sequence instanceof Sequence) {
+            $sequence = $sequence->getQuotedName($this);
+        }
+
+        return 'DROP SEQUENCE ' . $sequence;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getListSequencesSQL($database)
+    {
+        return 'SELECT sequence_name, increment_by, start_with, min_value FROM SYS.SYSSEQUENCE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSequenceNextValSQL($sequenceName)
+    {
+        return 'SELECT ' . $sequenceName . '.NEXTVAL';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supportsSequences()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDateTimeTzTypeDeclarationSQL(array $fieldDeclaration)
+    {
+        return 'TIMESTAMP WITH TIME ZONE';
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -1347,12 +1419,26 @@ SQL
      */
     protected function getAdvancedIndexOptionsSQL(Index $index)
     {
+        if ($index->hasFlag('with_nulls_distinct') && $index->hasFlag('with_nulls_not_distinct')) {
+            throw new UnexpectedValueException(
+                'An Index can either have a "with_nulls_distinct" or "with_nulls_not_distinct" flag but not both.'
+            );
+        }
+
         $sql = '';
 
         if (! $index->isPrimary() && $index->hasFlag('for_olap_workload')) {
             $sql .= ' FOR OLAP WORKLOAD';
         }
 
+        if (! $index->isPrimary() && $index->isUnique() && $index->hasFlag('with_nulls_not_distinct')) {
+            return ' WITH NULLS NOT DISTINCT' . $sql;
+        }
+
+        if (! $index->isPrimary() && $index->isUnique() && $index->hasFlag('with_nulls_distinct')) {
+            return ' WITH NULLS DISTINCT' . $sql;
+        }
+
         return $sql;
     }
 
@@ -1504,6 +1590,7 @@ SQL
             'smalldatetime' => 'datetime',
             'time' => 'time',
             'timestamp' => 'datetime',
+            'timestamp with time zone' => 'datetime',
             'binary' => 'binary',
             'image' => 'blob',
             'long binary' => 'blob',

lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php

@@ -12,9 +12,6 @@ use Doctrine\DBAL\Platforms\Keywords\PostgreSQL100Keywords;
 use Doctrine\DBAL\Platforms\Keywords\PostgreSQL94Keywords;
 use Doctrine\DBAL\Platforms\Keywords\PostgreSQLKeywords;
 use Doctrine\DBAL\Platforms\Keywords\ReservedKeywordsValidator;
-use Doctrine\DBAL\Platforms\Keywords\SQLAnywhere11Keywords;
-use Doctrine\DBAL\Platforms\Keywords\SQLAnywhere12Keywords;
-use Doctrine\DBAL\Platforms\Keywords\SQLAnywhere16Keywords;
 use Doctrine\DBAL\Platforms\Keywords\SQLAnywhereKeywords;
 use Doctrine\DBAL\Platforms\Keywords\SQLiteKeywords;
 use Doctrine\DBAL\Platforms\Keywords\SQLServer2012Keywords;
@@ -44,9 +41,6 @@ class ReservedWordsCommand extends Command
         'oracle'        => OracleKeywords::class,
         'db2'           => DB2Keywords::class,
         'sqlanywhere'   => SQLAnywhereKeywords::class,
-        'sqlanywhere11' => SQLAnywhere11Keywords::class,
-        'sqlanywhere12' => SQLAnywhere12Keywords::class,
-        'sqlanywhere16' => SQLAnywhere16Keywords::class,
     ];
 
     /**
@@ -104,9 +98,6 @@ The following keyword lists are currently shipped with Doctrine:
     * sqlserver
     * sqlserver2012
     * sqlanywhere
-    * sqlanywhere11
-    * sqlanywhere12
-    * sqlanywhere16
     * db2 (Not checked by default)
 EOT
         );

tests/Doctrine/Tests/DBAL/Driver/AbstractSQLAnywhereDriverTest.php

@@ -6,9 +6,6 @@ use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Driver\AbstractSQLAnywhereDriver;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Platforms\SQLAnywhere11Platform;
-use Doctrine\DBAL\Platforms\SQLAnywhere12Platform;
-use Doctrine\DBAL\Platforms\SQLAnywhere16Platform;
 use Doctrine\DBAL\Platforms\SQLAnywherePlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\SQLAnywhereSchemaManager;
@@ -22,7 +19,7 @@ class AbstractSQLAnywhereDriverTest extends AbstractDriverTest
 
     protected function createPlatform() : AbstractPlatform
     {
-        return new SQLAnywhere12Platform();
+        return new SQLAnywherePlatform();
     }
 
     protected function createSchemaManager(Connection $connection) : AbstractSchemaManager
@@ -36,35 +33,13 @@ class AbstractSQLAnywhereDriverTest extends AbstractDriverTest
     protected function getDatabasePlatformsForVersions() : array
     {
         return [
-            ['10', SQLAnywherePlatform::class],
-            ['10.0', SQLAnywherePlatform::class],
-            ['10.0.0', SQLAnywherePlatform::class],
-            ['10.0.0.0', SQLAnywherePlatform::class],
-            ['10.1.2.3', SQLAnywherePlatform::class],
-            ['10.9.9.9', SQLAnywherePlatform::class],
-            ['11', SQLAnywhere11Platform::class],
-            ['11.0', SQLAnywhere11Platform::class],
-            ['11.0.0', SQLAnywhere11Platform::class],
-            ['11.0.0.0', SQLAnywhere11Platform::class],
-            ['11.1.2.3', SQLAnywhere11Platform::class],
-            ['11.9.9.9', SQLAnywhere11Platform::class],
-            ['12', SQLAnywhere12Platform::class],
-            ['12.0', SQLAnywhere12Platform::class],
-            ['12.0.0', SQLAnywhere12Platform::class],
-            ['12.0.0.0', SQLAnywhere12Platform::class],
-            ['12.1.2.3', SQLAnywhere12Platform::class],
-            ['12.9.9.9', SQLAnywhere12Platform::class],
-            ['13', SQLAnywhere12Platform::class],
-            ['14', SQLAnywhere12Platform::class],
-            ['15', SQLAnywhere12Platform::class],
-            ['15.9.9.9', SQLAnywhere12Platform::class],
-            ['16', SQLAnywhere16Platform::class],
-            ['16.0', SQLAnywhere16Platform::class],
-            ['16.0.0', SQLAnywhere16Platform::class],
-            ['16.0.0.0', SQLAnywhere16Platform::class],
-            ['16.1.2.3', SQLAnywhere16Platform::class],
-            ['16.9.9.9', SQLAnywhere16Platform::class],
-            ['17', SQLAnywhere16Platform::class],
+            ['16', SQLAnywherePlatform::class],
+            ['16.0', SQLAnywherePlatform::class],
+            ['16.0.0', SQLAnywherePlatform::class],
+            ['16.0.0.0', SQLAnywherePlatform::class],
+            ['16.1.2.3', SQLAnywherePlatform::class],
+            ['16.9.9.9', SQLAnywherePlatform::class],
+            ['17', SQLAnywherePlatform::class],
         ];
     }
 

tests/Doctrine/Tests/DBAL/Platforms/SQLAnywhere11PlatformTest.php

-<?php
-
-namespace Doctrine\Tests\DBAL\Platforms;
-
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Platforms\SQLAnywhere11Platform;
-
-class SQLAnywhere11PlatformTest extends SQLAnywherePlatformTest
-{
-    /** @var SQLAnywhere11Platform */
-    protected $platform;
-
-    public function createPlatform() : AbstractPlatform
-    {
-        return new SQLAnywhere11Platform();
-    }
-
-    public function testDoesNotSupportRegexp() : void
-    {
-        $this->markTestSkipped('This version of the platform now supports regular expressions.');
-    }
-
-    public function testGeneratesRegularExpressionSQLSnippet() : void
-    {
-        self::assertEquals('REGEXP', $this->platform->getRegexpExpression());
-    }
-}

tests/Doctrine/Tests/DBAL/Platforms/SQLAnywhere12PlatformTest.php

-<?php
-
-namespace Doctrine\Tests\DBAL\Platforms;
-
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Platforms\SQLAnywhere12Platform;
-use Doctrine\DBAL\Schema\Index;
-use Doctrine\DBAL\Schema\Sequence;
-
-class SQLAnywhere12PlatformTest extends SQLAnywhere11PlatformTest
-{
-    /** @var SQLAnywhere12Platform */
-    protected $platform;
-
-    public function createPlatform() : AbstractPlatform
-    {
-        return new SQLAnywhere12Platform();
-    }
-
-    public function testDoesNotSupportSequences() : void
-    {
-        $this->markTestSkipped('This version of the platform now supports sequences.');
-    }
-
-    public function testSupportsSequences() : void
-    {
-        self::assertTrue($this->platform->supportsSequences());
-    }
-
-    public function testGeneratesSequenceSqlCommands() : void
-    {
-        $sequence = new Sequence('myseq', 20, 1);
-        self::assertEquals(
-            'CREATE SEQUENCE myseq INCREMENT BY 20 START WITH 1 MINVALUE 1',
-            $this->platform->getCreateSequenceSQL($sequence)
-        );
-        self::assertEquals(
-            'ALTER SEQUENCE myseq INCREMENT BY 20',
-            $this->platform->getAlterSequenceSQL($sequence)
-        );
-        self::assertEquals(
-            'DROP SEQUENCE myseq',
-            $this->platform->getDropSequenceSQL('myseq')
-        );
-        self::assertEquals(
-            'DROP SEQUENCE myseq',
-            $this->platform->getDropSequenceSQL($sequence)
-        );
-        self::assertEquals(
-            'SELECT myseq.NEXTVAL',
-            $this->platform->getSequenceNextValSQL('myseq')
-        );
-        self::assertEquals(
-            'SELECT sequence_name, increment_by, start_with, min_value FROM SYS.SYSSEQUENCE',
-            $this->platform->getListSequencesSQL(null)
-        );
-    }
-
-    public function testGeneratesDateTimeTzColumnTypeDeclarationSQL() : void
-    {
-        self::assertEquals(
-            'TIMESTAMP WITH TIME ZONE',
-            $this->platform->getDateTimeTzTypeDeclarationSQL([
-                'length' => 10,
-                'fixed' => true,
-                'unsigned' => true,
-                'autoincrement' => true,
-            ])
-        );
-    }
-
-    public function testHasCorrectDateTimeTzFormatString() : void
-    {
-        self::assertEquals('Y-m-d H:i:s.uP', $this->platform->getDateTimeTzFormatString());
-    }
-
-    public function testInitializesDateTimeTzTypeMapping() : void
-    {
-        self::assertTrue($this->platform->hasDoctrineTypeMappingFor('timestamp with time zone'));
-        self::assertEquals('datetime', $this->platform->getDoctrineTypeMapping('timestamp with time zone'));
-    }
-
-    public function testGeneratesCreateIndexWithAdvancedPlatformOptionsSQL() : void
-    {
-        self::assertEquals(
-            'CREATE VIRTUAL UNIQUE CLUSTERED INDEX fooindex ON footable (a, b) WITH NULLS NOT DISTINCT FOR OLAP WORKLOAD',
-            $this->platform->getCreateIndexSQL(
-                new Index(
-                    'fooindex',
-                    ['a', 'b'],
-                    true,
-                    false,
-                    ['virtual', 'clustered', 'with_nulls_not_distinct', 'for_olap_workload']
-                ),
-                'footable'
-            )
-        );
-        self::assertEquals(
-            'CREATE VIRTUAL CLUSTERED INDEX fooindex ON footable (a, b) FOR OLAP WORKLOAD',
-            $this->platform->getCreateIndexSQL(
-                new Index(
-                    'fooindex',
-                    ['a', 'b'],
-                    false,
-                    false,
-                    ['virtual', 'clustered', 'with_nulls_not_distinct', 'for_olap_workload']
-                ),
-                'footable'
-            )
-        );
-
-        // WITH NULLS NOT DISTINCT clause not available on primary indexes.
-        self::assertEquals(
-            'ALTER TABLE footable ADD PRIMARY KEY (a, b)',
-            $this->platform->getCreateIndexSQL(
-                new Index(
-                    'fooindex',
-                    ['a', 'b'],
-                    false,
-                    true,
-                    ['with_nulls_not_distinct']
-                ),
-                'footable'
-            )
-        );
-
-        // WITH NULLS NOT DISTINCT clause not available on non-unique indexes.
-        self::assertEquals(
-            'CREATE INDEX fooindex ON footable (a, b)',
-            $this->platform->getCreateIndexSQL(
-                new Index(
-                    'fooindex',
-                    ['a', 'b'],
-                    false,
-                    false,
-                    ['with_nulls_not_distinct']
-                ),
-                'footable'
-            )
-        );
-    }
-}

tests/Doctrine/Tests/DBAL/Platforms/SQLAnywhere16PlatformTest.php

-<?php
-
-namespace Doctrine\Tests\DBAL\Platforms;
-
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Platforms\SQLAnywhere16Platform;
-use Doctrine\DBAL\Schema\Index;
-
-class SQLAnywhere16PlatformTest extends SQLAnywhere12PlatformTest
-{
-    public function createPlatform() : AbstractPlatform
-    {
-        return new SQLAnywhere16Platform();
-    }
-
-    public function testGeneratesCreateIndexWithAdvancedPlatformOptionsSQL() : void
-    {
-        self::assertEquals(
-            'CREATE UNIQUE INDEX fooindex ON footable (a, b) WITH NULLS DISTINCT',
-            $this->platform->getCreateIndexSQL(
-                new Index(
-                    'fooindex',
-                    ['a', 'b'],
-                    true,
-                    false,
-                    ['with_nulls_distinct']
-                ),
-                'footable'
-            )
-        );
-
-        // WITH NULLS DISTINCT clause not available on primary indexes.
-        self::assertEquals(
-            'ALTER TABLE footable ADD PRIMARY KEY (a, b)',
-            $this->platform->getCreateIndexSQL(
-                new Index(
-                    'fooindex',
-                    ['a', 'b'],
-                    false,
-                    true,
-                    ['with_nulls_distinct']
-                ),
-                'footable'
-            )
-        );
-
-        // WITH NULLS DISTINCT clause not available on non-unique indexes.
-        self::assertEquals(
-            'CREATE INDEX fooindex ON footable (a, b)',
-            $this->platform->getCreateIndexSQL(
-                new Index(
-                    'fooindex',
-                    ['a', 'b'],
-                    false,
-                    false,
-                    ['with_nulls_distinct']
-                ),
-                'footable'
-            )
-        );
-
-        parent::testGeneratesCreateIndexWithAdvancedPlatformOptionsSQL();
-    }
-
-    public function testThrowsExceptionOnInvalidWithNullsNotDistinctIndexOptions() : void
-    {
-        $this->expectException('UnexpectedValueException');
-
-        $this->platform->getCreateIndexSQL(
-            new Index(
-                'fooindex',
-                ['a', 'b'],
-                false,
-                false,
-                ['with_nulls_distinct', 'with_nulls_not_distinct']
-            ),
-            'footable'
-        );
-    }
-}

tests/Doctrine/Tests/DBAL/Platforms/SQLAnywherePlatformTest.php

@@ -13,6 +13,7 @@ use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\Constraint;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Index;
+use Doctrine\DBAL\Schema\Sequence;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\TransactionIsolationLevel;
@@ -484,18 +485,121 @@ class SQLAnywherePlatformTest extends AbstractPlatformTestCase
     public function testGeneratesCreateIndexWithAdvancedPlatformOptionsSQL() : void
     {
         self::assertEquals(
-            'CREATE VIRTUAL UNIQUE CLUSTERED INDEX fooindex ON footable (a, b) FOR OLAP WORKLOAD',
+            'CREATE UNIQUE INDEX fooindex ON footable (a, b) WITH NULLS DISTINCT',
             $this->platform->getCreateIndexSQL(
                 new Index(
                     'fooindex',
                     ['a', 'b'],
                     true,
                     false,
-                    ['virtual', 'clustered', 'for_olap_workload']
+                    ['with_nulls_distinct']
                 ),
                 'footable'
             )
         );
+
+        // WITH NULLS DISTINCT clause not available on primary indexes.
+        self::assertEquals(
+            'ALTER TABLE footable ADD PRIMARY KEY (a, b)',
+            $this->platform->getCreateIndexSQL(
+                new Index(
+                    'fooindex',
+                    ['a', 'b'],
+                    false,
+                    true,
+                    ['with_nulls_distinct']
+                ),
+                'footable'
+            )
+        );
+
+        // WITH NULLS DISTINCT clause not available on non-unique indexes.
+        self::assertEquals(
+            'CREATE INDEX fooindex ON footable (a, b)',
+            $this->platform->getCreateIndexSQL(
+                new Index(
+                    'fooindex',
+                    ['a', 'b'],
+                    false,
+                    false,
+                    ['with_nulls_distinct']
+                ),
+                'footable'
+            )
+        );
+
+        self::assertEquals(
+            'CREATE VIRTUAL UNIQUE CLUSTERED INDEX fooindex ON footable (a, b) WITH NULLS NOT DISTINCT FOR OLAP WORKLOAD',
+            $this->platform->getCreateIndexSQL(
+                new Index(
+                    'fooindex',
+                    ['a', 'b'],
+                    true,
+                    false,
+                    ['virtual', 'clustered', 'with_nulls_not_distinct', 'for_olap_workload']
+                ),
+                'footable'
+            )
+        );
+        self::assertEquals(
+            'CREATE VIRTUAL CLUSTERED INDEX fooindex ON footable (a, b) FOR OLAP WORKLOAD',
+            $this->platform->getCreateIndexSQL(
+                new Index(
+                    'fooindex',
+                    ['a', 'b'],
+                    false,
+                    false,
+                    ['virtual', 'clustered', 'with_nulls_not_distinct', 'for_olap_workload']
+                ),
+                'footable'
+            )
+        );
+
+        // WITH NULLS NOT DISTINCT clause not available on primary indexes.
+        self::assertEquals(
+            'ALTER TABLE footable ADD PRIMARY KEY (a, b)',
+            $this->platform->getCreateIndexSQL(
+                new Index(
+                    'fooindex',
+                    ['a', 'b'],
+                    false,
+                    true,
+                    ['with_nulls_not_distinct']
+                ),
+                'footable'
+            )
+        );
+
+        // WITH NULLS NOT DISTINCT clause not available on non-unique indexes.
+        self::assertEquals(
+            'CREATE INDEX fooindex ON footable (a, b)',
+            $this->platform->getCreateIndexSQL(
+                new Index(
+                    'fooindex',
+                    ['a', 'b'],
+                    false,
+                    false,
+                    ['with_nulls_not_distinct']
+                ),
+                'footable'
+            )
+        );
+    }
+
+    public function testThrowsExceptionOnInvalidWithNullsNotDistinctIndexOptions() : void
+    {
+        $this->expectException('UnexpectedValueException');
+
+        $this->platform->getCreateIndexSQL(
+            new Index(
+                'fooindex',
+                ['a', 'b'],
+                false,
+                false,
+                ['with_nulls_distinct', 'with_nulls_not_distinct']
+            ),
+            'footable'
+        );
     }
 
     public function testDoesNotSupportIndexDeclarationInCreateAlterTableStatements() : void
@@ -605,19 +709,28 @@ class SQLAnywherePlatformTest extends AbstractPlatformTestCase
         );
     }
 
-    public function testDoesNotSupportRegexp() : void
+    public function testHasCorrectDateTimeTzFormatString() : void
     {
-        $this->expectException(DBALException::class);
+        self::assertEquals('Y-m-d H:i:s.uP', $this->platform->getDateTimeTzFormatString());
+    }
 
-        $this->platform->getRegexpExpression();
+    public function testGeneratesDateTimeTzColumnTypeDeclarationSQL() : void
+    {
+        self::assertEquals(
+            'TIMESTAMP WITH TIME ZONE',
+            $this->platform->getDateTimeTzTypeDeclarationSQL([
+                'length' => 10,
+                'fixed' => true,
+                'unsigned' => true,
+                'autoincrement' => true,
+            ])
+        );
     }
 
-    public function testHasCorrectDateTimeTzFormatString() : void
+    public function testInitializesDateTimeTzTypeMapping() : void
     {
-        // Date time type with timezone is not supported before version 12.
-        // For versions before we have to ensure that the date time with timezone format
-        // equals the normal date time format so that it corresponds to the declaration SQL equality (datetimetz -> datetime).
-        self::assertEquals($this->platform->getDateTimeFormatString(), $this->platform->getDateTimeTzFormatString());
+        self::assertTrue($this->platform->hasDoctrineTypeMappingFor('timestamp with time zone'));
+        self::assertEquals('datetime', $this->platform->getDoctrineTypeMapping('timestamp with time zone'));
     }
 
     public function testHasCorrectDefaultTransactionIsolationLevel() : void
@@ -776,7 +889,41 @@ class SQLAnywherePlatformTest extends AbstractPlatformTestCase
 
     public function testDoesNotSupportSequences() : void
     {
-        self::assertFalse($this->platform->supportsSequences());
+        self::markTestSkipped('This version of the platform now supports sequences.');
+    }
+
+    public function testSupportsSequences() : void
+    {
+        self::assertTrue($this->platform->supportsSequences());
+    }
+
+    public function testGeneratesSequenceSqlCommands() : void
+    {
+        $sequence = new Sequence('myseq', 20, 1);
+        self::assertEquals(
+            'CREATE SEQUENCE myseq INCREMENT BY 20 START WITH 1 MINVALUE 1',
+            $this->platform->getCreateSequenceSQL($sequence)
+        );
+        self::assertEquals(
+            'ALTER SEQUENCE myseq INCREMENT BY 20',
+            $this->platform->getAlterSequenceSQL($sequence)
+        );
+        self::assertEquals(
+            'DROP SEQUENCE myseq',
+            $this->platform->getDropSequenceSQL('myseq')
+        );
+        self::assertEquals(
+            'DROP SEQUENCE myseq',
+            $this->platform->getDropSequenceSQL($sequence)
+        );
+        self::assertEquals(
+            'SELECT myseq.NEXTVAL',
+            $this->platform->getSequenceNextValSQL('myseq')
+        );
+        self::assertEquals(
+            'SELECT sequence_name, increment_by, start_with, min_value FROM SYS.SYSSEQUENCE',
+            $this->platform->getListSequencesSQL(null)
+        );
     }
 
     public function testDoesNotSupportInlineColumnComments() : void