Version 0.7.0.

shigenobu · shigenobu · commit d594f1de8b0b · 2024-09-25T23:08:45.000+09:00
* Support for MySQL 8.0.31, 8.0.32.
* Refacter several.
diff --git a/README.ja.md b/README.ja.md
@@ -1,15 +1,16 @@
-# magentadesk - Get MariaDB Table Difference, And Reflect.
+# magentadesk - Get MariaDB / MySQL Table Difference, And Reflect.
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 ### 概要
 
-MariaDBの同一ホスト内の2つのデータベースの差分を取り、同期を行います。  
+MariaDBまたはMySQLの同一ホスト内の2つのデータベースの差分を取り、同期を行います。  
 
 ### システム要件
 
 * JDK 1.8 以上
 * MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5
+* MySQL 8.0.31, 8.0.32
 
 ### コマンド
 
diff --git a/README.md b/README.md
@@ -1,15 +1,16 @@
-# magentadesk - Get MariaDB Table Difference, And Reflect.
+`# magentadesk - Get MariaDB / MySQL Table Difference, And Reflect.`
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 ### About
 
-Get diff and sync between two databases in same host created by MariaDB.  
+Get diff and sync between two databases in same host created by MariaDB or MySQL.  
 
 ### System Required
 
 * over JDK 1.8
 * MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5
+* MySQL 8.0.31, 8.0.32
 
 ### Usage by cli
 
diff --git a/cli/README.ja.md b/cli/README.ja.md
@@ -29,7 +29,7 @@
 
 * （共通）magentadeskデータベースの作成および、関連テーブルの作成
 * （共通）生成から3時間以上経過しているサマリーID関連レコードの削除
-* （共通）比較元・比較先の組み合わせで同時実行制御をかける（FOR UPDATE NOWAIT）
+* （共通）比較元・比較先の組み合わせで同時実行制御をかける（FOR UPDATE NOWAIT/WAIT）
 * メンテナンス状態の判定
 * 比較対象外とするテーブルの抽出
 * 比較対象テーブルの差分抽出およびその時点の差分状態登録
@@ -38,7 +38,7 @@
 
 * （共通）magentadeskデータベースの作成および、関連テーブルの作成
 * （共通）生成から3時間以上経過しているサマリーID関連レコードの削除
-* （共通）比較元・比較先の組み合わせで同時実行制御をかける（FOR UPDATE NOWAIT）
+* （共通）比較元・比較先の組み合わせで同時実行制御をかける（FOR UPDATE NOWAIT/WAIT）
 * メンテナンス状態の判定
 * 抽出された差分の反映
 * 任意コマンドの実行
@@ -47,7 +47,7 @@
 
 * （共通）magentadeskデータベースの作成および、関連テーブルの作成
 * （共通）生成から3時間以上経過しているサマリーID関連レコードの削除
-* （共通）比較元・比較先の組み合わせで同時実行制御をかける（FOR UPDATE NOWAIT）
+* （共通）比較元・比較先の組み合わせで同時実行制御をかける（FOR UPDATE NOWAIT/WAIT）
 * メンテナンス状態の設定
 
 
diff --git a/cli/README.md b/cli/README.md
@@ -29,7 +29,7 @@
 
 * (diff and sync) create magentadesk database, and table.
 * (diff and sync) delete from diff recored passed over 3 hours since created.
-* (diff and sync) base and compare, lock execute simultaneously. （FOR UPDATE NOWAIT）
+* (diff and sync) base and compare, lock execute simultaneously. （FOR UPDATE NOWAIT/WAIT）
 * check maintenance state between base and compare.
 * extract target to diff table.
 * register table diff.
@@ -38,7 +38,7 @@
 
 * (diff and sync) create magentadesk database, and table.
 * (diff and sync) delete from diff recored passed over 3 hours since created.
