github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#6274] Configuration.dialect() should return SQLDialect.DEFAULT when null

Browse Source
This commit is contained in:
lukaseder 2017-05-25 12:50:57 +02:00
parent 58a8aef196
commit 47a8048573
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
View File

@ -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;
}

12
jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
View File

@ -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) {