From d9fd96e30bfc69e9db7cbe54e05a561dd0102ac0 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 5 Jan 2021 11:30:05 +0100
Subject: [PATCH] [jOOQ/jOOQ#9085] [jOOQ/jOOQ#9753] Change DEFAULT rendering of
 CURRENT_DATE, CURRENT_TIME, and CURRENT_TIMESTAMP

---
 .../main/java/org/jooq/impl/CurrentDate.java  | 17 +++-------
 .../main/java/org/jooq/impl/CurrentTime.java  | 31 +++++++-----------
 .../java/org/jooq/impl/CurrentTimestamp.java  | 32 ++++++-------------
 3 files changed, 26 insertions(+), 54 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java b/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
index 9abf6a635e..1e2f28823b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
@@ -92,22 +92,13 @@ final class CurrentDate<T> extends AbstractField<T> {
 
 
 
-
-
-
-
-
-            case DERBY:
-            case FIREBIRD:
-            case H2:
-            case HSQLDB:
-            case POSTGRES:
-            case SQLITE:
-                ctx.visit(K_CURRENT).sql('_').visit(K_DATE);
+            case MARIADB:
+            case MYSQL:
+                ctx.visit(N_CURRENT_DATE).sql("()");
                 break;
 
             default:
-                ctx.visit(N_CURRENT_DATE).sql("()");
+                ctx.visit(K_CURRENT).sql('_').visit(K_DATE);
                 break;
         }
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
index 36f54ab2d5..c81efd6dd0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
@@ -85,28 +85,21 @@ final class CurrentTime<T> extends AbstractField<T> {
 
 
 
-            case DERBY:
-            case FIREBIRD:
-            case H2:
-            case HSQLDB:
-            case POSTGRES:
-            case SQLITE:
-                ctx.visit(K_CURRENT).sql('_').visit(K_TIME);
+
+
+
+
+
+
+
+
+            case MARIADB:
+            case MYSQL:
+                ctx.visit(N_CURRENT_TIME).sql("()");
                 break;
 
-
-
-
-
-
-
-
-
-
-
-
             default:
-                ctx.visit(N_CURRENT_TIME).sql("()");
+                ctx.visit(K_CURRENT).sql('_').visit(K_TIME);
                 break;
         }
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
index ca27b4667c..3f9182124e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
@@ -115,34 +115,22 @@ final class CurrentTimestamp<T> extends AbstractField<T> {
 
 
 
-
-
-
-
-
-
-
-
-            case DERBY:
-            case FIREBIRD:
-            case H2:
-            case HSQLDB:
-            case POSTGRES:
-            case SQLITE:
-                if (precision != null && !NO_SUPPORT_PRECISION.contains(ctx.dialect()))
-                    ctx.visit(K_CURRENT).sql('_').visit(K_TIMESTAMP).sql('(').visit(precision).sql(')');
-                else
-                    ctx.visit(K_CURRENT).sql('_').visit(K_TIMESTAMP);
-
-                break;
-
-            default:
+            case MARIADB:
+            case MYSQL:
                 if (precision != null && !NO_SUPPORT_PRECISION.contains(ctx.dialect()))
                     ctx.visit(N_CURRENT_TIMESTAMP).sql('(').visit(precision).sql(')');
                 else
                     ctx.visit(N_CURRENT_TIMESTAMP).sql("()");
 
                 break;
+
+            default:
+                if (precision != null && !NO_SUPPORT_PRECISION.contains(ctx.dialect()))
+                    ctx.visit(K_CURRENT).sql('_').visit(K_TIMESTAMP).sql('(').visit(precision).sql(')');
+                else
+                    ctx.visit(K_CURRENT).sql('_').visit(K_TIMESTAMP);
+
+                break;
         }
     }
 }