Remove extra debug.

[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 64306acf9d5957878864ce23190e21a74e2a807c..c11b442be93e390e37a31fafa9dc1a7eb351fd70 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
@@ -26,52 +26,33 @@
  *
  */
 
  *
  */
 

-#include <string>
-#include <vector>
-#include <algorithm>
-
-using namespace std;
-

 #include "firebird_store.h"
 #include "firebird_store.h"

-#include "ibpp.h"

 
 

-class FIREBIRD_STORE_CREATOR
-{
-public:
-    FIREBIRD_STORE_CREATOR()
-        : frb(new FIREBIRD_STORE())
-        {
-        };
-    ~FIREBIRD_STORE_CREATOR()
-        {
-        delete frb;
-        };
-    FIREBIRD_STORE * GetStore() { return frb; };
-private:
-    FIREBIRD_STORE * frb;
-} frsc;
+#include "stg/common.h"

 
 

-//-----------------------------------------------------------------------------
-STORE * GetStore()
+#include <string>
+#include <vector>
+
+extern "C" STG::Store* GetStore()

 {
 {

-return frsc.GetStore();
+    static FIREBIRD_STORE plugin;
+    return &plugin;

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 FIREBIRD_STORE::FIREBIRD_STORE()
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 FIREBIRD_STORE::FIREBIRD_STORE()

+    : version("firebird_store v.1.4"),
+      db_server("localhost"),
+      db_database("/var/stg/stargazer.fdb"),
+      db_user("stg"),
+      db_password("123456"),
+      til(IBPP::ilConcurrency),
+      tlr(IBPP::lrWait),
+      schemaVersion(0),
+      logger(STG::PluginLogger::get("store_firebird"))

 {
 {

-db_server = "localhost";
-db_database = "/var/stg/stargazer.fdb";
-db_user = "stg";
-db_password = "123456";
-version = "firebird_store v.1.4";

 pthread_mutex_init(&mutex, NULL);
 pthread_mutex_init(&mutex, NULL);

-
-// Advanced settings defaults
-
-til = IBPP::ilConcurrency;
-tlr = IBPP::lrWait;

 }
 //-----------------------------------------------------------------------------
 FIREBIRD_STORE::~FIREBIRD_STORE()
 }
 //-----------------------------------------------------------------------------
 FIREBIRD_STORE::~FIREBIRD_STORE()


@@ -81,61 +62,47 @@ db->Disconnect();
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::ParseSettings()
 {
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::ParseSettings()
 {

-vector<PARAM_VALUE>::iterator i;
-string s;
+std::vector<STG::ParamValue>::iterator i;
+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;
-    transform(s.begin(), s.end(), s.begin(), ToLower());
+    if (i->value.empty())
+        continue;
+    s = ToLower(i->param);
+

     if (s == "server")
     if (s == "server")

-        {
-        db_server = *(i->value.begin());
-        }
+        db_server = i->value.front();
+

     if (s == "database")
     if (s == "database")

-        {
-        db_database = *(i->value.begin());
-        }
+        db_database = i->value.front();
+

     if (s == "user")
     if (s == "user")

-        {
-        db_user = *(i->value.begin());
-        }
+        db_user = i->value.front();
+

     if (s == "password")
     if (s == "password")

-        {
-        db_password = *(i->value.begin());
-        }
+        db_password = i->value.front();

 
     // Advanced settings block
 
     if (s == "isolationLevel")
         {
 
     // Advanced settings block
 
     if (s == "isolationLevel")
         {

-        if (*(i->value.begin()) == "Concurrency")
-            {
+        if (i->value.front() == "Concurrency")

             til = IBPP::ilConcurrency;
             til = IBPP::ilConcurrency;

-            }
-        else if (*(i->value.begin()) == "DirtyRead")
-            {
+        else if (i->value.front() == "DirtyRead")

             til = IBPP::ilReadDirty;
             til = IBPP::ilReadDirty;

-            }
-        else if (*(i->value.begin()) == "ReadCommitted")
-            {
+        else if (i->value.front() == "ReadCommitted")

             til = IBPP::ilReadCommitted;
             til = IBPP::ilReadCommitted;

-            }
-        else if (*(i->value.begin()) == "Consistency")
-            {
+        else if (i->value.front() == "Consistency")

             til = IBPP::ilConsistency;
             til = IBPP::ilConsistency;

-            }

         }
         }

+

     if (s == "lockResolution")
         {
     if (s == "lockResolution")
         {

-        if (*(i->value.begin()) == "Wait")
-            {
+        if (i->value.front() == "Wait")

             tlr = IBPP::lrWait;
             tlr = IBPP::lrWait;

-            }
-        else if (*(i->value.begin()) == "NoWait")
-            {
+        else if (i->value.front() == "NoWait")

             tlr = IBPP::lrNoWait;
             tlr = IBPP::lrNoWait;

-            }

         }
     }
 
         }
     }
 


@@ -143,9 +110,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;