From 68a968a94c49c41a584ed050b3456384fb3646e6 Mon Sep 17 00:00:00 2001
From: imhao183 <wildfirechat86@gmail.com>
Date: Thu, 9 Jul 2020 16:45:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=88=97=E5=90=8D=E4=B8=8E=E6=9F=90?=
 =?UTF-8?q?=E4=BA=9B=E6=95=B0=E6=8D=AE=E5=BA=93=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 broker/migrate/h2/V32__alter_setting_column_name.sql      | 2 ++
 broker/migrate/mysql/V37__alter_setting_column_name.sql   | 2 ++
 .../main/java/io/moquette/persistence/DatabaseStore.java  | 8 ++++----
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100755 broker/migrate/h2/V32__alter_setting_column_name.sql
 create mode 100755 broker/migrate/mysql/V37__alter_setting_column_name.sql

diff --git a/broker/migrate/h2/V32__alter_setting_column_name.sql b/broker/migrate/h2/V32__alter_setting_column_name.sql
new file mode 100755
index 00000000..71b04ba1
--- /dev/null
+++ b/broker/migrate/h2/V32__alter_setting_column_name.sql
@@ -0,0 +1,2 @@
+alter table `t_settings` change column `value` `_value` varchar(64) NOT NULL;
+alter table `t_settings` change column `desc` `_desc` varchar(64) NOT NULL;
diff --git a/broker/migrate/mysql/V37__alter_setting_column_name.sql b/broker/migrate/mysql/V37__alter_setting_column_name.sql
new file mode 100755
index 00000000..71b04ba1
--- /dev/null
+++ b/broker/migrate/mysql/V37__alter_setting_column_name.sql
@@ -0,0 +1,2 @@
+alter table `t_settings` change column `value` `_value` varchar(64) NOT NULL;
+alter table `t_settings` change column `desc` `_desc` varchar(64) NOT NULL;
diff --git a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
index eb25f4ee..2c310c8c 100644
--- a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
+++ b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
@@ -86,10 +86,10 @@ public class DatabaseStore {
         try {
             connection = DBUtil.getConnection();
             String sql = "insert into t_settings " +
-                " (`id`, `value`, `desc`) values(?, ?, ?)" +
+                " (`id`, `_value`, `_desc`) values(?, ?, ?)" +
                 " ON DUPLICATE KEY UPDATE " +
-                "`value` = ?," +
-                "`desc` = ?";
+                "`_value` = ?," +
+                "`_desc` = ?";
 
 
             statement = connection.prepareStatement(sql);
@@ -120,7 +120,7 @@ public class DatabaseStore {
 
         try {
             connection = DBUtil.getConnection();
-            String sql = "select `value`, `desc` from t_settings where `id` = ?";
+            String sql = "select `_value`, `_desc` from t_settings where `id` = ?";
 
             statement = connection.prepareStatement(sql);
             int index = 1;