Fixed problem running plugin in non-debug mode.

[stg.git] / 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 7e57483e24c349a380722fbbe54236797577cfa9..811601146f8ca7ee18ea414a1e6e80fd5a860be2 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
@@ -33,9 +33,6 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include <algorithm>
-
-#include <cctype>

 
 namespace
 {
 
 namespace
 {


@@ -63,6 +60,7 @@ FIREBIRD_STORE::FIREBIRD_STORE()
       mutex(),
       til(IBPP::ilConcurrency),
       tlr(IBPP::lrWait),
       mutex(),
       til(IBPP::ilConcurrency),
       tlr(IBPP::lrWait),

+      schemaVersion(0),

       logger(GetPluginLogger(GetStgLogger(), "store_firebird"))
 {
 pthread_mutex_init(&mutex, NULL);
       logger(GetPluginLogger(GetStgLogger(), "store_firebird"))
 {
 pthread_mutex_init(&mutex, NULL);


@@ -80,9 +78,7 @@ std::string s;
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {

-    s = i->param;
-
-    std::transform(s.begin(), s.end(), s.begin(), ::tolower);
+    s = ToLower(i->param);

 
     if (s == "server")
         db_server = *(i->value.begin());
 
     if (s == "server")
         db_server = *(i->value.begin());


@@ -123,9 +119,44 @@ try
     {
     db = IBPP::DatabaseFactory(db_server, db_database, db_user, db_password, "", "KOI8U", "");
     db->Connect();
     {
     db = IBPP::DatabaseFactory(db_server, db_database, db_user, db_password, "", "KOI8U", "");
     db->Connect();

+    return CheckVersion();
+    }
+catch (IBPP::Exception & ex)
+    {
+    strError = "IBPP exception";
+    printfd(__FILE__, ex.what());
+    return -1;
+    }
+
+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)
     {
 catch (IBPP::Exception & ex)
     {

+    tr->Rollback();

     strError = "IBPP exception";
     printfd(__FILE__, ex.what());
     return -1;
     strError = "IBPP exception";
     printfd(__FILE__, ex.what());
     return -1;