New driver based on the Prism API

.github/workflows/ci.yml

@@ -3,34 +3,120 @@ name: Polypheny JDBC Driver CI
 on: [ push, pull_request ]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [ 8, 11 ]
-        os: [ macos-latest, ubuntu-latest, windows-latest ]
-    name: Java ${{ matrix.java }} @ ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: ${{ matrix.java }}
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Build with Gradle
-        run: ./gradlew build
-      - name: Cleanup Gradle Cache
-        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
-        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
-        run: |
-          rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties
+    build-polypheny:
+        timeout-minutes: 15
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/setup-java@v4
+                with:
+                    distribution: 'temurin'
+                    java-version: '17'
+
+            -   name: Checkout Polypheny
+                uses: actions/checkout@v4
+                with:
+                    repository: polypheny/Polypheny-DB
+                    ref: proto-without-grpc
+
+            -   name: Build Polypheny
+                run: |
+                    ./gradlew build -x test -x licensee
+
+            -   name: Build Polypheny again (just to be sure all plugins are available)
+                run: |
+                    ./gradlew build -x test -x licensee
+
+            -   name: Store Polypheny JAR
+                uses: actions/upload-artifact@v4
+                with:
+                    name: polypheny-jar
+                    path: dbms/build/libs/dbms-0.10.0-SNAPSHOT.jar
+
+    build:
+        needs: build-polypheny
+        strategy:
+            fail-fast: false
+            matrix:
+                java: [ 8, 11, 17, 21 ]
+                os: [ ubuntu-latest, macos-latest ]
+                exclude:
+                    -   os: macos-latest
+                        java: 8
+        timeout-minutes: 5
+        runs-on: ${{ matrix.os }}
+        name: Java ${{ matrix.java }} @ ${{ matrix.os }}
+        steps:
+            -   uses: actions/checkout@v4
+            -   name: Set up JDK
+                uses: actions/setup-java@v4
+                with:
+                    distribution: 'temurin'
+                    java-version: |
+                        17
+                        ${{ matrix.java }}
+            -   name: Load Polypheny JAR
+                uses: actions/download-artifact@v4
+                with:
+                    name: polypheny-jar
+
+            -   name: Build & test with Gradle
+                uses: polypheny/GitHub-Action-Run-Polypheny@dev
+                with:
+                    cmd: ./gradlew build -PdisableToolchain=true
+                    jar: dbms-0.10.0-SNAPSHOT.jar
+                    java: ${{ env.JAVA_HOME_17_X64 || env.JAVA_HOME_17_ARM64 }}/bin/java
+
+    build-windows:
+        needs: build-polypheny
+        strategy:
+            fail-fast: false
+        timeout-minutes: 20
+        runs-on: windows-latest
+        name: Java 8 @ windows-latest
+        steps:
+            -   uses: actions/checkout@v4
+            -   name: Set up JDK
+                uses: actions/setup-java@v4
+                with:
+                    distribution: 'temurin'
+                    java-version: |
+                        17
+                        8
+            -   name: Load Polypheny JAR
+                uses: actions/download-artifact@v4
+                with:
+                    name: polypheny-jar
+
+            -   name: Build & test with Gradle
+                uses: polypheny/GitHub-Action-Run-Polypheny@v0.2.0
+                with:
+                    cmd: gradlew.bat build -PdisableToolchain=true
+                    jar: dbms-0.10.0-SNAPSHOT.jar
+                    java: ${{ env.JAVA_HOME_17_X64 }}\bin\java
+
+    test-stores:
+        needs: build-polypheny
+        strategy:
+            fail-fast: false
+            matrix:
+                adapter: [ mongodb, hsqldb, monetdb, postgresql, file, cottontail, neo4j ]
+        timeout-minutes: 10
+        runs-on: ubuntu-latest
+        name: Test on ${{ matrix.adapter }}
+        steps:
+            -   uses: actions/checkout@v4
+            -   name: Set up JDK
+                uses: actions/setup-java@v4
+                with:
+                    distribution: 'temurin'
+                    java-version: 17
+            -   name: Load Polypheny JAR
+                uses: actions/download-artifact@v4
+                with:
+                    name: polypheny-jar
+            -   name: Build with Gradle
+                uses: polypheny/GitHub-Action-Run-Polypheny@v0.2.0
+                with:
+                    cmd: ./gradlew build -PdisableToolchain=true
+                    jar: dbms-0.10.0-SNAPSHOT.jar
+                    default-store: ${{ matrix.adapter }}

.github/workflows/publish.yml

@@ -10,12 +10,12 @@ jobs:
             contents: read
             packages: write
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
             -   name: Set up Java
                 uses: actions/setup-java@v2
                 with:
-                    java-version: '11'
-                    distribution: 'adopt'
+                    java-version: '17'
+                    distribution: 'temurin'
             -   name: Publish package
                 run: ./gradlew publish
                 env:

.gitignore

@@ -250,3 +250,6 @@ nbdist/
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !/gradle/wrapper/gradle-wrapper.jar
 !/libs/avatica-1.16.0-POLYPHENYDB-shaded.jar
+
+# Ignore dynamically generated version file
+src/main/resources/polypheny-jdbc-driver-version.properties

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 2.0
+
+### May 10, 2024
+
+CHANGES:
+
+* New version of JDBC driver utilizing the Polypheny Prism query interface and protocol.
+
+IMPROVEMENTS:
+
+* N/A
+
+BUG FIXES:
+
+* N/A
+
 ## 1.5.3
 
 ### November 21, 2021

README.md

@@ -8,15 +8,17 @@
 
 # Polypheny JDBC Driver
 
-This repository contains a standards-compliant JDBC driver for Polypheny-DB.
+This repository contains s JDBC driver for Polypheny. It utilizes the *Prism query interface* deployed with every instance of Polypheny by default. The driver adheres to the JDBC 4.2 standard, ensuring compatibility with Java applications, including those written in Scala and Kotlin, as well as tools like DataGrip.
+
+This driver is compatible with JVM version 8 or higher.
 
 ## Getting Started
 
 - The driver is published to Maven Central. Make sure that you have added `mavenCentral()` to the repositories section in your gradle build file.
-- Add `implementation group: 'org.polypheny', name: 'polypheny-jdbc-driver', version: '1.5.3'` .
-- Load the driver `org.polypheny.jdbc.Driver`, for example via
+- Add `implementation group: 'org.polypheny', name: 'polypheny-jdbc-driver', version: '2.0'` .
+- Optionally: load the driver `org.polypheny.jdbc.PolyphenyDriver`, for example via
   ```
-  Class.forName( "org.polypheny.jdbc.Driver" );
+  Class.forName( "org.polypheny.jdbc.PolyphenyDriver" );
   ```
 - Use the connection URL `jdbc:polypheny:http://localhost/` to connect to [Polypheny-DB](https://github.com/polypheny/Polypheny-DB).
 
@@ -30,8 +32,6 @@ We highly welcome your contributions to the _Polypheny JDBC Driver_. If you woul
 
 Please note that we have a [code of conduct](https://github.com/polypheny/Admin/blob/master/CODE_OF_CONDUCT.md). Please follow it in all your interactions with the project.
 
-## Credits
-This JDBC Driver is based on [Apache Avatica](https://calcite.apache.org/avatica/), a framework for building database drivers. 
 
 ## License
 The Apache 2.0 License