Reorder keywords and type mappings alphabetically

doctrine · Mar 19, 2018 · 7b7cffe · 7b7cffe
1 parent 8e85eb1
commit 7b7cffe
Show file tree

Hide file tree

Showing 10 changed files with 378 additions and 378 deletions.
diff --git a/lib/Doctrine/DBAL/Platforms/DB2Platform.php b/lib/Doctrine/DBAL/Platforms/DB2Platform.php
@@ -43,21 +43,21 @@ public function getBlobTypeDeclarationSQL(array $field)
     public function initializeDoctrineTypeMappings()
     {
         $this->doctrineTypeMapping = [
-            'smallint'      => 'smallint',
-            'bigint'        => 'bigint',
-            'integer'       => 'integer',
-            'time'          => 'time',
-            'date'          => 'date',
-            'varchar'       => 'string',
-            'character'     => 'string',
-            'varbinary'     => 'binary',
-            'binary'        => 'binary',
-            'clob'          => 'text',
-            'blob'          => 'blob',
-            'decimal'       => 'decimal',
-            'double'        => 'float',
-            'real'          => 'float',
-            'timestamp'     => 'datetime',
+            'bigint'    => 'bigint',
+            'binary'    => 'binary',
+            'blob'      => 'blob',
+            'character' => 'string',
+            'clob'      => 'text',
+            'date'      => 'date',
+            'decimal'   => 'decimal',
+            'double'    => 'float',
+            'integer'   => 'integer',
+            'real'      => 'float',
+            'smallint'  => 'smallint',
+            'time'      => 'time',
+            'timestamp' => 'datetime',
+            'varbinary' => 'binary',
+            'varchar'   => 'string',
         ];
     }
 

diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/DB2Keywords.php b/lib/Doctrine/DBAL/Platforms/Keywords/DB2Keywords.php
@@ -31,24 +31,6 @@ protected function getKeywords()
             'ALIAS',
             'ALL',
             'ALLOCATE',
-            'DOCUMENT',
-            'DOUBLE',
-            'DROP',
-            'DSSIZE',
-            'DYNAMIC',
-            'EACH',
-            'LOCK',
-            'LOCKMAX',
-            'LOCKSIZE',
-            'LONG',
-            'LOOP',
-            'MAINTAINED',
-            'ROUND_CEILING',
-            'ROUND_DOWN',
-            'ROUND_FLOOR',
-            'ROUND_HALF_DOWN',
-            'ROUND_HALF_EVEN',
-            'ROUND_HALF_UP',
             'ALLOW',
             'ALTER',
             'AND',
@@ -116,6 +98,38 @@ protected function getKeywords()
             'DATABASE',
             'DATAPARTITIONNAME',
             'DATAPARTITIONNUM',
+            'DATE',
+            'DAY',
+            'DAYS',
+            'DB2GENERAL',
+            'DB2GENRL',
+            'DB2SQL',
+            'DBINFO',
+            'DBPARTITIONNAME',
+            'DBPARTITIONNUM',
+            'DEALLOCATE',
+            'DECLARE',
+            'DEFAULT',
+            'DEFAULTS',
+            'DEFINITION',
+            'DELETE',
+            'DENSE_RANK',
+            'DENSERANK',
+            'DESCRIBE',
+            'DESCRIPTOR',
+            'DETERMINISTIC',
+            'DIAGNOSTICS',
+            'DISABLE',
+            'DISALLOW',
+            'DISCONNECT',
+            'DISTINCT',
+            'DO',
+            'DOCUMENT',
+            'DOUBLE',
+            'DROP',
+            'DSSIZE',
+            'DYNAMIC',
+            'EACH',
             'EDITPROC',
             'ELSE',
             'ELSEIF',
@@ -183,6 +197,38 @@ protected function getKeywords()
             'INSENSITIVE',
             'INSERT',
             'INTEGRITY',
+            'INTERSECT',
+            'INTO',
+            'IS',
+            'ISOBID',
+            'ISOLATION',
+            'ITERATE',
+            'JAR',
+            'JAVA',
+            'JOIN',
+            'KEEP',
+            'KEY',
+            'LABEL',
+            'LANGUAGE',
+            'LATERAL',
+            'LC_CTYPE',
+            'LEAVE',
+            'LEFT',
+            'LIKE',
+            'LINKTYPE',
+            'LOCAL',
+            'LOCALDATE',
+            'LOCALE',
+            'LOCALTIME',
+            'LOCALTIMESTAMP RIGHT',
+            'LOCATOR',
+            'LOCATORS',
+            'LOCK',
+            'LOCKMAX',
+            'LOCKSIZE',
+            'LONG',
+            'LOOP',
+            'MAINTAINED',
             'MATERIALIZED',
             'MAXVALUE',
             'MICROSECOND',
