From: Florian Weber <oss@florianjw.de>
Date: Sat, 6 Jun 2015 01:39:55 +0000 (+0200)
Subject: chg: remove useless destructor and simplify connect-method
X-Git-Url: https://code.wpia.club/?p=cassiopeia.git;a=commitdiff_plain;h=d0e722eb9411ed6fafaf622199efea280a903493

chg: remove useless destructor and simplify connect-method
---

diff --git a/src/db/mysql.cpp b/src/db/mysql.cpp
index 304d496..1883488 100644
--- a/src/db/mysql.cpp
+++ b/src/db/mysql.cpp
@@ -36,19 +36,8 @@ MySQLJobProvider::MySQLJobProvider( const std::string& server, const std::string
     connect( server, user, password, database );
 }
 
-MySQLJobProvider::~MySQLJobProvider() {
-    disconnect();
-}
-
 bool MySQLJobProvider::connect( const std::string& server, const std::string& user, const std::string& password, const std::string& database ) {
-    if( conn ) {
-        if( !disconnect() ) {
-            return false;
-        }
-
-        conn.reset();
-    }
-
+    disconnect();
     conn = _connect( server, user, password, database );
 
     return !!conn;
diff --git a/src/db/mysql.h b/src/db/mysql.h
index a6b6a36..5559244 100644
--- a/src/db/mysql.h
+++ b/src/db/mysql.h
@@ -19,7 +19,6 @@ private:
 
 public:
     MySQLJobProvider( const std::string& server, const std::string& user, const std::string& password, const std::string& database );
-    ~MySQLJobProvider();
 
 public:
     bool connect( const std::string& server, const std::string& user, const std::string& password, const std::string& database );