Skip to content

Commit 14bbf5c

Browse files
committed
CAY-2956 Get rid of a dedicated adaper for Oracle 8
1 parent ca1f2c8 commit 14bbf5c

19 files changed

Lines changed: 20 additions & 1196 deletions

File tree

RELEASE-NOTES.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ https://cayenne.apache.org/
77
To browse individual bug reports check out project issue tracker:
88
https://issues.apache.org/jira/browse/CAY
99

10+
----------------------------------
11+
Release: 5.0-M3
12+
Date:
13+
----------------------------------
14+
Changes/New Features:
15+
16+
CAY-2956 Get rid of a dedicated adapter for Oracle 8
17+
18+
Bug Fixes:
19+
20+
1021
----------------------------------
1122
Release: 5.0-M2
1223
Date:

UPGRADE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ Expression caseWhenExp = caseWhen(
5353
```
5454

5555

56+
## Upgrading to 5.0.M3
57+
58+
* Per [CAY-2956](https://issues.apache.org/jira/browse/CAY-2956) the dedicated Oracle 8 adapter has been removed.
59+
`org.apache.cayenne.dba.oracle.Oracle8Adapter` and its supporting classes no longer exist, and the
60+
`OracleSniffer` now maps all Oracle versions to `OracleAdapter` regardless of the JDBC driver version.
61+
If you referenced `Oracle8Adapter` explicitly (e.g. in a DataNode adapter configuration or custom DI
62+
bindings), switch to `org.apache.cayenne.dba.oracle.OracleAdapter`.
63+
5664
## Upgrading to 5.0.M2
5765

5866
* Per [CAY-2947](https://issues.apache.org/jira/browse/CAY-2947) the `cayenne-commitlog` artifact has been removed. Commit log support is now part of the

cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModule.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.cayenne.dba.hsqldb.HSQLDBAdapter;
2727
import org.apache.cayenne.dba.ingres.IngresAdapter;
2828
import org.apache.cayenne.dba.mysql.MySQLAdapter;
29-
import org.apache.cayenne.dba.oracle.Oracle8Adapter;
3029
import org.apache.cayenne.dba.oracle.OracleAdapter;
3130
import org.apache.cayenne.dba.postgres.PostgresAdapter;
3231
import org.apache.cayenne.dba.sqlserver.SQLServerAdapter;
@@ -78,7 +77,6 @@ public void configure(Binder binder) {
7877
.put(IngresAdapter.class.getName(), IngresMergerTokenFactory.class)
7978
.put(MySQLAdapter.class.getName(), MySQLMergerTokenFactory.class)
8079
.put(OracleAdapter.class.getName(), OracleMergerTokenFactory.class)
81-
.put(Oracle8Adapter.class.getName(), OracleMergerTokenFactory.class)
8280
.put(PostgresAdapter.class.getName(), PostgresMergerTokenFactory.class)
8381
.put(SQLServerAdapter.class.getName(), SQLServerMergerTokenFactory.class)
8482
.put(SybaseAdapter.class.getName(), SybaseMergerTokenFactory.class);

cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import org.apache.cayenne.dba.mysql.MySQLAdapter;
6666
import org.apache.cayenne.dba.mysql.MySQLPkGenerator;
6767
import org.apache.cayenne.dba.mysql.MySQLSniffer;
68-
import org.apache.cayenne.dba.oracle.Oracle8Adapter;
6968
import org.apache.cayenne.dba.oracle.OracleAdapter;
7069
import org.apache.cayenne.dba.oracle.OraclePkGenerator;
7170
import org.apache.cayenne.dba.oracle.OracleSniffer;
@@ -139,7 +138,6 @@ public void configure(Binder binder) {
139138
.addPkGenerator(IngresAdapter.class, IngresPkGenerator.class)
140139
.addPkGenerator(MySQLAdapter.class, MySQLPkGenerator.class)
141140
.addPkGenerator(OracleAdapter.class, OraclePkGenerator.class)
142-
.addPkGenerator(Oracle8Adapter.class, OraclePkGenerator.class)
143141
.addPkGenerator(PostgresAdapter.class, PostgresPkGenerator.class)
144142
.addPkGenerator(SQLServerAdapter.class, SybasePkGenerator.class)
145143
.addPkGenerator(SybaseAdapter.class, SybasePkGenerator.class);

cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
import org.apache.cayenne.dba.mysql.MySQLAdapter;
8989
import org.apache.cayenne.dba.mysql.MySQLPkGenerator;
9090
import org.apache.cayenne.dba.mysql.MySQLSniffer;
91-
import org.apache.cayenne.dba.oracle.Oracle8Adapter;
9291
import org.apache.cayenne.dba.oracle.OracleAdapter;
9392
import org.apache.cayenne.dba.oracle.OraclePkGenerator;
9493
import org.apache.cayenne.dba.oracle.OracleSniffer;
@@ -370,7 +369,6 @@ public void configure(Binder binder) {
370369
.addPkGenerator(IngresAdapter.class, IngresPkGenerator.class)
371370
.addPkGenerator(MySQLAdapter.class, MySQLPkGenerator.class)
372371
.addPkGenerator(OracleAdapter.class, OraclePkGenerator.class)
373-
.addPkGenerator(Oracle8Adapter.class, OraclePkGenerator.class)
374372
.addPkGenerator(PostgresAdapter.class, PostgresPkGenerator.class)
375373
.addPkGenerator(SQLServerAdapter.class, SybasePkGenerator.class)
376374
.addPkGenerator(SybaseAdapter.class, SybasePkGenerator.class)

cayenne/src/main/java/org/apache/cayenne/dba/oracle/Oracle8ActionBuilder.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

cayenne/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)