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

[#1774] QueryPart.toString() does not load default settings from

Browse Source 
classpath
This commit is contained in:
Lukas Eder 2012-09-01 10:39:30 +02:00
parent 2a235ff569
commit 4f5593d8b4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jOOQ/src/main/java/org/jooq/SchemaMapping.java
View File

@ -95,7 +95,7 @@ public class SchemaMapping implements Serializable {
* @deprecated - 2.0.5 - Do not reuse this SchemaMapping!
*/
@Deprecated
public static final SchemaMapping NO_MAPPING = new SchemaMapping(new Settings(), true);
public static final SchemaMapping NO_MAPPING = new SchemaMapping(SettingsTools.defaultSettings(), true);
private final RenderMapping mapping;
private final boolean ignoreMapping;
@ -300,8 +300,11 @@ public class SchemaMapping implements Serializable {
* @return The configured schema
*/
public Schema map(Schema schema) {
if (ignoreMapping) return schema;
// [#1774] The default Settings render schema flag takes precedence over
// The DefaultConfiguration's ignoreMapping flag!
if (!renderSchema) return null;
if (ignoreMapping) return schema;
Schema result = null;
if (schema != null) {

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

@ -44,6 +44,7 @@ import javax.sql.DataSource;
import org.jooq.Configuration;
import org.jooq.SQLDialect;
import org.jooq.conf.Settings;
import org.jooq.conf.SettingsTools;
/**
* The default configuration, if no other configuration is supplied
@ -89,7 +90,7 @@ final class DefaultConfiguration implements Configuration {
@Override
public final Settings getSettings() {
return new Settings();
return SettingsTools.defaultSettings();
}
@Override