Skip to content

Commit

Permalink
Update Oracle JDBC driver
Browse files Browse the repository at this point in the history
  • Loading branch information
@sualeh
sualeh committed Aug 10, 2024
1 parent 3f42c9a commit a6e30f9
Show file tree
Hide file tree
Showing 15 changed files with 62 additions and 7,202 deletions.
19 changes: 12 additions & 7 deletions schemacrawler-dbtest/src/test/resources/testOracleWithConnection.8.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
System Information
========================================================================

generated by SchemaCrawler 16.21.4
generated on 2024-06-28 18:22:59
generated by SchemaCrawler 16.22.2
generated on 2024-08-10 19:17:45
database version Oracle Oracle Database 23ai Free Release 23.0.0.0.0 - Develop, Learn, and Run for Free
Version 23.4.0.24.05
driver version Oracle JDBC driver 21.14.0.0.0
driver version Oracle JDBC driver 21.15.0.0.0



Expand Down Expand Up @@ -482,7 +482,7 @@ deletes are detected for TYPE_SCROLL_INSENSITIVE result sets false
deletes are detected for TYPE_SCROLL_SENSITIVE result sets false
does max row size include blobs true
driver major version 21
driver minor version 14
driver minor version 15
extra name characters $#
generated key always returned false
identifier quote string "
Expand Down Expand Up @@ -633,9 +633,9 @@ uses local files false

JDBC Driver Information
-=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=-
connection url jdbc:oracle:thin:@localhost:64658/freepdb1
connection url jdbc:oracle:thin:@localhost:51043/freepdb1
driver name Oracle JDBC driver
driver version 21.14.0.0.0
driver version 21.15.0.0.0
driver class name oracle.jdbc.OracleDriver
is JDBC compliant true
supported JDBC version 4.2
Expand Down Expand Up @@ -666,7 +666,7 @@ com.sun.jndi.ldap.read.timeout [driver property]
database [driver property]

not required
value localhost:64658/freepdb1
value localhost:51043/freepdb1

defaultExecuteBatch [driver property]

Expand Down Expand Up @@ -1383,6 +1383,11 @@ oracle.net.useJCEAPI [driver property]
not required
value true

oracle.net.useTcpFastOpen [driver property]

not required
value false

oracle.net.useZeroCopyIO [driver property]

not required
Expand Down
19 changes: 12 additions & 7 deletions schemacrawler-dbtest/src/test/resources/testOracleWithConnection.LTE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
System Information
========================================================================

generated by SchemaCrawler 16.21.4
generated on 2024-06-28 18:24:45
generated by SchemaCrawler 16.22.2
generated on 2024-08-10 19:20:35
database version Oracle Oracle Database 23ai Free Release 23.0.0.0.0 - Develop, Learn, and Run for Free
Version 23.4.0.24.05
driver version Oracle JDBC driver 21.14.0.0.0
driver version Oracle JDBC driver 21.15.0.0.0



Expand Down Expand Up @@ -482,7 +482,7 @@ deletes are detected for TYPE_SCROLL_INSENSITIVE result sets false
deletes are detected for TYPE_SCROLL_SENSITIVE result sets false
does max row size include blobs true
driver major version 21
driver minor version 14
driver minor version 15
extra name characters $#
generated key always returned false
identifier quote string "
Expand Down Expand Up @@ -634,9 +634,9 @@ uses local files false

JDBC Driver Information
-=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=-
connection url jdbc:oracle:thin:@localhost:64698/freepdb1
connection url jdbc:oracle:thin:@localhost:51097/freepdb1
driver name Oracle JDBC driver
driver version 21.14.0.0.0
driver version 21.15.0.0.0
driver class name oracle.jdbc.OracleDriver
is JDBC compliant true
supported JDBC version 4.2
Expand Down Expand Up @@ -667,7 +667,7 @@ com.sun.jndi.ldap.read.timeout [driver property]
database [driver property]

not required
value localhost:64698/freepdb1
value localhost:51097/freepdb1

defaultExecuteBatch [driver property]

Expand Down Expand Up @@ -1384,6 +1384,11 @@ oracle.net.useJCEAPI [driver property]
not required
value true

oracle.net.useTcpFastOpen [driver property]

not required
value false

oracle.net.useZeroCopyIO [driver property]