-* (diff and sync) base and compare, lock execute simultaneously. （FOR UPDATE NOWAIT）
+* (diff and sync) base and compare, lock execute simultaneously. （FOR UPDATE NOWAIT/WAIT）
 * check maintenance state between base and compare.
 * sync table diff used by diff.
 * execute any commands.
@@ -47,7 +47,7 @@
 
 * (diff and sync) create magentadesk database, and table.
 * (diff and sync) delete from diff recored passed over 3 hours since created.
-* (diff and sync) base and compare, lock execute simultaneously. （FOR UPDATE NOWAIT）
+* (diff and sync) base and compare, lock execute simultaneously. （FOR UPDATE NOWAIT/WAIT）
 * set maintenance state.
 
 
diff --git a/cli/pom.xml b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.walksocket</groupId>
     <artifactId>magentadesk</artifactId>
-    <version>0.6.3</version>
+    <version>0.7.0</version>
   </parent>
   <artifactId>cli</artifactId>
   <packaging>jar</packaging>
diff --git a/cli/src/main/resources/help.txt b/cli/src/main/resources/help.txt
@@ -1,4 +1,4 @@
-magentadesk for cli - Get MariaDB Table Difference, And Reflect.
+magentadesk for cli - Get MariaDB / MySQL Table Difference, And Reflect.
 
 Usage:
     echo '${json}' \
diff --git a/doc/json_diff.ja.md b/doc/json_diff.ja.md
@@ -18,8 +18,10 @@ web: request /api/diff/reserve.json
       "pass": "pass",
       // （必須）文字コード、utf8, utf8mb3 または utf8mb4 のみ
       "charset": "utf8mb4",
-      // （必須）比較元となるデータベース名
+      // （必須）DBタイプ、mariadb または mysql のみで省略時は、mariadb
+      "dbType": "mariadb"
       // ----- 独自 -----
+      // （必須）比較元となるデータベース名
       "baseDatabase": "base",
       // （必須）比較先となるデータベース名
       "compareDatabase": "compare",
diff --git a/doc/json_diff.md b/doc/json_diff.md
@@ -17,6 +17,8 @@ web: request /api/diff/reserve.json
       "pass":"pass",
       // (required) connect charset, 'utf8', 'utf8mb3' or 'utf8mb4' is allowed
       "charset":"utf8mb4",
+      // (required) db type, 'mariadb' or 'mysql' is allowed, 'mariadb' is selected when no input 
+      "dbType": "mariadb"
       // (required) base database
       "baseDatabase":"base",
       // (required) compare database
diff --git a/doc/json_maintenance.ja.md b/doc/json_maintenance.ja.md
@@ -18,8 +18,10 @@ web: request /api/maintenance/reserve.json
       "pass": "pass",
       // （必須）文字コード、utf8, utf8mb3 または utf8mb4 のみ
       "charset": "utf8mb4",
-      // （必須）比較元となるデータベース名
+      // （必須）DBタイプ、mariadb または mysql のみで省略時は、mariadb
+      "dbType": "mariadb"
       // ----- 独自 -----
+      // （必須）比較元となるデータベース名
       "baseDatabase": "base",
       // （必須）比較先となるデータベース名
       "compareDatabase": "compare",
diff --git a/doc/json_maintenance.md b/doc/json_maintenance.md
@@ -17,6 +17,8 @@ web: request /api/maintenance/reserve.json
       "pass":"pass",
       // (required) connect charset, 'utf8', 'utf8mb3' or 'utf8mb4' is allowed
       "charset":"utf8mb4",
+      // (required) db type, 'mariadb' or 'mysql' is allowed, 'mariadb' is selected when no input 
+      "dbType": "mariadb"
       // (required) base database
       "baseDatabase":"base",
       // (required) compare database
diff --git a/doc/json_sync.ja.md b/doc/json_sync.ja.md
@@ -18,6 +18,8 @@ web: request /api/sync/reserve.json
       "pass": "pass",
       // （必須）文字コード、utf8, utf8mb3 または utf8mb4 のみ
       "charset": "utf8mb4",
