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

[#5873] [#7314] Regenerated derived sources using XJC

Browse Source
This commit is contained in:
lukaseder 2018-03-19 12:25:54 +01:00
parent 0c77b184ae
commit f5776b2e41
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jOOQ/src/main/java/org/jooq/conf/QuoteEscaping.java
View File

@ -14,19 +14,19 @@ import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for QuoteEscaping.
*
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* <pre>
* &lt;simpleType name="QuoteEscaping">
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="DEFAULT"/>
* &lt;enumeration value="QUOTE"/>
* &lt;enumeration value="ESCAPE"/>
* &lt;/restriction>
* &lt;/simpleType>
* &lt;simpleType name="QuoteEscaping"&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
* &lt;enumeration value="DEFAULT"/&gt;
* &lt;enumeration value="QUOTE"/&gt;
* &lt;enumeration value="BACKSLASH"/&gt;
* &lt;/restriction&gt;
* &lt;/simpleType&gt;
* </pre>
*
*
*/
@XmlType(name = "QuoteEscaping")
@XmlEnum

17
jOOQ/src/main/java/org/jooq/conf/Settings.java
View File

@ -351,7 +351,7 @@ public class Settings
}
/**
* Whether string literals should be escaped with backslash.
* Whether quotes in strings literals should be escaped with quote repeating or backslash.
*
* @return
* possible object is
@ -1279,6 +1279,11 @@ public class Settings
sb.append(backslashEscaping);
sb.append("</backslashEscaping>");
}
if (quoteEscaping!= null) {
sb.append("<quoteEscaping>");
sb.append(quoteEscaping);
sb.append("</quoteEscaping>");
}
if (paramType!= null) {
sb.append("<paramType>");
sb.append(paramType);
@ -1510,6 +1515,15 @@ public class Settings
return false;
}
}
if (quoteEscaping == null) {
if (other.quoteEscaping!= null) {
return false;
}
} else {
if (!quoteEscaping.equals(other.quoteEscaping)) {
return false;
}
}
if (paramType == null) {
if (other.paramType!= null) {
return false;
@ -1769,6 +1783,7 @@ public class Settings
result = ((prime*result)+((renderFormatting == null)? 0 :renderFormatting.hashCode()));
result = ((prime*result)+((renderScalarSubqueriesForStoredFunctions == null)? 0 :renderScalarSubqueriesForStoredFunctions.hashCode()));
result = ((prime*result)+((backslashEscaping == null)? 0 :backslashEscaping.hashCode()));
result = ((prime*result)+((quoteEscaping == null)? 0 :quoteEscaping.hashCode()));
result = ((prime*result)+((paramType == null)? 0 :paramType.hashCode()));
result = ((prime*result)+((paramCastMode == null)? 0 :paramCastMode.hashCode()));
result = ((prime*result)+((statementType == null)? 0 :statementType.hashCode()));

2
jOOQ/src/main/java/org/jooq/impl/Tools.java
View File

@ -1799,6 +1799,8 @@ final class Tools {
// [#3630] Depending on this setting, we need to consider backslashes as escape characters within string literals.
boolean needsBackslashEscaping = needsBackslashEscaping(ctx.configuration());
// [#5873] [#7314] This setting governs how quotes are escaped within string literals
boolean quotesNeedsBackslashEscaping = quotesNeedsBackslashEscaping(ctx.configuration());
characterLoop:

2
jOOQ/src/main/resources/xsd/jooq-runtime-3.11.0.xsd
View File

@ -488,4 +488,4 @@ Either &lt;input/> or &lt;inputExpression/> must be provided]]></jxb:javadoc></j
<enumeration value="THROW_ON_FAILURE"/>
</restriction>
</simpleType>
</schema>
</schema>