From 32f7266a5ff79208c2e1e5fb0b4f7cfc0c0354d0 Mon Sep 17 00:00:00 2001
From: fengyun <wildfirechat86@gmail.com>
Date: Sat, 30 Nov 2019 12:50:27 +0800
Subject: [PATCH] add deleted property

---
 broker/migrate/h2/V21__user_add_deleted.sql                 | 1 +
 broker/migrate/mysql/V26__user_add_deleted.sql              | 1 +
 .../main/java/io/moquette/persistence/DatabaseStore.java    | 6 ++++++
 3 files changed, 8 insertions(+)
 create mode 100755 broker/migrate/h2/V21__user_add_deleted.sql
 create mode 100755 broker/migrate/mysql/V26__user_add_deleted.sql

diff --git a/broker/migrate/h2/V21__user_add_deleted.sql b/broker/migrate/h2/V21__user_add_deleted.sql
new file mode 100755
index 00000000..0008dac0
--- /dev/null
+++ b/broker/migrate/h2/V21__user_add_deleted.sql
@@ -0,0 +1 @@
+alter table `t_user` add column `_deleted` tinyint DEFAULT 0;
diff --git a/broker/migrate/mysql/V26__user_add_deleted.sql b/broker/migrate/mysql/V26__user_add_deleted.sql
new file mode 100755
index 00000000..0008dac0
--- /dev/null
+++ b/broker/migrate/mysql/V26__user_add_deleted.sql
@@ -0,0 +1 @@
+alter table `t_user` add column `_deleted` tinyint DEFAULT 0;
diff --git a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
index 849c38ed..b123d7e2 100644
--- a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
+++ b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
@@ -2135,6 +2135,7 @@ public class DatabaseStore {
                     ", `_social`=?" +
                     ", `_extra`=?" +
                     ", `_type`=?" +
+                    ", `_deleted`=?" +
                     ", `_dt`=?";
 
                 statement = connection.prepareStatement(sql);
@@ -2168,6 +2169,7 @@ public class DatabaseStore {
 
                 statement.setString(index++, user.getExtra());
                 statement.setInt(index++, user.getType());
+                statement.setInt(index++, user.getDeleted());
                 statement.setLong(index++, user.getUpdateDt() == 0 ? System.currentTimeMillis() : user.getUpdateDt());
 
                 int count = statement.executeUpdate();
@@ -2294,6 +2296,7 @@ public class DatabaseStore {
                 ", `_social`" +
                 ", `_extra`" +
                 ", `_type`" +
+                ", `_deleted`" +
                 ", `_dt` from t_user where `_uid` = ?";
             statement = connection.prepareStatement(sql);
 
@@ -2348,6 +2351,9 @@ public class DatabaseStore {
                 int type = rs.getInt(index++);
                 builder.setType(type);
 
+                int deleted = rs.getInt(index++);
+                builder.setDeleted(deleted);
+
                 long longValue = rs.getLong(index++);
                 builder.setUpdateDt(longValue);