Skip to content

Commit 666aef1

Browse files
committed
fixed configureExtendedTypes in SybaseAdapter
1 parent fe34f26 commit 666aef1

File tree

5 files changed

+3
-19
lines changed

5 files changed

+3
-19
lines changed

cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public OracleAdapter(@Inject RuntimeProperties runtimeProperties,
175175
*/
176176
@Override
177177
public SQLTreeProcessor getSqlTreeProcessor() {
178-
return OracleSQLTreeProcessor.getInstance();
178+
return new OracleSQLTreeProcessor();
179179
}
180180

181181
/**

cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTreeProcessor.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,6 @@ public class OracleSQLTreeProcessor extends BaseSQLTreeProcessor {
4242

4343
private Node root;
4444

45-
private static final OracleSQLTreeProcessor INSTANCE = new OracleSQLTreeProcessor();
46-
47-
public static OracleSQLTreeProcessor getInstance() {
48-
return INSTANCE;
49-
}
50-
51-
protected OracleSQLTreeProcessor() { }
52-
5345
@Override
5446
protected void onResultNode(Node parent, Node child, int index) {
5547
for(int i=0; i<child.getChildrenCount(); i++) {

cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public boolean supportsGeneratedKeysForBatchInserts() {
109109
*/
110110
@Override
111111
public SQLTreeProcessor getSqlTreeProcessor() {
112-
return SQLServerTreeProcessor.getInstance();
112+
return new SQLServerTreeProcessor();
113113
}
114114

115115
/**

cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ protected void configureExtendedTypes(ExtendedTypeMap map) {
9393
super.configureExtendedTypes(map);
9494

9595
// create specially configured CharType handler
96-
CharType charType = new CharType(false, false);
96+
CharType charType = new CharType(true, false);
9797
map.registerType(charType);
9898

9999
// create specially configured ByteArrayType handler

cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseSQLTreeProcessor.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@
3434
*/
3535
public class SybaseSQLTreeProcessor extends BaseSQLTreeProcessor {
3636

37-
private static final SybaseSQLTreeProcessor INSTANCE = new SybaseSQLTreeProcessor();
38-
39-
public static SybaseSQLTreeProcessor getInstance() {
40-
return INSTANCE;
41-
}
42-
43-
protected SybaseSQLTreeProcessor() { }
44-
4537
@Override
4638
protected void onLimitOffsetNode(Node parent, LimitOffsetNode child, int index) {
4739
// SQLServer uses "SELECT DISTINCT TOP N" or "SELECT TOP N" instead of LIMIT

0 commit comments

Comments
 (0)