Merge pull request #69 from MongoCamp/jdbc-driver

Jdbc driver

Author: sfxcode

.github/workflows/main_test_release.yml

@@ -14,7 +14,7 @@ jobs:
  strategy:
  matrix:
  mongodb-version: ['4.4', '5.0', '6.0', '7.0']
- java: [ '11', '17' ]
+ java: [ '21', '23' ]
  steps:
  - uses: actions/checkout@main
  - name: Setup TimeZone

.github/workflows/other_test.yml

@@ -13,26 +13,26 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- mongodb-version: ['4.4', '5.0', '6.0', '7.0']
- java: [ '11', '17' ]
+ mongodb-version: [ '4.4', '5.0', '6.0', '7.0' ]
+ java: [ '21', '23' ]
  steps:
- - uses: actions/checkout@main
- - name: Set up JDK ${{ matrix.Java }}
- uses: coursier/setup-action@main
- with:
- jvm: corretto:${{ matrix.Java }}
- apps: sbt scala scalac
- - name: Setup TimeZone
- uses: MathRobin/timezone-action@v1.1
- with:
- timezoneLinux: "Europe/Berlin"
- timezoneMacos: "Europe/Berlin"
- timezoneWindows: "W. Europe Standard Time"
- - name: Start MongoDB ${{ matrix.mongodb-version }}
- uses: MongoCamp/mongodb-github-action@main
- with:
- mongodb-version: ${{ matrix.mongodb-version }}
- - name: Run tests
- run: |
- timedatectl
- sbt +test
+  - uses: actions/checkout@main
+  - name: Set up JDK ${{ matrix.Java }}
+  uses: coursier/setup-action@main
+  with:
+  jvm: corretto:${{ matrix.Java }}
+  apps: sbt scala scalac
+  - name: Setup TimeZone
+  uses: MathRobin/timezone-action@v1.1
+  with:
+  timezoneLinux: "Europe/Berlin"
+  timezoneMacos: "Europe/Berlin"
+  timezoneWindows: "W. Europe Standard Time"
+  - name: Start MongoDB ${{ matrix.mongodb-version }}
+  uses: MongoCamp/mongodb-github-action@main
+  with:
+  mongodb-version: ${{ matrix.mongodb-version }}
+  - name: Run tests
+  run: |
+  timedatectl
+  sbt +test

README.md

@@ -158,8 +158,9 @@ class RestaurantDemoSpec extends Specification with RestaurantDemoDatabaseFuncti
 
 ## Run Tests
 ```shell
- docker run --publish 27017:27017 mongocamp/mongodb:latest;
- sbt test;
+docker run -d --publish 27017:27017 --name mongodb mongocamp/mongodb:latest; 
+sbt test; 
+docker rm -f mongodb;
 ```
 
 ## Supporters

build.sbt

