[Blazebit#841] Update database versions

Mobe91 · Jul 20, 2020 · ed8b44d · ed8b44d
1 parent e98aece
commit ed8b44d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -62,7 +62,7 @@ matrix:
     - env: JPAPROVIDER=hibernate-5.2 RDBMS=postgresql
       jdk: oraclejdk8
       addons:
-        postgresql: "9.4"
+        postgresql: "9.5"
     - env: JPAPROVIDER=hibernate-5.2 RDBMS=mssql
       jdk: oraclejdk8
       sudo: true
@@ -89,7 +89,7 @@ matrix:
     - env: JPAPROVIDER=hibernate-apt RDBMS=postgresql SPRING_DATA=spring-data-2.3.x DELTASPIKE=deltaspike-1.9
       jdk: oraclejdk8
       addons:
-        postgresql: "9.4"
+        postgresql: "9.5"
 #    - env: JPAPROVIDER=hibernate-5.2 RDBMS=sqlite
 #      jdk: oraclejdk8
 #    - env: JPAPROVIDER=hibernate-5.2 RDBMS=firebird
@@ -107,7 +107,7 @@ matrix:
     - env: JPAPROVIDER=datanucleus-5 RDBMS=postgresql
       jdk: oraclejdk8
       addons:
-        postgresql: "9.4"
+        postgresql: "9.5"
 #    - env: JPAPROVIDER=datanucleus-5 RDBMS=mssql
 #      jdk: oraclejdk8
 #      sudo: true
@@ -138,7 +138,7 @@ matrix:
 #      sudo: required
 #    - env: JPAPROVIDER=eclipselink RDBMS=postgresql
 #      addons:
-#        postgresql: "9.4"
+#        postgresql: "9.5"
 #    - env: JPAPROVIDER=eclipselink RDBMS=mssql
 #      jdk: oraclejdk8
 #      sudo: true
@@ -166,7 +166,7 @@ matrix:
 #      sudo: required
 #    - env: JPAPROVIDER=openjpa RDBMS=postgresql
 #      addons:
-#        postgresql: "9.4"
+#        postgresql: "9.5"
 #    - env: JPAPROVIDER=openjpa RDBMS=mssql
 #      jdk: oraclejdk8
 #      sudo: true
@@ -197,7 +197,7 @@ matrix:
     - env: JPAPROVIDER=hibernate-5.3 RDBMS=postgresql
       jdk: oraclejdk8
       addons:
-        postgresql: "9.4"
+        postgresql: "9.5"
     - env: JPAPROVIDER=hibernate-5.3 RDBMS=mssql
       jdk: oraclejdk8
       sudo: true
@@ -233,7 +233,7 @@ matrix:
     - env: JPAPROVIDER=hibernate-5.4 RDBMS=postgresql NATIVE=true
       jdk: oraclejdk8
       addons:
-        postgresql: "9.4"
+        postgresql: "9.5"
       script:
         - travis_wait 70 ./build.sh
     - env: JPAPROVIDER=hibernate-5.4 RDBMS=mssql NATIVE=true
@@ -270,7 +270,7 @@ matrix:
 #    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=postgresql
 #      jdk: oraclejdk8
 #      addons:
-#        postgresql: "9.4"
+#        postgresql: "9.5"
 #    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=mssql
 #      jdk: oraclejdk8
 #      sudo: true
@@ -303,7 +303,7 @@ matrix:
     - env: JPAPROVIDER=hibernate-5.1 RDBMS=postgresql
       jdk: oraclejdk8
       addons:
-        postgresql: "9.4"
+        postgresql: "9.5"
 #    - env: JPAPROVIDER=hibernate-5.1 RDBMS=mssql
 #      jdk: oraclejdk8
 #      sudo: true
@@ -336,7 +336,7 @@ matrix:
     - env: JPAPROVIDER=hibernate-5.0 RDBMS=postgresql
       jdk: oraclejdk8
       addons:
-        postgresql: "9.4"
+        postgresql: "9.5"
 #    - env: JPAPROVIDER=hibernate-5.0 RDBMS=mssql
 #      jdk: oraclejdk8
 #      sudo: true
@@ -369,7 +369,7 @@ matrix:
     - env: JPAPROVIDER=hibernate-4.3 RDBMS=postgresql
       jdk: oraclejdk8
       addons:
-        postgresql: "9.4"
+        postgresql: "9.5"
 #    - env: JPAPROVIDER=hibernate-4.3 RDBMS=mssql
 #      jdk: oraclejdk8
 #      sudo: true
@@ -401,7 +401,7 @@ matrix:
     - env: JPAPROVIDER=hibernate RDBMS=postgresql
       jdk: oraclejdk8
       addons:
-        postgresql: "9.4"
+        postgresql: "9.5"
 #    - env: JPAPROVIDER=hibernate RDBMS=mssql
 #      jdk: oraclejdk8
 #      sudo: true
@@ -432,7 +432,7 @@ matrix:
 #      sudo: required
 #    - env: JPAPROVIDER=datanucleus-4 RDBMS=postgresql
 #      addons:
-#        postgresql: "9.4"
+#        postgresql: "9.5"
 #      jdk: oraclejdk8
 #    - env: JPAPROVIDER=datanucleus-4 RDBMS=mssql
 #      jdk: oraclejdk8

diff --git a/...pl/src/main/java/com/blazebit/persistence/impl/function/jsonget/MSSQLJsonGetFunction.java b/...pl/src/main/java/com/blazebit/persistence/impl/function/jsonget/MSSQLJsonGetFunction.java
@@ -28,7 +28,7 @@ public class MSSQLJsonGetFunction extends AbstractJsonGetFunction {
     @Override
     protected void render0(FunctionRenderContext context) {
         List<Object> jsonPathElements = AbstractJsonGetFunction.retrieveJsonPathElements(context, 1);
-        String jsonPath = AbstractJsonGetFunction.toJsonPath(jsonPathElements, jsonPathElements.size(), false);
+        String jsonPath = AbstractJsonGetFunction.toJsonPath(jsonPathElements, jsonPathElements.size(), true);
 
         context.addChunk("coalesce(json_value(");
         context.addArgument(0);

diff --git a/...l/src/main/java/com/blazebit/persistence/impl/function/jsonset/MySQL8JsonSetFunction.java b/...l/src/main/java/com/blazebit/persistence/impl/function/jsonset/MySQL8JsonSetFunction.java
@@ -74,7 +74,7 @@ private void startJsonPathElement(FunctionRenderContext context, List<Object> pa
                 context.addChunk(")");
                 context.addChunk(", ',', ");
             }
-            if (curIndex < pathElems.size()) {
+            if (curIndex < pathElems.size() - 1) {
                 context.addChunk("coalesce(json_merge_patch(");
                 renderJsonGet(context, AbstractJsonGetFunction.toJsonPath(pathElems, curIndex + 1, true));
                 context.addChunk(", concat('");

diff --git a/travis/before_script_oracle.sh b/travis/before_script_oracle.sh
@@ -3,11 +3,7 @@
 # Sets up environment for Blaze-Persistence backend MSSQL at travis-ci.com
 #
 
-git clone https://github.com/wnameless/docker-oracle-xe-11g.git
-cd docker-oracle-xe-11g
-docker build -t wnameless/oracle-xe-11g .
-cd -
-docker run --shm-size=1536m --name oracle -d -p 1521:1521 wnameless/oracle-xe-11g
+docker run --shm-size=1536m --name oracle -d -p 1521:1521 quillbuilduser/oracle-18-xe
 
 docker cp oracle:/u01/app/oracle/product/11.2.0/xe/jdbc/lib/ojdbc6.jar ojdbc.jar
 mvn install:install-file -Dfile=ojdbc.jar -DgroupId=com.oracle -DartifactId=ojdbc14 -Dversion=10.2.0.4.0 -Dpackaging=jar -DgeneratePom=true