version 0.1.15

[fms.git] / src / db / sqlite3recordset.cpp

diff --git a/src/db/sqlite3recordset.cpp b/src/db/sqlite3recordset.cpp
index e9cdf5f..137f7b3 100644 (file)
--- a/src/db/sqlite3recordset.cpp
+++ b/src/db/sqlite3recordset.cpp
@@ -40,6 +40,18 @@ const char *Recordset::Get(const int row, const int field)
        }\r
 }\r
 \r
+const char *Recordset::GetColumnName(const int column)\r
+{\r
+       if(column>=0 && column<m_cols)\r
+       {\r
+               return m_rs[column];\r
+       }\r
+       else\r
+       {\r
+               return NULL;\r
+       }\r
+}\r
+\r
 const double Recordset::GetDouble(const int field)\r
 {\r
        const char *result=GetField(field);\r
@@ -76,7 +88,8 @@ void Recordset::Open(const std::string &sql, DB *db)
        Free();\r
        m_currentrow=0;\r
 \r
-       ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+       //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+       PThread::Guard g(DB::Instance()->m_mutex);\r
        if(sqlite3_get_table(db->GetDB(),sql.c_str(),&m_rs,&m_rows,&m_cols,NULL)==SQLITE_OK)\r
        {\r
        }\r