@@ -40,7 +40,7 @@ developers := List(
 
 licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html"))
 
-crossScalaVersions := Seq("2.13.13", "2.12.17")
+crossScalaVersions := Seq("2.13.15", "2.12.20")
 
 scalaVersion := crossScalaVersions.value.head
 
@@ -61,41 +61,48 @@ resolvers += "Sonatype OSS Snapshots".at("https://oss.sonatype.org/content/repos
 
 // Test
 
-libraryDependencies += "org.specs2" %% "specs2-core" % "4.20.5" % Test
+libraryDependencies += "org.specs2" %% "specs2-core" % "4.20.9" % Test
 
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.0" % Test
+libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.11" % Test
 
-libraryDependencies += "joda-time" % "joda-time" % "2.12.7" % Test
+libraryDependencies += "joda-time" % "joda-time" % "2.13.0"
 
-val circeVersion = "0.14.6"
+val circeVersion = "0.14.10"
 
 libraryDependencies ++= Seq(
  "io.circe" %% "circe-core",
  "io.circe" %% "circe-generic",
  "io.circe" %% "circe-parser"
-).map(_ % circeVersion % Test)
+).map(_ % circeVersion)
 
-libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "4.11.1"
+libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "5.1.4"
 
-libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.10.5" % Provided
+// MongoDB 5.2.0 not supported for de.bwaldvogel -> https://github.com/bwaldvogel/mongo-java-server/issues/233
+val MongoJavaServerVersion = "1.45.0"
 
-libraryDependencies += "com.github.luben" % "zstd-jni" % "1.5.5-11" % Provided
+libraryDependencies += "de.bwaldvogel" % "mongo-java-server" % MongoJavaServerVersion % Provided
 
-libraryDependencies += "org.apache.lucene" % "lucene-queryparser" % "9.10.0"
+libraryDependencies += "de.bwaldvogel" % "mongo-java-server-h2-backend" % MongoJavaServerVersion % Provided
 
-val MongoJavaServerVersion = "1.44.0"
+libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.10.7" % Provided
 
-libraryDependencies += "de.bwaldvogel" % "mongo-java-server" % MongoJavaServerVersion % Provided
+libraryDependencies += "com.github.luben" % "zstd-jni" % "1.5.6-6" % Provided
 
-libraryDependencies += "de.bwaldvogel" % "mongo-java-server-h2-backend" % MongoJavaServerVersion % Provided
+libraryDependencies += "org.apache.lucene" % "lucene-queryparser" % "10.0.0"
 
 libraryDependencies += "com.github.pathikrit" %% "better-files" % "3.9.2"
 
 libraryDependencies += "com.typesafe" % "config" % "1.4.3"
 
 libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
 
-libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0"
+libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.12.0"
+
+libraryDependencies += "com.vdurmont" % "semver4j" % "3.1.0"
+
+libraryDependencies += "com.github.jsqlparser" % "jsqlparser" % "5.0"
+
+libraryDependencies += "org.liquibase" % "liquibase-core" % "4.29.2" % Test
 
 buildInfoPackage := "dev.mongocamp.driver.mongodb"
 

build_release.sbt

@@ -6,6 +6,8 @@ import sbtrelease.ReleasePlugin.runtimeVersion
 
 import scala.sys.process.*
 
+releaseVersionBump := sbtrelease.Version.Bump.NextStable
+
 val gitAddAllTask = ReleaseStep(action = st => {
  "git add .".!
  st

changelog/config.js

@@ -60,7 +60,8 @@ function nav() {
  {text: 'MongoDAO', link: '/documentation/mongo-dao/'},
  {text: 'GridFsDAO', link: '/documentation/gridfs-dao/'},
  {text: 'Collection', link: '/documentation/collection/'},
- {text: 'LocalServer', link: '/documentation/local-server'}
+ {text: 'LocalServer', link: '/documentation/local-server'},
+ {text: 'SQL', link: '/documentation/sql'}
  ]
  },
  {
@@ -128,9 +129,18 @@ function sidebarDocumentation() {
  items: [
  {text: 'Introduction', link: '/documentation/collection/'},
  {text: 'Aggregation', link: '/documentation/collection/aggregation'},
- {text: 'Pagination', link: '/documentation/collection/pagination'}
+ {text: 'Pagination', link: '/documentation/collection/pagination'},
+ {text: 'Schema analyse', link: '/documentation/collection/analyse-schema'},
  ]
  },
+ {
+ text: 'SQL', items: [
+ {text: 'Query Holder', link: '/documentation/sql/queryholder'},
+ {text: 'JDBC driver', link: '/documentation/sql/jdbc-driver'},
+ ],
+ collapsible: true,
+ collapsed: true,
+ },
  {
  text: 'LocalServer',
  link: '/documentation/local-server'

changelog/header.hbs

@@ -0,0 +1,18 @@
+# Analyse Schema
+The driver supports an automated detection of the schema of an existing collection. The schema is used to detect the types of the columns. 
+
+## Usage 
+
+### Schema Analysis
+Analyse a collection to detect the values for each field and the percentage distribution of the types. 
+
+<<< @/../src/test/scala/dev/mongocamp/driver/mongodb/schema/SchemaSpec.scala#schema-analysis
+
+### Detect Schema 
+The Schema Detector can be used to detect the schema of a collection and is based on [Schema Anaysis](analyse-schema.md#schema-analysis). The schema is used to detect the types of the columns and generate a [JSON Schema](https://json-schema.org) for the collection. In case of multiple types of a field the Generation of the JSON Schema use the type with the most elements. 
+
+:::tip
+The [JSON Schema](https://json-schema.org) format can be use to validate or generate data, as well to secure your [Mongo Collection](https://www.mongodb.com/docs/manual/core/schema-validation/).
+:::
+
+<<< @/../src/test/scala/dev/mongocamp/driver/mongodb/schema/SchemaSpec.scala#schema-explorer

docs/.vitepress/config.ts

@@ -0,0 +1,5 @@
+# SQL Support
+
+Since Version 2.7.1 the driver supports [SQL queries](queryholder.md) on MongoDB. The SQL queries are converted to MongoDB queries and could executed on the MongoDB database. 
+
+The driver also supports a [JDBC driver](jdbc-driver.md) to use the SQL queries in your application and migrate your database with liquibase for example.