Merge pull request #3211 from morozov/issues/3167

Removed support for DB-generated UUIDs
doctrine · Oct 7, 2018 · cecb2e4 · cecb2e4
2 parents 0436d3e + 862a093
commit cecb2e4
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 134 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,10 @@
 # Upgrade to 3.0
 
+## BC BREAK: Removed support for DB-generated UUIDs
+
+The support for DB-generated UUIDs was removed as non-portable.
+Please generate UUIDs on the application side (e.g. using [ramsey/uuid](https://packagist.org/packages/ramsey/uuid)).
+
 ## BC BREAK: Removed MsSQLKeywords class
 
 The `Doctrine\DBAL\Platforms\MsSQLKeywords` has been removed.

diff --git a/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php b/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
@@ -618,20 +618,6 @@ public function getRegexpExpression()
         throw DBALException::notSupported(__METHOD__);
     }
 
-    /**
-     * Returns the global unique identifier expression.
-     *
-     * @deprecated Use application-generated UUIDs instead
-     *
-     * @return string
-     *
-     * @throws DBALException If not supported on this platform.
-     */
-    public function getGuidExpression()
-    {
-        throw DBALException::notSupported(__METHOD__);
-    }
-
     /**
      * Returns the SQL snippet to get the average value of a column.
      *

diff --git a/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php b/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
@@ -79,16 +79,6 @@ public function getRegexpExpression()
         return 'RLIKE';
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated Use application-generated UUIDs instead
-     */
-    public function getGuidExpression()
-    {
-        return 'UUID()';
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/lib/Doctrine/DBAL/Platforms/OraclePlatform.php b/lib/Doctrine/DBAL/Platforms/OraclePlatform.php
@@ -86,16 +86,6 @@ public function getLocateExpression($str, $substr, $startPos = false)
         return 'INSTR(' . $str . ', ' . $substr . ', ' . $startPos . ')';
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated Use application-generated UUIDs instead
-     */
-    public function getGuidExpression()
-    {
-        return 'SYS_GUID()';
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php b/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
@@ -1013,16 +1013,6 @@ public function getTimeTypeDeclarationSQL(array $fieldDeclaration)
         return 'TIME(0) WITHOUT TIME ZONE';
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated Use application-generated UUIDs instead
-     */
-    public function getGuidExpression()
-    {
-        return 'UUID_GENERATE_V4()';
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/lib/Doctrine/DBAL/Platforms/SQLAnywherePlatform.php b/lib/Doctrine/DBAL/Platforms/SQLAnywherePlatform.php
@@ -667,16 +667,6 @@ public function getForUpdateSQL()
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated Use application-generated UUIDs instead
-     */
-    public function getGuidExpression()
-    {
-        return 'NEWID()';
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php b/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
@@ -1002,16 +1002,6 @@ public function getDropViewSQL($name)
         return 'DROP VIEW ' . $name;
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated Use application-generated UUIDs instead
-     */
-    public function getGuidExpression()
-    {
-        return 'NEWID()';
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php b/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
@@ -40,19 +40,6 @@ public function getRegexpExpression()
         return 'REGEXP';
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated Use application-generated UUIDs instead
-     */
-    public function getGuidExpression()
-    {
-        return "HEX(RANDOMBLOB(4)) || '-' || HEX(RANDOMBLOB(2)) || '-4' || "
-            . "SUBSTR(HEX(RANDOMBLOB(2)), 2) || '-' || "
-            . "SUBSTR('89AB', 1 + (ABS(RANDOM()) % 4), 1) || "
-            . "SUBSTR(HEX(RANDOMBLOB(2)), 2) || '-' || HEX(RANDOMBLOB(6))";
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/tests/Doctrine/Tests/DBAL/Functional/Ticket/DBAL421Test.php b/tests/Doctrine/Tests/DBAL/Functional/Ticket/DBAL421Test.php
diff --git a/tests/Doctrine/Tests/DBAL/Platforms/SQLAnywherePlatformTest.php b/tests/Doctrine/Tests/DBAL/Platforms/SQLAnywherePlatformTest.php
@@ -635,7 +635,6 @@ public function testGeneratesSQLSnippets()
         self::assertEquals('Y-m-d H:i:s.u', $this->platform->getDateTimeFormatString());
         self::assertEquals('H:i:s.u', $this->platform->getTimeFormatString());
         self::assertEquals('', $this->platform->getForUpdateSQL());
-        self::assertEquals('NEWID()', $this->platform->getGuidExpression());
         self::assertEquals('LOCATE(string_column, substring_column)', $this->platform->getLocateExpression('string_column', 'substring_column'));
         self::assertEquals('LOCATE(string_column, substring_column, 1)', $this->platform->getLocateExpression('string_column', 'substring_column', 1));
         self::assertEquals("HASH(column, 'MD5')", $this->platform->getMd5Expression('column'));