not required
Expand Down
2 changes: 1 addition & 1 deletion schemacrawler-jdbc-drivers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>com.oracle.database.jdbc.debug</groupId>
<artifactId>ojdbc8_g</artifactId>
<version>21.14.0.0</version>
<version>21.15.0.0</version>
</dependency>
<dependency>
<groupId>com.ibm.db2</groupId>
Expand Down
2 changes: 1 addition & 1 deletion schemacrawler-oracle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>com.oracle.database.jdbc.debug</groupId>
<artifactId>ojdbc8_g</artifactId>
<version>21.14.0.0</version>
<version>21.15.0.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
11 changes: 7 additions & 4 deletions ...ler-oracle/src/test/java/schemacrawler/integration/test/BaseOracleWithConnectionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,11 @@
import static schemacrawler.test.utility.FileHasContent.classpathResource;
import static schemacrawler.test.utility.FileHasContent.hasSameContentAs;
import static schemacrawler.test.utility.FileHasContent.outputOf;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

import schemacrawler.inclusionrule.RegularExpressionInclusionRule;
import schemacrawler.schema.Catalog;
import schemacrawler.schema.Column;
Expand All @@ -72,7 +70,8 @@ public abstract class BaseOracleWithConnectionTest extends BaseAdditionalDatabas
protected void testOracleWithConnection(
final DatabaseConnectionSource dataSource,
final String expectedResource,
final int numDatabaseUsers)
final int numDatabaseUsers,
final boolean noInfo)
throws Exception {

final LimitOptionsBuilder limitOptionsBuilder =
Expand All @@ -90,7 +89,11 @@ protected void testOracleWithConnection(
.withLoadOptions(loadOptionsBuilder.toOptions());

final SchemaTextOptionsBuilder textOptionsBuilder = SchemaTextOptionsBuilder.builder();
textOptionsBuilder.showDatabaseInfo().showJdbcDriverInfo();
if (noInfo) {
textOptionsBuilder.noInfo();
} else {
textOptionsBuilder.showDatabaseInfo().showJdbcDriverInfo();
}
final SchemaTextOptions textOptions = textOptionsBuilder.toOptions();

final SchemaCrawlerExecutable executable = new SchemaCrawlerExecutable("details");
Expand Down
8 changes: 4 additions & 4 deletions ...macrawler-oracle/src/test/java/schemacrawler/integration/test/OracleSpecialUsersTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void testOracleSelectCatalogRoleUser() throws Exception {
DatabaseConnectionSources.fromDataSource(catalogUserDataSource);
final String expectedResource =
String.format("testOracleSelectCatalogRoleUser.%s.txt", javaVersion());
testOracleWithConnection(dataSource, expectedResource, 34);
testOracleWithConnection(dataSource, expectedResource, 34, true);

final DatabaseAccessException sqlException =
assertThrows(
Expand Down Expand Up @@ -127,7 +127,7 @@ public void testOracleWithNoAccessUser() throws Exception {
DatabaseConnectionSources.fromDataSource(noAccessUserDataSource);
final String expectedResource =
String.format("testOracleWithNoAccessUser.%s.txt", javaVersion());
testOracleWithConnection(dataSource, expectedResource, 34);
testOracleWithConnection(dataSource, expectedResource, 34, true);

final DatabaseAccessException sqlException =
assertThrows(
Expand All @@ -151,7 +151,7 @@ public void testOracleWithSchemaOwnerUser() throws Exception {
DatabaseConnectionSources.fromDataSource(schemaOwnerUserDataSource);
final String expectedResource =
String.format("testOracleWithSchemaOwnerUser.%s.txt", javaVersion());
testOracleWithConnection(dataSource, expectedResource, 34);
testOracleWithConnection(dataSource, expectedResource, 34, true);

testSelectQuery(dataSource, "testOracleWithConnectionQuery.txt");

Expand All @@ -169,7 +169,7 @@ public void testOracleWithSelectGrantUser() throws Exception {

final String expectedResource =
String.format("testOracleWithSelectGrantUser.%s.txt", javaVersion());
testOracleWithConnection(dataSource, expectedResource, 34);
testOracleWithConnection(dataSource, expectedResource, 34, true);

testSelectQuery(dataSource, "testOracleWithConnectionQuery.txt");

Expand Down
2 changes: 1 addition & 1 deletion schemacrawler-oracle/src/test/java/schemacrawler/integration/test/OracleTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void testOracleWithConnection() throws Exception {
final DatabaseConnectionSource dataSource = getDataSource();

final String expectedResource = String.format("testOracleWithConnection.%s.txt", javaVersion());
testOracleWithConnection(dataSource, expectedResource, 34);
testOracleWithConnection(dataSource, expectedResource, 34, false);

testSelectQuery(dataSource, "testOracleWithConnectionQuery.txt");
}
Expand Down
Loading

0 comments on commit a6e30f9

Please sign in to comment.