| Chunk |
|---|
| Conflicting content |
|---|
}
public MySQLTemplates(char escape, boolean quote) {
<<<<<<< HEAD
super(MYSQL_RESERVED_WORDS, "`", escape, quote);
=======
super("`", escape, quote);
setArraysSupported(false);
>>>>>>> 962c13de021b0deea3a9cbaf15c959867a4bfa3e
setParameterMetadataAvailable(false);
setLimitRequired(true);
setNullsFirst(null); |
| Solution content |
|---|
}
public MySQLTemplates(char escape, boolean quote) {
super(MYSQL_RESERVED_WORDS, "`", escape, quote);
setArraysSupported(false);
setParameterMetadataAvailable(false);
setLimitRequired(true);
setNullsFirst(null); |
| File |
|---|
| MySQLTemplates.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
private boolean wrapSelectParameters = false;
<<<<<<< HEAD
@Deprecated
=======
private boolean arraysSupported = true;
>>>>>>> 962c13de021b0deea3a9cbaf15c959867a4bfa3e
protected SQLTemplates(String quoteStr, char escape, boolean useQuotes) {
this(SQL_RESERVED_WORDS, quoteStr, escape, useQuotes);
} |
| Solution content |
|---|
private boolean wrapSelectParameters = false;
private boolean arraysSupported = true;
@Deprecated
protected SQLTemplates(String quoteStr, char escape, boolean useQuotes) {
this(SQL_RESERVED_WORDS, quoteStr, escape, useQuotes);
} |
| File |
|---|
| SQLTemplates.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Annotation |
| Attribute |