[#841] Oracle fix

Blazebit · Jul 22, 2020 · 49f6eba · 49f6eba
1 parent 5dc9cd1
commit 49f6eba
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 12 deletions.
diff --git a/core/testsuite/pom.xml b/core/testsuite/pom.xml
@@ -559,6 +559,9 @@
                                 <!-- Careful, we need this otherwise the ordering will be wrong... -->
                                 <user.country>US</user.country>
                                 <user.language>en</user.language>
+                                <!-- Dumb, dumber, Oracle -->
+                                <!-- See https://stackoverflow.com/questions/33232260/temporaltemporaltype-date-with-oracle-12 -->
+                                <oracle.jdbc.DateZeroTime>true</oracle.jdbc.DateZeroTime>
                             </systemPropertyVariables>
                         </configuration>
                         <dependencies>

diff --git a/documentation/src/main/asciidoc/core/manual/en_US/jpql_functions.adoc b/documentation/src/main/asciidoc/core/manual/en_US/jpql_functions.adoc
@@ -539,6 +539,17 @@ Where `pathSegmentN` is a quoted literal json key or array index.
 
 Returns the json node (scalar, object or array) within the `jsonDocument` designated by the path segments.
 
+Usage examples:
+
+[source]
+----
+json_get('{ "owner": { "firstName": "John", "lastName": "Smith", hobbies: [ "football", "tennis" ] } }', 'owner', 'firstName')
+--> John
+
+json_get('{ "owner": { "firstName": "John", "lastName": "Smith", hobbies: [ "football", "tennis" ] } }', 'owner', 'hobbies', '1')
+--> tennis
+----
+
 ==== JSON_SET
 
 Sytax: `JSON_SET(jsonDocument, newValue, pathSegment1, ..., pathSegmentN)`
@@ -549,6 +560,17 @@ Returns the modified `jsonDocument` that results from replacing the json node de
 
 Setting JSON `null` is not supported for Oracle.
 
+Usage examples:
+
+[source]
+----
+json_set('{ "owner": { "firstName": "John", "lastName": "Smith", hobbies: [ "football", "tennis" ] } }', 'James', 'owner', 'firstName')
+--> { "owner": { "firstName": "James", "lastName": "Smith", hobbies: [ "football", "tennis" ] } }
+
+json_set('{ "owner": { "firstName": "John", "lastName": "Smith", hobbies: [ "football", "tennis" ] } }', 'table tennis', 'owner', 'hobbies', '1')
+--> { "owner": { "firstName": "James", "lastName": "Smith", hobbies: [ "football", "table tennis" ] } }
+----
+
 ==== STRING_JSON_AGG function
 
 Syntax: `STRING_JSON_AGG ( key1, value1, ..., keyN, valueN )`

diff --git a/entity-view/testsuite/pom.xml b/entity-view/testsuite/pom.xml
@@ -423,13 +423,16 @@
                         <configuration>
                             <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@localhost:1521/xe</jdbc.url>
+                                <jdbc.url>jdbc:oracle:thin:@localhost:1521:XE</jdbc.url>
                                 <jdbc.user>SYSTEM</jdbc.user>
-                                <jdbc.password>oracle</jdbc.password>
+                                <jdbc.password>Oracle18</jdbc.password>
                                 <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
                                 <!-- Careful, we need this otherwise the ordering will be wrong... -->
-                                <user.country>us</user.country>
+                                <user.country>US</user.country>
                                 <user.language>en</user.language>
+                                <!-- Dumb, dumber, Oracle -->
+                                <!-- See https://stackoverflow.com/questions/33232260/temporaltemporaltype-date-with-oracle-12 -->
+                                <oracle.jdbc.DateZeroTime>true</oracle.jdbc.DateZeroTime>
                             </systemPropertyVariables>
                         </configuration>
                         <dependencies>

diff --git a/integration/deltaspike-data/testsuite/pom.xml b/integration/deltaspike-data/testsuite/pom.xml
@@ -374,10 +374,16 @@
                         <configuration>
                             <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@localhost:1521/xe</jdbc.url>
+                                <jdbc.url>jdbc:oracle:thin:@localhost:1521:XE</jdbc.url>
                                 <jdbc.user>SYSTEM</jdbc.user>
-                                <jdbc.password>oracle</jdbc.password>
+                                <jdbc.password>Oracle18</jdbc.password>
                                 <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+                                <!-- Careful, we need this otherwise the ordering will be wrong... -->
+                                <user.country>US</user.country>
+                                <user.language>en</user.language>
+                                <!-- Dumb, dumber, Oracle -->
+                                <!-- See https://stackoverflow.com/questions/33232260/temporaltemporaltype-date-with-oracle-12 -->
+                                <oracle.jdbc.DateZeroTime>true</oracle.jdbc.DateZeroTime>
                                 <activeProfiles>${spring.activeProfiles}</activeProfiles>
                             </systemPropertyVariables>
                         </configuration>

diff --git a/integration/querydsl/testsuite/pom.xml b/integration/querydsl/testsuite/pom.xml
@@ -342,13 +342,16 @@
                         <configuration>
                             <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@localhost:1521/xe</jdbc.url>
+                                <jdbc.url>jdbc:oracle:thin:@localhost:1521:XE</jdbc.url>
                                 <jdbc.user>SYSTEM</jdbc.user>
-                                <jdbc.password>oracle</jdbc.password>
+                                <jdbc.password>Oracle18</jdbc.password>
                                 <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
                                 <!-- Careful, we need this otherwise the ordering will be wrong... -->
                                 <user.country>US</user.country>
                                 <user.language>en</user.language>
+                                <!-- Dumb, dumber, Oracle -->
+                                <!-- See https://stackoverflow.com/questions/33232260/temporaltemporaltype-date-with-oracle-12 -->
+                                <oracle.jdbc.DateZeroTime>true</oracle.jdbc.DateZeroTime>
                             </systemPropertyVariables>
                         </configuration>
                         <dependencies>

diff --git a/integration/spring-data/testsuite/webflux/pom.xml b/integration/spring-data/testsuite/webflux/pom.xml
@@ -393,10 +393,16 @@
                         <configuration>
                             <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@localhost:1521/xe</jdbc.url>
+                                <jdbc.url>jdbc:oracle:thin:@localhost:1521:XE</jdbc.url>
                                 <jdbc.user>SYSTEM</jdbc.user>
-                                <jdbc.password>oracle</jdbc.password>
+                                <jdbc.password>Oracle18</jdbc.password>
                                 <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+                                <!-- Careful, we need this otherwise the ordering will be wrong... -->
+                                <user.country>US</user.country>
+                                <user.language>en</user.language>
+                                <!-- Dumb, dumber, Oracle -->
+                                <!-- See https://stackoverflow.com/questions/33232260/temporaltemporaltype-date-with-oracle-12 -->
+                                <oracle.jdbc.DateZeroTime>true</oracle.jdbc.DateZeroTime>
                                 <activeProfiles>${spring.activeProfiles}</activeProfiles>
                             </systemPropertyVariables>
                         </configuration>

diff --git a/integration/spring-data/testsuite/webmvc/pom.xml b/integration/spring-data/testsuite/webmvc/pom.xml
@@ -403,10 +403,16 @@
                         <configuration>
                             <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@localhost:1521/xe</jdbc.url>
+                                <jdbc.url>jdbc:oracle:thin:@localhost:1521:XE</jdbc.url>
                                 <jdbc.user>SYSTEM</jdbc.user>
-                                <jdbc.password>oracle</jdbc.password>
+                                <jdbc.password>Oracle18</jdbc.password>
                                 <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+                                <!-- Careful, we need this otherwise the ordering will be wrong... -->
+                                <user.country>US</user.country>
+                                <user.language>en</user.language>
+                                <!-- Dumb, dumber, Oracle -->
+                                <!-- See https://stackoverflow.com/questions/33232260/temporaltemporaltype-date-with-oracle-12 -->
+                                <oracle.jdbc.DateZeroTime>true</oracle.jdbc.DateZeroTime>
                                 <activeProfiles>${spring.activeProfiles}</activeProfiles>
                             </systemPropertyVariables>
                         </configuration>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -570,7 +570,7 @@
             <dependency>
                 <groupId>com.oracle.database.jdbc</groupId>
                 <artifactId>ojdbc8</artifactId>
-                <version>18.3.0.0</version>
+                <version>19.7.0.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>