From 4941d21c1ec6be08c14ebb171501944832caf69b Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Tue, 11 Aug 2015 10:49:39 +0200
Subject: [PATCH] [#3783] Add Field<String> DSL.currentSchema() - additional
 dialects

---
 jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java | 6 ++++++
 jOOQ/src/main/java/org/jooq/impl/CurrentUser.java   | 5 ++++-
 jOOQ/src/main/java/org/jooq/impl/DSL.java           | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
index c4ba4fee52..3d5d3d1c7b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
@@ -42,6 +42,7 @@ package org.jooq.impl;
 
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
@@ -77,6 +78,11 @@ class CurrentSchema extends AbstractFunction<String> {
                 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx
 
             xx [/pro] */
+            case CUBRID:
+            case FIREBIRD:
+            case SQLITE:
+                return inline("");
+
             case DERBY:
                 return field("{current schema}", String.class);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
index 035ff4e5ab..d3cbed66cf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
@@ -42,6 +42,7 @@ package org.jooq.impl;
 
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
@@ -83,8 +84,10 @@ class CurrentUser extends AbstractFunction<String> {
             case FIREBIRD:
             case HSQLDB:
             case POSTGRES:
-            case SQLITE:
                 return field("{current_user}", String.class);
+
+            case SQLITE:
+                return inline("");
         }
 
         return function("current_user", SQLDataType.VARCHAR);
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index d1ebbd4001..55db559a3d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -13663,7 +13663,7 @@ public class DSL {
     /**
      * Get the <code>current_user()</code> function.
      */
-    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     public static Field<String> currentUser() {
         return new CurrentUser();
     }
@@ -13671,7 +13671,7 @@ public class DSL {
     /**
      * Get the <code>current_schema()</code> function.
      */
-    @Support({ DERBY, H2, MARIADB, MYSQL, POSTGRES })
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, MARIADB, MYSQL, POSTGRES, SQLITE })
     public static Field<String> currentSchema() {
         return new CurrentSchema();
     }