From c3510df2f7e9b26652f37d7dd4620bea9ff0d03a Mon Sep 17 00:00:00 2001 From: Fred Feng Date: Mon, 5 Oct 2026 23:23:02 +1100 Subject: [PATCH] fix: adjust test codes --- .github/dependabot.yml | 42 +++++++++++++++++++++++++++++++++++++++ docs/blogger/sqljam-en.md | 10 +++++----- docs/blogger/sqljam-zh.md | 10 +++++----- pom.xml | 21 +++++++++++++------- 4 files changed, 66 insertions(+), 17 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..fc389b5 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,42 @@ +# Dependabot keeps dependencies and GitHub Actions up to date. +# Pull requests target the dev branch. Patch and minor updates are grouped into one pull request. +version: 2 +updates: + - package-ecosystem: maven + directory: / + target-branch: dev + schedule: + interval: weekly + day: monday + open-pull-requests-limit: 10 + labels: + - dependencies + groups: + maven-minor-and-patch: + update-types: + - minor + - patch + ignore: + # JavaFX stays on 17 (Java 17 runtime), Monocle is the matching test platform + - dependency-name: "org.openjfx:*" + update-types: ["version-update:semver-major"] + - dependency-name: "org.testfx:openjfx-monocle" + update-types: ["version-update:semver-major"] + # Connector/J 8.x keeps old MySQL servers working + - dependency-name: "com.mysql:mysql-connector-j" + update-types: ["version-update:semver-major"] + - dependency-name: "com.microsoft.sqlserver:mssql-jdbc" + update-types: ["version-update:semver-major"] + + - package-ecosystem: github-actions + directory: / + target-branch: dev + schedule: + interval: weekly + day: monday + labels: + - dependencies + groups: + github-actions: + patterns: + - "*" diff --git a/docs/blogger/sqljam-en.md b/docs/blogger/sqljam-en.md index f0527e9..50d7e65 100644 --- a/docs/blogger/sqljam-en.md +++ b/docs/blogger/sqljam-en.md @@ -9,7 +9,7 @@ A Java 17 + JavaFX desktop tool that copies tables between **MySQL, PostgreSQL, Oracle, SQL Server, H2, SQLite** and more, in any direction: **import directly** into a target database, or save a self-describing **SQL export package** and import it later. -![SqlJam main window](../assets/main-dark.png) +![SqlJam main window](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/main-dark.png) ## 2. What Problem Does It Solve? @@ -50,11 +50,11 @@ bin/ A splash screen shows the loading of the configuration, the data sources and the JDBC drivers: -

SqlJam splash screen

+

SqlJam splash screen

| 1. Log in to a data source | 2. Export wizard | 3. Progress | |---|---|---| -| ![login](../assets/login.png) | ![export](../assets/export-wizard.png) | ![progress](../assets/progress.png) | +| ![login](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/login.png) | ![export](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/export-wizard.png) | ![progress](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/progress.png) | ## 4. Requirements @@ -79,7 +79,7 @@ All JDBC drivers are bundled in the fat jar. ## 5. How It Works -![How it works](../assets/architecture.png) +![How it works](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/architecture.png) ```mermaid flowchart LR @@ -166,7 +166,7 @@ All settings live in `bin/sqljam.properties` next to the runnable jar. Settings ## 8. Performance -![Benchmark](../assets/benchmark.png) +![Benchmark](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/benchmark.png) | Scenario (200,000 rows × 6 columns) | Time | Rows/s | |---|---|---| diff --git a/docs/blogger/sqljam-zh.md b/docs/blogger/sqljam-zh.md index 72bdbd9..d6f223f 100644 --- a/docs/blogger/sqljam-zh.md +++ b/docs/blogger/sqljam-zh.md @@ -9,7 +9,7 @@ 一个 Java 17 + JavaFX 的桌面导入导出工具，支持 **MySQL、PostgreSQL、Oracle、SQL Server、H2、SQLite** 等数据库任意互导： 可以**直接导入目标库**，也可以导出为带描述文件的 **SQL 导出包**，之后再成对导入。 -![SqlJam 主界面](../assets/main-dark.png) +![SqlJam 主界面](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/main-dark.png) ## 2. 解决什么问题？ @@ -50,11 +50,11 @@ bin/ 启动时显示启动画面，同时加载配置、数据源和 JDBC 驱动： -

SqlJam 启动画面

+

SqlJam 启动画面

| 1. 登录数据源 | 2. 导出向导 | 3. 进度 | |---|---|---| -| ![login](../assets/login.png) | ![export](../assets/export-wizard.png) | ![progress](../assets/progress.png) | +| ![login](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/login.png) | ![export](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/export-wizard.png) | ![progress](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/progress.png) | ## 4. Requirements @@ -79,7 +79,7 @@ JDBC 驱动全部打进 fat jar，无需额外下载。 ## 5. How It Works -![工作原理](../assets/architecture.png) +![工作原理](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/architecture.png) ```mermaid flowchart LR @@ -166,7 +166,7 @@ importer.exportDdlAndData(); ## 8. Performance -![Benchmark](../assets/benchmark.png) +![Benchmark](https://raw.githubusercontent.com/paganini2008/sqljam/master/docs/assets/benchmark.png) | 场景（20 万行 × 6 列） | 耗时 | 行/秒 | |---|---|---| diff --git a/pom.xml b/pom.xml index 653473c..23809b1 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ org.apache.commons commons-lang3 - 3.17.0 + 3.21.0 org.apache.commons @@ -75,22 +75,22 @@ com.fasterxml.jackson.core jackson-databind - 2.17.2 + 2.22.3 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.17.2 + 2.22.3 org.slf4j slf4j-api - 2.0.16 + 2.0.20 ch.qos.logback logback-classic - 1.5.8 + 1.5.38 org.projectlombok @@ -104,11 +104,18 @@ com.mysql mysql-connector-j 8.4.0 + + + + com.google.protobuf + protobuf-java + + org.postgresql postgresql - 42.7.4 + 42.7.13 com.oracle.database.jdbc @@ -123,7 +130,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.8.1.jre11 + 12.8.2.jre11 com.h2database