bug fix: db error when deleting multiple ranges

mistygg · Jul 3, 2018 · cb64da9 · cb64da9
1 parent 1b76314
commit cb64da9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -100,3 +100,7 @@ A text-only [command line client](./tn-cli) implements every possible command.
 <p align="center">
   <kbd><img src="docs/web-mob-contacts-1.png" alt="Mobile web: contacts" width=323 /></kbd> <kbd><img src="docs/web-mob-chat-1.png" alt="Mobile web: chat" width=323 /></kbd> <kbd><img src="docs/web-mob-info-1.png" alt="Mobile web: topic info" width=323 /></kbd> <kbd><img src="docs/web-mob-new-chat-1.png" alt="Mobile web: start new 1:1 chat" width=323 /></kbd>
 </p>
+
+# SEO Strings (word 'chat' in Chinese, Russian, and Persian)
+
+聊天室 чат گپ
diff --git a/server/db/mysql/adapter.go b/server/db/mysql/adapter.go
@@ -350,7 +350,7 @@ func (a *adapter) CreateDb(reset bool) error {
 			hi			INT NOT NULL,
 			PRIMARY KEY(id),
 			FOREIGN KEY(topic) REFERENCES topics(name),
-			UNIQUE INDEX dellog_topic_delid_deletedfor(topic,delid,deletedfor),
+			INDEX dellog_topic_delid_deletedfor(topic,delid,deletedfor),
 			INDEX dellog_topic_deletedfor_low_hi(topic,deletedfor,low,hi),
 			INDEX dellog_deletedfor(deletedfor)
 		);`); err != nil {

diff --git a/server/db/mysql/schema.sql b/server/db/mysql/schema.sql
@@ -153,7 +153,7 @@ CREATE TABLE dellog(
 	PRIMARY KEY(id),
 	FOREIGN KEY(topic) REFERENCES topics(name),
 	# For getting the list of deleted message ranges
-	UNIQUE INDEX dellog_topic_delid_deletedfor(topic,delid,deletedfor),
+	INDEX dellog_topic_delid_deletedfor(topic,delid,deletedfor),
 	# Used when getting not-yet-deleted messages(messages LEFT JOIN dellog)
 	INDEX dellog_topic_deletedfor_low_hi(topic,deletedfor,low,hi), 
 	# Used when deleting a user

diff --git a/server/topic.go b/server/topic.go
@@ -1862,12 +1862,6 @@ func (t *Topic) replyDelMsg(sess *Session, del *MsgClientDel) error {
 
 	var err error
 
-	defer func() {
-		if err != nil {
-			log.Println("failed to delete message(s):", err)
-		}
-	}()
-
 	var ranges []types.Range
 	if len(del.DelSeq) == 0 {
 		err = errors.New("del.msg: no IDs to delete")

diff --git a/tinode-db/gendb.go b/tinode-db/gendb.go
@@ -30,7 +30,7 @@ func genDb(reset bool, dbSource string, data *Data) {
 			log.Fatal("Failed to init DB: ", err)
 		}
 	} else {
-		log.Println("DB successfully initialized")
+		log.Println("Successfully initialized", store.GetAdapterName())
 
 	}
 	if data.Users == nil {