From 86b9cfe4c10ba83155753f49bbbf047cf0bd43d6 Mon Sep 17 00:00:00 2001
From: Fenny <25108519+Fenny@users.noreply.github.com>
Date: Thu, 5 Nov 2020 06:08:05 +0100
Subject: [PATCH] remove close method

---
 memcache/memcache.go |  5 -----
 memory/memory.go     |  5 -----
 mongodb/mongodb.go   |  5 -----
 mysql/mysql.go       | 10 +++-------
 postgres/postgres.go |  5 -----
 redis/redis.go       |  5 -----
 sqlite3/sqlite3.go   |  5 -----
 7 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/memcache/memcache.go b/memcache/memcache.go
index f1cc8137..cab3a5b0 100644
--- a/memcache/memcache.go
+++ b/memcache/memcache.go
@@ -98,11 +98,6 @@ func (s *Storage) Clear() error {
 	return s.db.DeleteAll()
 }
 
-// Close the storage
-func (s *Storage) Close() error {
-	return nil
-}
-
 // Acquire item from pool
 func (s *Storage) acquireItem() *mc.Item {
 	return s.items.Get().(*mc.Item)
diff --git a/memory/memory.go b/memory/memory.go
index 759c2bcb..86bfe1b2 100644
--- a/memory/memory.go
+++ b/memory/memory.go
@@ -83,11 +83,6 @@ func (s *Storage) Clear() error {
 	return nil
 }
 
-// Close the storage
-func (s *Storage) Close() error {
-	return nil
-}
-
 func (s *Storage) gc() {
 	for t := range time.NewTicker(s.gcInterval).C {
 		now := t.Unix()
diff --git a/mongodb/mongodb.go b/mongodb/mongodb.go
index 5faca20a..4312772a 100644
--- a/mongodb/mongodb.go
+++ b/mongodb/mongodb.go
@@ -157,11 +157,6 @@ func (s *Storage) Clear() error {
 	return s.col.Drop(context.Background())
 }
 
-// Close database connection
-func (s *Storage) Close() error {
-	return s.db.Client().Disconnect(context.Background())
-}
-
 // Acquire item from pool
 func (s *Storage) acquireItem() *item {
 	return s.items.Get().(*item)
diff --git a/mysql/mysql.go b/mysql/mysql.go
index 42670f58..75e43502 100644
--- a/mysql/mysql.go
+++ b/mysql/mysql.go
@@ -76,7 +76,7 @@ func New(config ...Config) *Storage {
 		gcInterval: cfg.GCInterval,
 		db:         db,
 		sqlSelect:  fmt.Sprintf("SELECT data, exp FROM %s WHERE id=?;", cfg.Table),
-		sqlInsert:  fmt.Sprintf("INSERT INTO %s (id, data, exp) VALUES (?,?,?)", cfg.Table),
+		sqlInsert:  fmt.Sprintf("INSERT INTO %s (id, data, exp) VALUES (?,?,?) ON DUPLICATE KEY UPDATE data = ?, exp = ?", cfg.Table),
 		sqlDelete:  fmt.Sprintf("DELETE FROM %s WHERE id=?", cfg.Table),
 		sqlClear:   fmt.Sprintf("DELETE FROM %s;", cfg.Table),
 		sqlGC:      fmt.Sprintf("DELETE FROM %s WHERE exp <= ?", cfg.Table),
@@ -126,7 +126,8 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error {
 	if exp != 0 {
 		expSeconds = time.Now().Add(exp).Unix()
 	}
-	_, err := s.db.Exec(s.sqlInsert, key, utils.UnsafeString(val), expSeconds)
+	valStr := utils.UnsafeString(val)
+	_, err := s.db.Exec(s.sqlInsert, key, valStr, expSeconds, valStr, expSeconds)
 	return err
 }
 
@@ -142,11 +143,6 @@ func (s *Storage) Clear() error {
 	return err
 }
 
-// Close the storage
-func (s *Storage) Close() error {
-	return s.db.Close()
-}
-
 // Garbage collector to delete expired keys
 func (s *Storage) gc() {
 	tick := time.NewTicker(s.gcInterval)
diff --git a/postgres/postgres.go b/postgres/postgres.go
index 8c971d8a..abbb8d17 100644
--- a/postgres/postgres.go
+++ b/postgres/postgres.go
@@ -158,11 +158,6 @@ func (s *Storage) Clear() error {
 	return err
 }
 
-// Close the storage
-func (s *Storage) Close() error {
-	return s.db.Close()
-}
-
 // GC deletes all expired entries
 func (s *Storage) gc() {
 	tick := time.NewTicker(s.gcInterval)
diff --git a/redis/redis.go b/redis/redis.go
index 81cedaad..86497adb 100644
--- a/redis/redis.go
+++ b/redis/redis.go
@@ -75,8 +75,3 @@ func (s *Storage) Delete(key string) error {
 func (s *Storage) Clear() error {
 	return s.db.FlushDB(context.Background()).Err()
 }
-
-// Close the storage
-func (s *Storage) Close() error {
-	return s.db.Close()
-}
diff --git a/sqlite3/sqlite3.go b/sqlite3/sqlite3.go
index 8422d276..c31f0162 100644
--- a/sqlite3/sqlite3.go
+++ b/sqlite3/sqlite3.go
@@ -141,11 +141,6 @@ func (s *Storage) Clear() error {
 	return err
 }
 
-// Close the storage
-func (s *Storage) Close() error {
-	return s.db.Close()
-}
-
 // GC deletes all expired entries
 func (s *Storage) gc() {
 	tick := time.NewTicker(s.gcInterval)