From 3f4304a3472ac2a33c32f2de43609ca52ddbfb03 Mon Sep 17 00:00:00 2001
From: Pavel Vaynerman <pv@etersoft.ru>
Date: Sat, 6 Jan 2024 19:37:36 +0300
Subject: [PATCH] (dbserver): cleanup code

---
 extensions/DBServer-MySQL/DBServer_MySQL.cc   |  3 +-
 .../DBServer_PostgreSQL.cc                    |  3 +-
 extensions/DBServer-SQLite/DBServer_SQLite.cc | 36 +------------------
 extensions/DBServer-SQLite/DBServer_SQLite.h  |  3 --
 4 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/extensions/DBServer-MySQL/DBServer_MySQL.cc b/extensions/DBServer-MySQL/DBServer_MySQL.cc
index 86f043558..d49ad875e 100644
--- a/extensions/DBServer-MySQL/DBServer_MySQL.cc
+++ b/extensions/DBServer-MySQL/DBServer_MySQL.cc
@@ -402,8 +402,7 @@ std::shared_ptr<DBServer_MySQL> DBServer_MySQL::init_dbserver( int argc, const c
 
     if( !name.empty() )
     {
-        ObjectId ID = conf->getServiceID(name);
-
+        ID = conf->getServiceID(name);
         if( ID == uniset3::DefaultObjectId )
         {
             cerr << "(DBServer_MySQL): Unknown ServiceID for '" << name << endl;
diff --git a/extensions/DBServer-PostgreSQL/DBServer_PostgreSQL.cc b/extensions/DBServer-PostgreSQL/DBServer_PostgreSQL.cc
index dc0a4c2a9..abb4e0130 100644
--- a/extensions/DBServer-PostgreSQL/DBServer_PostgreSQL.cc
+++ b/extensions/DBServer-PostgreSQL/DBServer_PostgreSQL.cc
@@ -489,8 +489,7 @@ std::shared_ptr<DBServer_PostgreSQL> DBServer_PostgreSQL::init_dbserver( int arg
 
     if( !name.empty() )
     {
-        ObjectId ID = conf->getServiceID(name);
-
+        ID = conf->getServiceID(name);
         if( ID == uniset3::DefaultObjectId )
         {
             cerr << "(DBServer_PostgreSQL): Unknown ServiceID for '" << name << endl;
diff --git a/extensions/DBServer-SQLite/DBServer_SQLite.cc b/extensions/DBServer-SQLite/DBServer_SQLite.cc
index 0bce4804c..f5a9db4d7 100644
--- a/extensions/DBServer-SQLite/DBServer_SQLite.cc
+++ b/extensions/DBServer-SQLite/DBServer_SQLite.cc
@@ -19,16 +19,11 @@
  *  \author Pavel Vainerman
 */
 // --------------------------------------------------------------------------
-#include <sys/time.h>
 #include <sstream>
-#include <iomanip>
 #include <cmath>
 
 #include "unisetstd.h"
 #include "DBServer_SQLite.h"
-#include "Configuration.h"
-#include "Debug.h"
-#include "UniXML.h"
 #include "DBLogSugar.h"
 // --------------------------------------------------------------------------
 using namespace uniset3;
@@ -306,40 +301,11 @@ void DBServer_SQLite::initDBServer()
         connect_ok = true;
         askTimer(DBServer_SQLite::ReconnectTimer, 0);
         askTimer(DBServer_SQLite::PingTimer, PingTime);
-        //        createTables(db);
         initDB(db);
         flushBuffer();
     }
 }
 //--------------------------------------------------------------------------------------------
-void DBServer_SQLite::createTables( SQLiteInterface* db )
-{
-    auto conf = uniset_conf();
-    UniXML::iterator it( conf->getNode("Tables") );
-
-    if(!it)
-    {
-        dbcrit << myname << ": section <Tables> not found.." << endl;
-        throw Exception();
-    }
-
-    if( !it.goChildren() )
-        return;
-
-    for( ; it; it.goNext() )
-    {
-        if( it.getName() != "comment" )
-        {
-            dbinfo <<  myname  << "(createTables): create " << it.getName() << endl;
-            ostringstream query;
-            query << "CREATE TABLE " << conf->getProp(it, "name") << "(" << conf->getProp(it, "create") << ")";
-
-            if( !db->query(query.str()) )
-                dbcrit << myname << "(createTables): error: \t\t" << db->error() << endl;
-        }
-    }
-}
-//--------------------------------------------------------------------------------------------
 void DBServer_SQLite::timerInfo( const uniset3::umessage::TimerMessage* tm )
 {
     DBServer::timerInfo(tm);
@@ -402,7 +368,7 @@ std::shared_ptr<DBServer_SQLite> DBServer_SQLite::init_dbserver( int argc, const
 
     if( !name.empty() )
     {
-        ObjectId ID = conf->getServiceID(name);
+        ID = conf->getServiceID(name);
 
         if( ID == uniset3::DefaultObjectId )
         {
diff --git a/extensions/DBServer-SQLite/DBServer_SQLite.h b/extensions/DBServer-SQLite/DBServer_SQLite.h
index 9c9f409fa..1f3389e03 100644
--- a/extensions/DBServer-SQLite/DBServer_SQLite.h
+++ b/extensions/DBServer-SQLite/DBServer_SQLite.h
@@ -173,8 +173,6 @@ namespace uniset3
             }
 
         protected:
-            typedef std::unordered_map<int, std::string> DBTableMap;
-
             virtual void initDBServer() override;
             virtual void initDB( const std::unique_ptr<SQLiteInterface>& db ) {};
 
@@ -186,7 +184,6 @@ namespace uniset3
             virtual std::string getMonitInfo( const std::string& params ) override;
 
             bool writeToBase( const std::string& query );
-            void createTables( SQLiteInterface* db );
 
             enum Timers
             {