Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#15: Fix reuse of oracle-db in integration test #36

Merged
merged 3 commits into from
Oct 26, 2023
Merged

#15: Fix reuse of oracle-db in integration test #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36c2adb
Increment version
kaklakariada Oct 26, 2023
c9cbbaf
#15: Create a unique oracle schema for each test run
kaklakariada Oct 26, 2023
4bb2865
Run PK fix
kaklakariada Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 20 additions & 30 deletions dependencies.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions doc/changes/changelog.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions doc/changes/changes_2.4.3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Virtual Schema for Oracle 2.4.3, released 2023-??-??

Code name:

## Summary

## Refactoring

* #15: Fix reuse of oracle-db in integration test

## Dependency Updates

### Test Dependency Updates

* Updated `org.jacoco:org.jacoco.agent:0.8.10` to `0.8.11`
* Updated `org.mockito:mockito-junit-jupiter:5.5.0` to `5.6.0`

### Plugin Dependency Updates

* Updated `com.exasol:error-code-crawler-maven-plugin:1.3.0` to `1.3.1`
* Updated `com.exasol:project-keeper-maven-plugin:2.9.12` to `2.9.14`
* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.4.0` to `3.4.1`
* Updated `org.codehaus.mojo:versions-maven-plugin:2.16.0` to `2.16.1`
* Updated `org.jacoco:jacoco-maven-plugin:0.8.10` to `0.8.11`
* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184` to `3.10.0.2594`
2 changes: 1 addition & 1 deletion doc/user_guide/oracle_user_guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ The SQL statement below creates the adapter script, defines the Java class that
```sql
CREATE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS
%scriptclass com.exasol.adapter.RequestDispatcher;
%jar /buckets/<BFS service>/<bucket>/virtual-schema-dist-11.0.2-oracle-2.4.2.jar;
%jar /buckets/<BFS service>/<bucket>/virtual-schema-dist-11.0.2-oracle-2.4.3.jar;
%jar /buckets/<BFS service>/<bucket>/ojdbc<JDBC driver version>.jar;
/
;
Expand Down
2 changes: 0 additions & 2 deletions lombok.config
View file
Open in desktop

This file was deleted.

16 changes: 8 additions & 8 deletions pk_generated_parent.pom
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.exasol</groupId>
<artifactId>oracle-virtual-schema</artifactId>
<version>2.4.2</version>
<version>2.4.3</version>
<name>Virtual Schema for Oracle</name>
<description>Virtual Schema for Oracle</description>
<url>https://github.com/exasol/oracle-virtual-schema/</url>
Expand Down Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.5.0</version>
<version>5.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -137,7 +137,7 @@
<plugin>
<groupId>com.exasol</groupId>
<artifactId>project-keeper-maven-plugin</artifactId>
<version>2.9.12</version>
<version>2.9.14</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -185,7 +185,7 @@
<parent>
<artifactId>oracle-virtual-schema-generated-parent</artifactId>
<groupId>com.exasol</groupId>
<version>2.4.2</version>
<version>2.4.3</version>
<relativePath>pk_generated_parent.pom</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion src/test/java/com/exasol/adapter/dialects/oracle/IntegrationTestConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.exasol.adapter.dialects.oracle;

public final class IntegrationTestConstants {
public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-11.0.2-oracle-2.4.2.jar";
public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-11.0.2-oracle-2.4.3.jar";
public static final String ORACLE_CONTAINER_NAME = "gvenzl/oracle-xe:21.3.0";
public static final String SCHEMA_EXASOL = "SCHEMA_EXASOL";
public static final String TABLE_JOIN_1 = "TABLE_JOIN_1";
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
class OracleSqlDialectIT {
private static final String ORACLE_CONTAINER_NAME = IntegrationTestConstants.ORACLE_CONTAINER_NAME;

private static final String SCHEMA_ORACLE = "SCHEMA_ORACLE";
private static final String SCHEMA_ORACLE = "SCHEMA_ORACLE_" + System.currentTimeMillis();

private static final String ORACLE_JDBC_CONNECTION_NAME = "JDBC_CONNECTION";
private static final String ORACLE_OCI_CONNECTION_NAME = "ORACLE_CONNECTION";
Expand Down