X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fdb%2Fsqlite3statement.cpp;h=789afb1e9e94e72c2da8b5065fb2bb058745c7e5;hb=dec33c63afafabf83c3039e916725cac6faef9b3;hp=683e771fd1b6779cfe516ecdf61e40c46fb5caef;hpb=b9c3763a932cebaa015a27fe111017f6f34dfbaa;p=fms.git

diff --git a/src/db/sqlite3statement.cpp b/src/db/sqlite3statement.cpp
index 683e771..789afb1 100644
--- a/src/db/sqlite3statement.cpp
+++ b/src/db/sqlite3statement.cpp
@@ -65,7 +65,7 @@ const bool Statement::Bind(const int column)
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
 		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_null(m_statement,column+1)==SQLITE_OK)
 		{
 			return true;
@@ -86,7 +86,7 @@ const bool Statement::Bind(const int column, const int value)
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
 		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_int(m_statement,column+1,value)==SQLITE_OK)
 		{
 			return true;
@@ -107,7 +107,7 @@ const bool Statement::Bind(const int column, const double value)
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
 		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_double(m_statement,column+1,value)==SQLITE_OK)
 		{
 			return true;
@@ -127,16 +127,8 @@ const bool Statement::Bind(const int column, const std::string &value)
 {
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
-		//char *text=new char[value.size()+1];
-		//strncpy(text,value.c_str(),value.size());
-		//text[value.size()]=NULL;
-		//textptrs.push_back(text);
-		
 		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
-		//m_boundtext.push_back(std::vector<char>(value.begin(),value.end()));
-		//if(sqlite3_bind_text(m_statement,column+1,text,value.size(),NULL)==SQLITE_OK)
-		//if(sqlite3_bind_text(m_statement,column+1,&(m_boundtext[m_boundtext.size()-1][0]),(m_boundtext[m_boundtext.size()-1]).size(),NULL)==SQLITE_OK)		
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_text(m_statement,column+1,value.c_str(),value.size(),SQLITE_TRANSIENT)==SQLITE_OK)
 		{
 			return true;
@@ -157,7 +149,7 @@ const bool Statement::Bind(const int column, const void *data, const int length)
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
 		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_blob(m_statement,column+1,data,length,SQLITE_TRANSIENT)==SQLITE_OK)
 		{
 			return true;
@@ -177,8 +169,7 @@ void Statement::Finalize()
 {
 	if(m_statement)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
 		m_statementcount[m_statement]--;
 		if(m_statementcount[m_statement]<=0)
 		{
@@ -202,8 +193,7 @@ Statement &Statement::operator=(const Statement &rhs)
 
 		if(m_statement)
 		{
-			//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-			PThread::Guard g(DB::Instance()->m_mutex);
+			Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
 			m_statementcount[m_statement]++;
 		}
 	}
@@ -214,8 +204,7 @@ const bool Statement::Reset()
 {
 	if(Valid())
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
 		if(sqlite3_reset(m_statement)==SQLITE_OK)
 		{
 			return true;
@@ -235,10 +224,24 @@ const bool Statement::ResultBlob(const int column, void *data, int &length)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
-		data=(void *)sqlite3_column_blob(m_statement,column);
-		length=sqlite3_column_bytes(m_statement,column);
+		int bloblength=sqlite3_column_bytes(m_statement,column);
+		if(bloblength>length)
+		{
+			bloblength=length;
+		}
+		if(bloblength<length)
+		{
+			length=bloblength;
+		}
+		const void *blobptr=sqlite3_column_blob(m_statement,column);
+		if(blobptr)
+		{
+			std::copy((unsigned char *)blobptr,(unsigned char *)blobptr+bloblength,(unsigned char *)data);
+		}
+		else
+		{
+			length=0;
+		}
 		return true;
 	}
 	else
@@ -251,8 +254,6 @@ const bool Statement::ResultDouble(const int column, double &result)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
 		result=sqlite3_column_double(m_statement,column);
 		return true;
 	}
@@ -266,8 +267,6 @@ const bool Statement::ResultInt(const int column, int &result)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
 		result=sqlite3_column_int(m_statement,column);
 		return true;
 	}
@@ -281,8 +280,6 @@ const bool Statement::ResultNull(const int column)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_column_type(m_statement,column)==SQLITE_NULL)
 		{
 			return true;
@@ -302,8 +299,6 @@ const bool Statement::ResultText(const int column, std::string &result)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
 		const unsigned char *cresult=sqlite3_column_text(m_statement,column);
 		if(cresult)
 		{
@@ -326,8 +321,7 @@ const bool Statement::Step(const bool saveinsertrowid)
 	m_rowreturned=false;
 	if(Valid())
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
 		int result=sqlite3_step(m_statement);
 		if(result==SQLITE_OK || result==SQLITE_ROW || result==SQLITE_DONE)
 		{
@@ -354,8 +348,7 @@ const bool Statement::Step(const bool saveinsertrowid)
 
 const bool Statement::Valid()
 {
-	//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-	PThread::Guard g(DB::Instance()->m_mutex);
+	Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
 	return m_statement ? true : false ;
 }