From 47a804857347a13fdb3e1ff0a809745504df9ab4 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Thu, 25 May 2017 12:50:57 +0200
Subject: [PATCH] [#6274] Configuration.dialect() should return
 SQLDialect.DEFAULT when null

---
 .../java/org/jooq/impl/DefaultConfiguration.java     |  4 +++-
 .../main/java/org/jooq/impl/DefaultDSLContext.java   | 12 ++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
index 0cd015bd85..191fa26aa6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
@@ -926,7 +926,9 @@ public class DefaultConfiguration implements Configuration {
 
     @Override
     public final Configuration set(SQLDialect newDialect) {
-        this.dialect = newDialect;
+
+        // [#6274] The reported dialect should never be null
+        this.dialect = newDialect == null ? SQLDialect.DEFAULT : newDialect;
         return this;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index ee76bdc1c0..1b8f23ac42 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -286,36 +286,32 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         this(dialect, null);
     }
 
-    @SuppressWarnings("deprecation")
     public DefaultDSLContext(SQLDialect dialect, Settings settings) {
-        this(new DefaultConfiguration(new NoConnectionProvider(), null, null, null, null, null, dialect, settings, null));
+        this(new DefaultConfiguration(new NoConnectionProvider(), null, null, null, null, null, null, null, null, null, dialect, settings, null));
     }
 
     public DefaultDSLContext(Connection connection, SQLDialect dialect) {
         this(connection, dialect, null);
     }
 
-    @SuppressWarnings("deprecation")
     public DefaultDSLContext(Connection connection, SQLDialect dialect, Settings settings) {
-        this(new DefaultConfiguration(new DefaultConnectionProvider(connection), null, null, null, null, null, dialect, settings, null));
+        this(new DefaultConfiguration(new DefaultConnectionProvider(connection), null, null, null, null, null, null, null, null, null, dialect, settings, null));
     }
 
     public DefaultDSLContext(DataSource datasource, SQLDialect dialect) {
         this(datasource, dialect, null);
     }
 
-    @SuppressWarnings("deprecation")
     public DefaultDSLContext(DataSource datasource, SQLDialect dialect, Settings settings) {
-        this(new DefaultConfiguration(new DataSourceConnectionProvider(datasource), null, null, null, null, null, dialect, settings, null));
+        this(new DefaultConfiguration(new DataSourceConnectionProvider(datasource), null, null, null, null, null, null, null, null, null, dialect, settings, null));
     }
 
     public DefaultDSLContext(ConnectionProvider connectionProvider, SQLDialect dialect) {
         this(connectionProvider, dialect, null);
     }
 
-    @SuppressWarnings("deprecation")
     public DefaultDSLContext(ConnectionProvider connectionProvider, SQLDialect dialect, Settings settings) {
-        this(new DefaultConfiguration(connectionProvider, null, null, null, null, null, dialect, settings, null));
+        this(new DefaultConfiguration(connectionProvider, null, null, null, null, null, null, null, null, null, dialect, settings, null));
     }
 
     public DefaultDSLContext(Configuration configuration) {