Drop support for SQL Anywhere <16

doctrine · Mar 16, 2018 · dbdac39 · dbdac39
1 parent f7849d2
commit dbdac39
Show file tree

Hide file tree

Showing 18 changed files with 296 additions and 650 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,20 @@
 # Upgrade to 3.0 (DEVELOP)
 
+## 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 newer SQL Anywhere version (16+).
+`Doctrine\DBAL\Platforms\SQLAnywherePlatform` and `Doctrine\DBAL\Platforms\Keywords\SQLAnywhereKeywords` now represent the 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.

diff --git a/docs/en/reference/configuration.rst b/docs/en/reference/configuration.rst
@@ -311,14 +311,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

diff --git a/docs/en/reference/types.rst b/docs/en/reference/types.rst
@@ -695,9 +695,7 @@ Please also notice the mapping specific footnotes for additional information.
 |                   |               +--------------------------+         |                                                          |
 |                   |               | **Oracle**               |         |                                                          |
 |                   |               +--------------------------+---------+----------------------------------------------------------+
-|                   |               | **SQL Anywhere**         | < 12    | ``DATETIME``  [14]_ [15]_                                |
-|                   |               |                          +---------+----------------------------------------------------------+
-|                   |               |                          | >= 12   | ``TIMESTAMP WITH TIME ZONE``                             |
+|                   |               | **SQL Anywhere**         | "all"   | ``TIMESTAMP WITH TIME ZONE``                             |
 +-------------------+---------------+--------------------------+---------+----------------------------------------------------------+
 | **time**          | ``\DateTime`` | **MySQL**                | *all*   | ``TIME``                                                 |
 |                   |               +--------------------------+         |                                                          |

diff --git a/lib/Doctrine/DBAL/Driver/AbstractSQLAnywhereDriver.php b/lib/Doctrine/DBAL/Driver/AbstractSQLAnywhereDriver.php
@@ -5,9 +5,6 @@
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver;
 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;
@@ -89,12 +86,6 @@ public function createDatabasePlatformForVersion($version)
         $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();
         }
@@ -115,7 +106,7 @@ public function getDatabase(\Doctrine\DBAL\Connection $conn)
      */
     public function getDatabasePlatform()
     {
-        return new SQLAnywhere12Platform();
+        return new SQLAnywherePlatform();
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhere11Keywords.php b/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhere11Keywords.php
diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhere12Keywords.php b/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhere12Keywords.php
diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhere16Keywords.php b/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhere16Keywords.php
diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhereKeywords.php b/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhereKeywords.php
@@ -30,6 +30,7 @@ protected function getKeywords()
             'ALTER',
             'AND',
             'ANY',
+            'ARRAY',
             'AS',
             'ASC',
             'ATTACH',
@@ -70,6 +71,7 @@ protected function getKeywords()
             'CURRENT_USER',
             'CURSOR',
             'DATE',
+            'DATETIMEOFFSET',
             'DBSPACE',
             'DEALLOCATE',
             'DEC',
@@ -116,7 +118,6 @@ protected function getKeywords()
             'IF',
             'IN',
             'INDEX',
-            'INDEX_LPAREN',
             'INNER',
             'INOUT',
             'INSENSITIVE',
@@ -129,20 +130,22 @@ protected function getKeywords()
             'INTEGRATED',
             'INTERSECT',
             'INTO',
-            'IQ',
             'IS',
             'ISOLATION',
             'JOIN',
+            'JSON',
             'KERBEROS',
             'KEY',
             'LATERAL',
             'LEFT',
             'LIKE',
+            'LIMIT',
             'LOCK',
             'LOGIN',
             'LONG',
             'MATCH',
             'MEMBERSHIP',
+            'MERGE',
             'MESSAGE',
             'MODE',
             'MODIFY',
@@ -160,6 +163,8 @@ protected function getKeywords()
             'OFF',
             'ON',
             'OPEN',
+            'OPENSTRING',
+            'OPENXML',
             'OPTION',
             'OPTIONS',
             'OR',
@@ -196,6 +201,8 @@ protected function getKeywords()
             'RIGHT',
             'ROLLBACK',
             'ROLLUP',
+            'ROW',
+            'ROWTYPE',
             'SAVE',
             'SAVEPOINT',
             'SCROLL',
@@ -207,14 +214,14 @@ protected function getKeywords()
             'SHARE',
             'SMALLINT',
             'SOME',
+            'SPATIAL',
             'SQLCODE',
             'SQLSTATE',
             'START',
             'STOP',
             'SUBTRANS',
             'SUBTRANSACTION',
             'SYNCHRONIZE',
-            'SYNTAX_ERROR',
             'TABLE',
             'TEMPORARY',
             'THEN',
@@ -224,6 +231,7 @@ protected function getKeywords()
             'TO',
             'TOP',
             'TRAN',
+            'TREAT',
             'TRIGGER',
             'TRUNCATE',
             'TSEQUAL',
@@ -232,6 +240,7 @@ protected function getKeywords()
             'UNIQUE',
             'UNIQUEIDENTIFIER',
             'UNKNOWN',
+            'UNNEST',
             'UNSIGNED',
             'UPDATE',
             'UPDATING',
@@ -243,6 +252,7 @@ protected function getKeywords()
             'VARBIT',
             'VARCHAR',
             'VARIABLE',
+            'VARRAY',
             'VARYING',
             'VIEW',
             'WAIT',
@@ -252,9 +262,6 @@ protected function getKeywords()
             'WHILE',
             'WINDOW',
             'WITH',
-            'WITH_CUBE',
-            'WITH_LPAREN',
-            'WITH_ROLLUP',
             'WITHIN',
             'WORK',
             'WRITETEXT',

diff --git a/lib/Doctrine/DBAL/Platforms/SQLAnywhere11Platform.php b/lib/Doctrine/DBAL/Platforms/SQLAnywhere11Platform.php