@@ -250,6 +296,37 @@ protected function getKeywords()
             'PROCEDURE',
             'PROGRAM',
             'PSID',
+            'PUBLIC',
+            'QUERY',
+            'QUERYNO',
+            'RANGE',
+            'RANK',
+            'READ',
+            'READS',
+            'RECOVERY',
+            'REFERENCES',
+            'REFERENCING',
+            'REFRESH',
+            'RELEASE',
+            'RENAME',
+            'REPEAT',
+            'RESET',
+            'RESIGNAL',
+            'RESTART',
+            'RESTRICT',
+            'RESULT',
+            'RESULT_SET_LOCATOR WLM',
+            'RETURN',
+            'RETURNS',
+            'REVOKE',
+            'ROLE',
+            'ROLLBACK',
+            'ROUND_CEILING',
+            'ROUND_DOWN',
+            'ROUND_FLOOR',
+            'ROUND_HALF_DOWN',
+            'ROUND_HALF_EVEN',
+            'ROUND_HALF_UP',
             'ROUND_UP',
             'ROUTINE',
             'ROW',
@@ -317,107 +394,30 @@ protected function getKeywords()
             'UNIQUE',
             'UNTIL',
             'UPDATE',
-            'DATE',
-            'DAY',
-            'DAYS',
-            'DB2GENERAL',
-            'DB2GENRL',
-            'DB2SQL',
-            'DBINFO',
-            'DBPARTITIONNAME',
-            'DBPARTITIONNUM',
-            'DEALLOCATE',
-            'DECLARE',
-            'DEFAULT',
-            'DEFAULTS',
-            'DEFINITION',
-            'DELETE',
-            'DENSE_RANK',
-            'DENSERANK',
-            'DESCRIBE',
-            'DESCRIPTOR',
-            'DETERMINISTIC',
-            'DIAGNOSTICS',
-            'DISABLE',
-            'DISALLOW',
-            'DISCONNECT',
-            'DISTINCT',
-            'DO',
-            'INTERSECT',
-            'PUBLIC',
             'USAGE',
-            'INTO',
-            'QUERY',
             'USER',
-            'IS',
-            'QUERYNO',
             'USING',
-            'ISOBID',
-            'RANGE',
             'VALIDPROC',
-            'ISOLATION',
-            'RANK',
             'VALUE',
-            'ITERATE',
-            'READ',
             'VALUES',
-            'JAR',
-            'READS',
             'VARIABLE',
-            'JAVA',
-            'RECOVERY',
             'VARIANT',
-            'JOIN',
-            'REFERENCES',
             'VCAT',
-            'KEEP',
-            'REFERENCING',
             'VERSION',
-            'KEY',
-            'REFRESH',
             'VIEW',
-            'LABEL',
-            'RELEASE',
             'VOLATILE',
-            'LANGUAGE',
-            'RENAME',
             'VOLUMES',
-            'LATERAL',
-            'REPEAT',
             'WHEN',
-            'LC_CTYPE',
-            'RESET',
             'WHENEVER',
-            'LEAVE',
-            'RESIGNAL',
             'WHERE',
-            'LEFT',
-            'RESTART',
             'WHILE',
-            'LIKE',
-            'RESTRICT',
             'WITH',
-            'LINKTYPE',
-            'RESULT',
             'WITHOUT',
-            'LOCAL',
-            'RESULT_SET_LOCATOR WLM',
-            'LOCALDATE',
-            'RETURN',
             'WRITE',
-            'LOCALE',
-            'RETURNS',
             'XMLELEMENT',
-            'LOCALTIME',
-            'REVOKE',
             'XMLEXISTS',
-            'LOCALTIMESTAMP RIGHT',
             'XMLNAMESPACES',
-            'LOCATOR',
-            'ROLE',
             'YEAR',
-            'LOCATORS',
-            'ROLLBACK',
             'YEARS',
         ];
     }