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

KOGITO-5921 Support For OracleDB Peristence #1612

Merged
merged 20 commits into from
Oct 7, 2021
Merged

KOGITO-5921 Support For OracleDB Peristence #1612

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0cc1ef2
basic up
Sep 15, 2021
962a7c1
fix issue with table name pattern
Sep 15, 2021
6c006ed
create repository
Sep 16, 2021
b46a8a1
merge postgres/oracle repository into Generic
Sep 17, 2021
e1c437d
add oracledb testing
Sep 18, 2021
f60682d
Merge branch 'main' into KOGITO-5921-support-for-oracle
Scuilion Sep 19, 2021
723789f
use standard testcontainers api
Sep 20, 2021
c7e49d8
do not duplicate strings
Sep 20, 2021
d27fad5
Update addons/common/persistence/jdbc/src/main/java/org/kie/kogito/pe…
Scuilion Sep 20, 2021
788de5e
Update addons/common/persistence/jdbc/src/main/java/org/kie/kogito/pe…
Scuilion Sep 20, 2021
77eac71
move oracle version to bom
Sep 20, 2021
0c0c285
ParameterizedTest
Sep 21, 2021
a43d518
Update addons/common/persistence/jdbc/src/test/java/org/kie/persisten…
Scuilion Sep 21, 2021
016426a
add README
Sep 21, 2021
5d92483
remove timezone requirements
Sep 22, 2021
28b070d
sonar: check number of bytes read
Sep 23, 2021
4a3acfe
Merge branch 'kiegroup:main' into KOGITO-5921-support-for-oracle
Scuilion Sep 23, 2021
903d634
add sql creation script to ddl assembly
Sep 30, 2021
3981a66
Update db-scripts.xml
danielezonca Oct 5, 2021
a2f0b0b
remove system property after test
Scuilion Oct 5, 2021
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
5 changes: 1 addition & 4 deletions addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/FileLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ static List<String> getQueryFromFile(final String dbType, final String scriptNam
if (stream == null) {
throw new IllegalStateException(String.format("Impossible to find %s", fileName));
}
byte[] buffer = new byte[stream.available()];
int count = 0;
while ((count = stream.read(buffer)) > 0) {
}
byte[] buffer = stream.readAllBytes();
String[] statements = new String(buffer).split(";");
Scuilion marked this conversation as resolved.
Show resolved Hide resolved
return List.of(statements);
} catch (Exception e) {
Expand Down
3 changes: 3 additions & 0 deletions addons/common/persistence/jdbc/src/test/java/org/kie/persistence/jdbc/TestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public static Stream<DataSource> datasources() {
public static SecurityPolicy securityPolicy = SecurityPolicy.of(IdentityProviders.of("john"));

public static final String TEST_ID = "02ac3854-46ee-42b7-8b63-5186c9889d96";
private static final String ORACLE_TIMEZONE_PROPERTY = "oracle.jdbc.timezoneAsRegion";

@BeforeAll
public static void startContainerAndPublicPortIsAvailable() {
Expand All @@ -66,12 +67,14 @@ public static void startContainerAndPublicPortIsAvailable() {

ORACLE_CONTAINER.start();
ORACLE_DATA_SOURCE = getOracleDataSource(ORACLE_CONTAINER);
System.setProperty(ORACLE_TIMEZONE_PROPERTY, "false");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine to have this for now, but there's another solution for such use cases: https://www.baeldung.com/java-system-rules-junit#working-with-system-properties

}

@AfterAll
public static void close() {
PG_CONTAINER.stop();
ORACLE_CONTAINER.stop();
System.clearProperty(ORACLE_TIMEZONE_PROPERTY);
}

public static BpmnProcess createProcess(TestProcessInstancesFactory factory, ProcessConfig config, String fileName) {
Expand Down
1 change: 0 additions & 1 deletion kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoOracleSqlContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public KogitoOracleSqlContainer() {
withLogConsumer(getLogger());
withLogConsumer(new Slf4jLogConsumer(LOGGER));
withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
System.setProperty("oracle.jdbc.timezoneAsRegion", "false");
}

private Consumer<OutputFrame> getLogger() {
Expand Down