X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1347f3d1e04bedd1508589173f577673ee2c5554..18cb23396ddc4f9f7759cb76a1dbfbc1d659e81b:/projects/stargazer/plugins/store/firebird/firebird_store.cpp

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store.cpp b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
index 9cc7c304..f9a2f78e 100644
--- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
@@ -26,13 +26,13 @@
  *
  */
 
-#include <string>
-#include <vector>
-#include <algorithm>
+#include "firebird_store.h"
 
 #include "stg/ibpp.h"
 #include "stg/plugin_creator.h"
-#include "firebird_store.h"
+
+#include <string>
+#include <vector>
 
 namespace
 {
@@ -50,16 +50,13 @@ return frsc.GetPlugin();
 //-----------------------------------------------------------------------------
 FIREBIRD_STORE::FIREBIRD_STORE()
     : version("firebird_store v.1.4"),
-      strError(),
       db_server("localhost"),
       db_database("/var/stg/stargazer.fdb"),
       db_user("stg"),
       db_password("123456"),
-      settings(),
-      db(),
-      mutex(),
       til(IBPP::ilConcurrency),
       tlr(IBPP::lrWait),
+      schemaVersion(0),
       logger(GetPluginLogger(GetStgLogger(), "store_firebird"))
 {
 pthread_mutex_init(&mutex, NULL);
@@ -77,56 +74,42 @@ std::string s;
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
-    s = i->param;
-    std::transform(s.begin(), s.end(), s.begin(), ToLower());
+    if (i->value.empty())
+        continue;
+    s = ToLower(i->param);
+
     if (s == "server")
-        {
-        db_server = *(i->value.begin());
-        }
+        db_server = i->value.front();
+
     if (s == "database")
-        {
-        db_database = *(i->value.begin());
-        }
+        db_database = i->value.front();
+
     if (s == "user")
-        {
-        db_user = *(i->value.begin());
-        }
+        db_user = i->value.front();
+
     if (s == "password")
-        {
-        db_password = *(i->value.begin());
-        }
+        db_password = i->value.front();
 
     // Advanced settings block
 
     if (s == "isolationLevel")
         {
-        if (*(i->value.begin()) == "Concurrency")
-            {
+        if (i->value.front() == "Concurrency")
             til = IBPP::ilConcurrency;
-            }
-        else if (*(i->value.begin()) == "DirtyRead")
-            {
+        else if (i->value.front() == "DirtyRead")
             til = IBPP::ilReadDirty;
-            }
-        else if (*(i->value.begin()) == "ReadCommitted")
-            {
+        else if (i->value.front() == "ReadCommitted")
             til = IBPP::ilReadCommitted;
-            }
-        else if (*(i->value.begin()) == "Consistency")
-            {
+        else if (i->value.front() == "Consistency")
             til = IBPP::ilConsistency;
-            }
         }
+
     if (s == "lockResolution")
         {
-        if (*(i->value.begin()) == "Wait")
-            {
+        if (i->value.front() == "Wait")
             tlr = IBPP::lrWait;
-            }
-        else if (*(i->value.begin()) == "NoWait")
-            {
+        else if (i->value.front() == "NoWait")
             tlr = IBPP::lrNoWait;
-            }
         }
     }
 
@@ -134,6 +117,7 @@ try
     {
     db = IBPP::DatabaseFactory(db_server, db_database, db_user, db_password, "", "KOI8U", "");
     db->Connect();
+    return CheckVersion();
     }
 catch (IBPP::Exception & ex)
     {
@@ -145,3 +129,37 @@ catch (IBPP::Exception & ex)
 return 0;
 }
 //-----------------------------------------------------------------------------
+int FIREBIRD_STORE::CheckVersion()
+{
+IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amRead, til, tlr);
+IBPP::Statement st = IBPP::StatementFactory(db, tr);
+
+try
+    {
+    tr->Start();
+    st->Execute("SELECT RDB$RELATION_NAME FROM RDB$RELATIONS WHERE RDB$SYSTEM_FLAG=0 AND RDB$RELATION_NAME = 'TB_INFO'");
+    if (!st->Fetch())
+        {
+        schemaVersion = 0;
+        }
+    else
+        {
+        st->Execute("SELECT version FROM tb_info");
+        while (st->Fetch())
+            st->Get(1, schemaVersion);
+        }
+    tr->Commit();
+    logger("FIREBIRD_STORE: Current DB schema version: %d", schemaVersion);
+    }
+
+catch (IBPP::Exception & ex)
+    {
+    tr->Rollback();
+    strError = "IBPP exception";
+    printfd(__FILE__, ex.what());
+    return -1;
+    }
+
+return 0;
+}
+//-----------------------------------------------------------------------------