[#5643] Add DSL.currentLocalDate(), currentLocalTime(), currentLocalD…

…ateTime(), currentOffsetTime(), currentOffsetDateTime()
jOOQ · Nov 6, 2016 · c4e067f · c4e067f
1 parent 86c2a6e
commit c4e067f
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 27 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java b/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
@@ -42,27 +42,26 @@
 
 import static org.jooq.impl.DSL.function;
 
-import java.sql.Date;
-
 import org.jooq.Configuration;
+import org.jooq.DataType;
 import org.jooq.Field;
 
 /**
  * @author Lukas Eder
  */
-final class CurrentDate extends AbstractFunction<Date> {
+final class CurrentDate<T> extends AbstractFunction<T> {
 
     /**
      * Generated UID
      */
     private static final long serialVersionUID = -7273879239726265322L;
 
-    CurrentDate() {
+    CurrentDate(DataType<T> type) {
-        super("current_date", SQLDataType.DATE);
+        super("current_date", type);
     }
 
     @Override
-    final Field<Date> getFunction0(Configuration configuration) {
+    final Field<T> getFunction0(Configuration configuration) {
         switch (configuration.family()) {
 
 
@@ -92,9 +91,9 @@ final Field<Date> getFunction0(Configuration configuration) {
             case HSQLDB:
             case POSTGRES:
             case SQLITE:
-                return DSL.field("{current_date}", SQLDataType.DATE);
+                return DSL.field("{current_date}", getDataType());
         }
 
-        return function("current_date", SQLDataType.DATE);
+        return function("current_date", getDataType());
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
@@ -40,27 +40,26 @@
  */
 package org.jooq.impl;
 
-import java.sql.Time;
-
 import org.jooq.Configuration;
+import org.jooq.DataType;
 import org.jooq.Field;
 
 /**
  * @author Lukas Eder
  */
-final class CurrentTime extends AbstractFunction<Time> {
+final class CurrentTime<T> extends AbstractFunction<T> {
 
     /**
      * Generated UID
      */
     private static final long serialVersionUID = -7273879239726265322L;
 
-    CurrentTime() {
+    CurrentTime(DataType<T> type) {
-        super("current_time", SQLDataType.TIME);
+        super("current_time", type);
     }
 
     @Override
-    final Field<Time> getFunction0(Configuration configuration) {
+    final Field<T> getFunction0(Configuration configuration) {
         switch (configuration.family()) {
 
 
@@ -82,7 +81,7 @@ final Field<Time> getFunction0(Configuration configuration) {
             case HSQLDB:
             case POSTGRES:
             case SQLITE:
-                return DSL.field("{current_time}", SQLDataType.TIME);
+                return DSL.field("{current_time}", getDataType());
 
 
 
@@ -93,6 +92,6 @@ final Field<Time> getFunction0(Configuration configuration) {
 
         }
 
-        return DSL.function("current_time", SQLDataType.TIME);
+        return DSL.function("current_time", getDataType());
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
@@ -42,27 +42,26 @@
 
 import static org.jooq.impl.DSL.function;
 
-import java.sql.Timestamp;
-
 import org.jooq.Configuration;
+import org.jooq.DataType;
 import org.jooq.Field;
 
 /**
  * @author Lukas Eder
  */
-final class CurrentTimestamp extends AbstractFunction<Timestamp> {
+final class CurrentTimestamp<T> extends AbstractFunction<T> {
 
     /**
      * Generated UID
      */
     private static final long serialVersionUID = -7273879239726265322L;
 
-    CurrentTimestamp() {
+    CurrentTimestamp(DataType<T> type) {
-        super("current_timestamp", SQLDataType.TIMESTAMP);
+        super("current_timestamp", type);
     }
 
     @Override
-    final Field<Timestamp> getFunction0(Configuration configuration) {
+    final Field<T> getFunction0(Configuration configuration) {
         switch (configuration.family()) {
 
 
@@ -92,9 +91,9 @@ final Field<Timestamp> getFunction0(Configuration configuration) {
             case HSQLDB:
             case POSTGRES:
             case SQLITE:
-                return DSL.field("{current_timestamp}", SQLDataType.TIMESTAMP);
+                return DSL.field("{current_timestamp}", getDataType());
         }
 
-        return function("current_timestamp", SQLDataType.TIMESTAMP);
+        return function("current_timestamp", getDataType());
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -11499,7 +11499,7 @@ public static Field<String> md5(Field<String> string) {
      */
     @Support
     public static Field<Date> currentDate() {
-        return new CurrentDate();
+        return new CurrentDate<Date>(SQLDataType.DATE);
     }
 
     /**
@@ -11509,7 +11509,7 @@ public static Field<Date> currentDate() {
      */
     @Support
     public static Field<Time> currentTime() {
-        return new CurrentTime();
+        return new CurrentTime<Time>(SQLDataType.TIME);
     }
 
     /**
@@ -11519,9 +11519,61 @@ public static Field<Time> currentTime() {
      */
     @Support
     public static Field<Timestamp> currentTimestamp() {
-        return new CurrentTimestamp();
+        return new CurrentTimestamp<Timestamp>(SQLDataType.TIMESTAMP);
     }
 
+
+    /**
+     * Get the current_date() function.
+     * <p>
+     * This translates into any dialect
+     */
+    @Support
+    public static Field<LocalDate> currentLocalDate() {
+        return new CurrentDate<>(SQLDataType.LOCALDATE);
+    }
+
+    /**
+     * Get the current_time() function.
+     * <p>
+     * This translates into any dialect
+     */
+    @Support
+    public static Field<LocalTime> currentLocalTime() {
+        return new CurrentTime<>(SQLDataType.LOCALTIME);
+    }
+
+    /**
+     * Get the current_timestamp() function.
+     * <p>
+     * This translates into any dialect
+     */
+    @Support
+    public static Field<LocalDateTime> currentLocalDateTime() {
+        return new CurrentTimestamp<>(SQLDataType.LOCALDATETIME);
+    }
+
+    /**
+     * Get the current_time() function.
+     * <p>
+     * This translates into any dialect
+     */
+    @Support
+    public static Field<OffsetTime> currentOffsetTime() {
+        return currentTime().cast(SQLDataType.OFFSETTIME);
+    }
+
+    /**
+     * Get the current_timestamp() function.
+     * <p>
+     * This translates into any dialect
+     */
+    @Support
+    public static Field<OffsetDateTime> currentOffsetDateTime() {
+        return currentTimestamp().cast(SQLDataType.OFFSETDATETIME);
+    }
+
+
     /**
      * Get the date difference in number of days.
      * <p>