Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-30 17:17:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanups of debugging.

Browse source 
catch case where sql insert fails.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7325 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-05-04 12:48:42 +00:00
parent faa7a8e7b1
commit 2232e8e583
7 changed files with 105 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libretroshare/src/util/retrodb.cc
View file

@ -34,7 +34,6 @@
//#define RETRODB_DEBUG
#define ENABLE_ENCRYPTED_DB
const int RetroDb::OPEN_READONLY = SQLITE_OPEN_READONLY;
const int RetroDb::OPEN_READWRITE = SQLITE_OPEN_READWRITE;
const int RetroDb::OPEN_READWRITE_CREATE = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
@ -237,14 +236,13 @@ bool RetroDb::sqlInsert(const std::string &table, const std::string& /* nullColu
// complete insertion query
std::string sqlQuery = "INSERT INTO " + qColumns + " " + qValues;
execSQL_bind(sqlQuery, paramBindings);
bool ok = execSQL_bind(sqlQuery, paramBindings);
#ifdef RETRODB_DEBUG
std::cerr << "RetroDb::sqlInsert(): " << sqlQuery << std::endl;
#endif
return true;
return ok;
}
std::string RetroDb::getKey() const
@ -265,7 +263,7 @@ bool RetroDb::execSQL_bind(const std::string &query, std::list<RetroBind*> &para
// check if there are any errors
if(rc != SQLITE_OK){
std::cerr << "RetroDb::execSQL(): Error preparing statement\n";
std::cerr << "RetroDb::execSQL_bind(): Error preparing statement\n";
std::cerr << "Error code: " << sqlite3_errmsg(mDb)
<< std::endl;
return false;
@ -318,12 +316,13 @@ bool RetroDb::execSQL_bind(const std::string &query, std::list<RetroBind*> &para
if(!ok){
if(rc == SQLITE_BUSY){
std::cerr << "RetroDb::execSQL()\n" ;
std::cerr << "RetroDb::execSQL_bind()\n" ;
std::cerr << "SQL timed out!" << std::endl;
}else{
std::cerr << "RetroDb::execSQL(): Error executing statement (code: " << rc << ")\n";
std::cerr << "RetroDb::execSQL_bind(): Error executing statement (code: " << rc << ")\n";
std::cerr << "Sqlite Error msg: " << sqlite3_errmsg(mDb)
<< std::endl;
std::cerr << "RetroDb::execSQL_bind() Query: " << query << std::endl;
}
}
@ -750,4 +749,3 @@ const void* RetroCursor::getData(int columnIndex, uint32_t &datSize){
return val;
}