+      // （必須）DBタイプ、mariadb または mysql のみで省略時は、mariadb
+      "dbType": "mariadb"
       // ----- 独自 -----
       // （必須）mode=diffの出力結果に記載されているサマリーID
       "summaryId": "XXXXX",
diff --git a/doc/json_sync.md b/doc/json_sync.md
@@ -17,6 +17,8 @@ web: request /api/sync/reserve.json
       "pass":"pass",
       // (required) connect charset, 'utf8', 'utf8mb3' or 'utf8mb4' is allowed
       "charset":"utf8mb4",
+      // (required) db type, 'mariadb' or 'mysql' is allowed, 'mariadb' is selected when no input 
+      "dbType": "mariadb"
       // (required) diff result id
       "summaryId":"XXXXX",
       // optionally, if listed, selected diffSeqs are only reflected.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.walksocket</groupId>
   <artifactId>magentadesk</artifactId>
-  <version>0.6.3</version>
+  <version>0.7.0</version>
   <modules>
     <module>cli</module>
     <module>web</module>
@@ -14,7 +14,7 @@
 
   <name>magentadesk</name>
   <url>https://github.com/shigenobu/magentadesk</url>
-  <description>Get MariaDB Table Difference, And Reflect.</description>
+  <description>Get MariaDB / MySQL Table Difference, And Reflect.</description>
   <licenses>
     <license>
       <name>Apache 2.0</name>
diff --git a/web/pom.xml b/web/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.walksocket</groupId>
     <artifactId>magentadesk</artifactId>
-    <version>0.6.3</version>
+    <version>0.7.0</version>
   </parent>
   <artifactId>web</artifactId>
   <packaging>jar</packaging>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>com.walksocket</groupId>
       <artifactId>cli</artifactId>
-      <version>0.6.3</version>
+      <version>0.7.0</version>
     </dependency>
     <!-- sqlite -->
     <dependency>
