X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fdb%2Fsqlite3statement.cpp;h=fea3d76849c968adbbee3fb8546e4eae4dad1e04;hb=63376b2a82c3f6cdf2df56b1f134bd7df0aaab3a;hp=39c699f1595fd00b03008cd527066b7a7b016edf;hpb=8adfd604a97d385869b0ce763b35d014d7aa2cca;p=fms.git

diff --git a/src/db/sqlite3statement.cpp b/src/db/sqlite3statement.cpp
index 39c699f..fea3d76 100644
--- a/src/db/sqlite3statement.cpp
+++ b/src/db/sqlite3statement.cpp
@@ -15,6 +15,7 @@ Statement::Statement()
 	m_parametercount=0;
 	m_resultcolumncount=0;
 	m_rowreturned=false;
+	m_lastinsertrowid=-1;
 }
 
 Statement::Statement(sqlite3_stmt *statement)
@@ -23,6 +24,7 @@ Statement::Statement(sqlite3_stmt *statement)
 	m_parametercount=sqlite3_bind_parameter_count(m_statement);
 	m_resultcolumncount=sqlite3_column_count(m_statement);
 	m_rowreturned=false;
+	m_lastinsertrowid=-1;
 	
 	if(m_statement)
 	{
@@ -36,6 +38,7 @@ Statement::Statement(const Statement &rhs)
 	m_parametercount=0;
 	m_resultcolumncount=0;
 	m_rowreturned=false;
+	m_lastinsertrowid=-1;
 	*this=rhs;
 }
 
@@ -44,6 +47,7 @@ Statement::~Statement()
 	
 	Finalize();
 	
+	/*
 	std::vector<char *>::iterator i;
 	for(i=textptrs.begin(); i!=textptrs.end(); i++)
 	{
@@ -52,13 +56,16 @@ Statement::~Statement()
 			delete [] (*i);
 		}
 	}
+	*/
+
 }
 
 const bool Statement::Bind(const int column)
 {
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_null(m_statement,column+1)==SQLITE_OK)
 		{
 			return true;
@@ -78,7 +85,8 @@ 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);
+		//ZThread::Guard<ZThread::Mutex> 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;
@@ -98,7 +106,8 @@ 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);
+		//ZThread::Guard<ZThread::Mutex> 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;
@@ -118,12 +127,9 @@ 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);
-		if(sqlite3_bind_text(m_statement,column+1,text,value.size(),NULL)==SQLITE_OK)
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//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;
 		}
@@ -142,8 +148,9 @@ 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);
-		if(sqlite3_bind_blob(m_statement,column+1,data,length,NULL)==SQLITE_OK)
+		//ZThread::Guard<ZThread::Mutex> 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;
 		}
@@ -162,7 +169,8 @@ void Statement::Finalize()
 {
 	if(m_statement)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		m_statementcount[m_statement]--;
 		if(m_statementcount[m_statement]<=0)
 		{
@@ -186,7 +194,8 @@ Statement &Statement::operator=(const Statement &rhs)
 
 		if(m_statement)
 		{
-			ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+			//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+			PThread::Guard g(DB::Instance()->m_mutex);
 			m_statementcount[m_statement]++;
 		}
 	}
@@ -197,7 +206,8 @@ const bool Statement::Reset()
 {
 	if(Valid())
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_reset(m_statement)==SQLITE_OK)
 		{
 			return true;
@@ -217,9 +227,26 @@ 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);
-		data=(void *)sqlite3_column_blob(m_statement,column);
-		length=sqlite3_column_bytes(m_statement,column);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//PThread::Guard g(DB::Instance()->m_mutex);
+		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
@@ -232,7 +259,8 @@ 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);
+		//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;
 	}
@@ -246,7 +274,8 @@ 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);
+		//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;
 	}
@@ -260,7 +289,8 @@ const bool Statement::ResultNull(const int column)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//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;
@@ -280,7 +310,8 @@ 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);
+		//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)
 		{
@@ -303,7 +334,8 @@ const bool Statement::Step(const bool saveinsertrowid)
 	m_rowreturned=false;
 	if(Valid())
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		int result=sqlite3_step(m_statement);
 		if(result==SQLITE_OK || result==SQLITE_ROW || result==SQLITE_DONE)
 		{
@@ -313,7 +345,7 @@ const bool Statement::Step(const bool saveinsertrowid)
 			}
 			if(saveinsertrowid)
 			{
-				m_lastinsertrowid=sqlite3_last_insert_rowid(DB::instance()->GetDB());
+				m_lastinsertrowid=sqlite3_last_insert_rowid(DB::Instance()->GetDB());
 			}
 			return true;
 		}
@@ -330,7 +362,8 @@ const bool Statement::Step(const bool saveinsertrowid)
 
 const bool Statement::Valid()
 {
-	ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+	//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+	PThread::Guard g(DB::Instance()->m_mutex);
 	return m_statement ? true : false ;
 }