Fixed processing of coma-separated lists.

[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 e5c7b0b16343ee2655b39f2a670bda0063f88a8a..37b5184f8aabedfc6c2b8dee2b0a2bd4d2342644 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
@@ -26,17 +26,23 @@
  *
  */
 
  *
  */
 

-#include <string>
-#include <vector>
-#include <algorithm>
+#include "firebird_store.h"

 
 #include "stg/ibpp.h"
 #include "stg/plugin_creator.h"
 
 #include "stg/ibpp.h"
 #include "stg/plugin_creator.h"

-#include "firebird_store.h"

 
 

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

 
 

+namespace
+{

 PLUGIN_CREATOR<FIREBIRD_STORE> frsc;
 PLUGIN_CREATOR<FIREBIRD_STORE> frsc;

+}
+
+extern "C" STORE * GetStore();

 //-----------------------------------------------------------------------------
 STORE * GetStore()
 {
 //-----------------------------------------------------------------------------
 STORE * GetStore()
 {


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

-vector<PARAM_VALUE>::iterator i;
-string s;
+std::vector<PARAM_VALUE>::iterator i;
+std::string s;

 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
     s = i->param;
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
     s = i->param;

-    transform(s.begin(), s.end(), s.begin(), ToLower());
+
+    std::transform(s.begin(), s.end(), s.begin(), ::tolower);
+

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

-        {

         db_server = *(i->value.begin());
         db_server = *(i->value.begin());

-        }
+

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

-        {

         db_database = *(i->value.begin());
         db_database = *(i->value.begin());

-        }
+

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

-        {

         db_user = *(i->value.begin());
         db_user = *(i->value.begin());

-        }
+

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

-        {

         db_password = *(i->value.begin());
         db_password = *(i->value.begin());

-        }

 
     // Advanced settings block
 
     if (s == "isolationLevel")
         {
         if (*(i->value.begin()) == "Concurrency")
 
     // Advanced settings block
 
     if (s == "isolationLevel")
         {
         if (*(i->value.begin()) == "Concurrency")

-            {

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

-            }

         else if (*(i->value.begin()) == "DirtyRead")
         else if (*(i->value.begin()) == "DirtyRead")

-            {

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

-            }

         else if (*(i->value.begin()) == "ReadCommitted")
         else if (*(i->value.begin()) == "ReadCommitted")

-            {

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

-            }

         else if (*(i->value.begin()) == "Consistency")
         else if (*(i->value.begin()) == "Consistency")

-            {

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

-            }

         }
         }

+

     if (s == "lockResolution")
         {
         if (*(i->value.begin()) == "Wait")
     if (s == "lockResolution")
         {
         if (*(i->value.begin()) == "Wait")

-            {

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

-            }

         else if (*(i->value.begin()) == "NoWait")
         else if (*(i->value.begin()) == "NoWait")

-            {

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

-            }

         }
     }
 
         }
     }
 


@@ -131,9 +123,46 @@ 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);
+
+std::string name;
+
+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;