diff --git a/web/src/main/java/com/walksocket/md/MdServer.java b/web/src/main/java/com/walksocket/md/MdServer.java
@@ -224,6 +224,7 @@ private void initDdl(MdSqliteConnection con) throws SQLException {
         "    user text,\n" +
         "    pass text,\n" +
         "    charset text,\n" +
+        "    dbType text,\n" +
         "    baseDatabase text,\n" +
         "    compareDatabase text\n" +
         ")";
diff --git a/web/src/main/java/com/walksocket/md/html/MdHtmlDesk.java b/web/src/main/java/com/walksocket/md/html/MdHtmlDesk.java
@@ -82,6 +82,7 @@ private void makeCommonInput(int projectId, MdInputAbstract input) throws SQLExc
     input.user = projectRecord.get("user");
     input.pass = projectRecord.get("pass");
     input.charset = projectRecord.get("charset");
+    input.dbType = projectRecord.get("dbType");
   }
 
   /**
diff --git a/web/src/main/java/com/walksocket/md/html/endpoint/MdHtmlEndpointProject.java b/web/src/main/java/com/walksocket/md/html/endpoint/MdHtmlEndpointProject.java
@@ -64,6 +64,7 @@ private void list(MdServerRequest request, MdServerResponse response, MdSqliteCo
         "t1.host, " +
         "t1.port, " +
         "t1.charset, " +
+        "t1.dbType, " +
         "t1.baseDatabase, " +
         "t1.compareDatabase, " +
         "ifnull(count(t2.presetId), 0) as presetIdCount " +
@@ -186,6 +187,12 @@ private void save(MdServerRequest request, MdServerResponse response, MdSqliteCo
       return;
     }
 
+    String dbType = request.getBodyParam("dbType");
+    if (MdUtils.isNullOrEmpty(dbType)) {
+      sendOther(response, MdHtmlStatus.BAD_REQUEST);
+      return;
+    }
+
     String baseDatabase = request.getBodyParam("baseDatabase");
     if (MdUtils.isNullOrEmpty(baseDatabase)) {
       sendOther(response, MdHtmlStatus.BAD_REQUEST);
@@ -225,16 +232,17 @@ private void save(MdServerRequest request, MdServerResponse response, MdSqliteCo
       // insert
       sql = String.format(
           "INSERT INTO project " +
-              "(title, explanation, host, port, user, pass, charset, baseDatabase, compareDatabase) " +
+              "(title, explanation, host, port, user, pass, charset, dbType, baseDatabase, compareDatabase) " +
               "VALUES " +
-              "('%s', '%s', '%s', %s, '%s', '%s', '%s', '%s', '%s')",
+              "('%s', '%s', '%s', %s, '%s', '%s', '%s', '%s', '%s', '%s')",
           MdSqliteUtils.quote(title),
           MdSqliteUtils.quote(explanation),
           MdSqliteUtils.quote(host),
           port,
           MdSqliteUtils.quote(user),
           MdSqliteUtils.quote(pass),
           MdSqliteUtils.quote(charset),
+          MdSqliteUtils.quote(dbType),
           MdSqliteUtils.quote(baseDatabase),
           MdSqliteUtils.quote(compareDatabase));
       con.execute(sql);
@@ -259,6 +267,7 @@ private void save(MdServerRequest request, MdServerResponse response, MdSqliteCo
               "user = '%s', " +
               "pass = '%s', " +
               "charset = '%s', " +
+              "dbType = '%s', " +
               "baseDatabase = '%s', " +
               "compareDatabase = '%s' " +
               "WHERE projectId = %s",
@@ -269,6 +278,7 @@ private void save(MdServerRequest request, MdServerResponse response, MdSqliteCo
           MdSqliteUtils.quote(user),
           MdSqliteUtils.quote(pass),
           MdSqliteUtils.quote(charset),
+          MdSqliteUtils.quote(dbType),
           MdSqliteUtils.quote(baseDatabase),
           MdSqliteUtils.quote(compareDatabase),
           projectId);
diff --git a/web/src/main/resources/html/project/edit.vm b/web/src/main/resources/html/project/edit.vm
@@ -82,6 +82,20 @@
                     </div>
                 </td>
             </tr>
+              <tr>
+                <td>
+                  <div>dbType <span class="warning">*required</span></div>
+                </td>
+                <td>
+                  <div>
+                    <select name="dbType">
+                        #foreach($dbType in ["mariadb", "mysql"])
+                          <option value="${dbType}" ${MdTemplateUtils.selected($record.getOrEmpty("dbType"), $dbType)}>${dbType}</option>
+                        #end
+                    </select>
+                  </div>
+                </td>
+              </tr>
             <tr>
                 <td>
                     <div>baseDatabase <span class="warning">*required</span></div>
diff --git a/web/src/main/resources/html/project/list.vm b/web/src/main/resources/html/project/list.vm
@@ -18,6 +18,7 @@
             <td>host</td>
             <td>port</td>
             <td>charset</td>
+            <td>dbType</td>
             <td>baseDatabase</td>
             <td>compareDatabase</td>
             <td>presetIdCount</td>
@@ -37,6 +38,7 @@
                 <td>${record.get("host")}</td>
                 <td>${record.get("port")}</td>
                 <td>${record.get("charset")}</td>
+                <td>${record.get("dbType")}</td>
                 <td>${record.get("baseDatabase")}</td>
                 <td>${record.get("compareDatabase")}</td>
                 <td>${record.get("presetIdCount")}</td>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-magentadesk for cli - Get MariaDB Table Difference, And Reflect.`
	`1`	`+magentadesk for cli - Get MariaDB / MySQL Table Difference, And Reflect.`
`2`	`2`
`3`	`3`	`Usage:`
`4`	`4`	`echo '${json}' \`