diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index fcc51671a5..8f8c29a36d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -8154,7 +8154,9 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
                 break;
 
             case 'D':
-                if ((parseFunctionNameIf("DB_NAME") && parseEmptyParens()))
+                if ((parseFunctionNameIf("DATABASE") && parseEmptyParens()))
+                    return currentCatalog();
+                else if ((parseFunctionNameIf("DB_NAME") && parseEmptyParens()))
                     return currentCatalog();
                 else if ((parseFunctionNameIf("DBINFO") && parse('(') && parseStringLiteral("dbname") != null && parse(')')))
                     return currentCatalog();