some more places are handling SQLITE_BUSY correctly now, test9

still breaks under heavy load

1 files changed, 17 insertions, 8 deletions

diff --git a/src/prepared_statement.cpp b/src/prepared_statement.cpp
index 674fbec..a63a75c 100644
--- a/src/prepared_statement.cpp
+++ b/src/prepared_statement.cpp
@@ -123,12 +123,12 @@ prepared_stmt::prepared_stmt( sqlite3 *db, string __sql ) :
 	rc = sqlite3_prepare( db, _sql.c_str( ), -1, &_stmt, &tail );
 #endif
 	switch( rc ) {
-		case SQLITE_BUSY:
-			throw database_locked( );
-		
 		case SQLITE_OK:
 			break;
 			
+		case SQLITE_BUSY:
+			throw database_locked( );
+		
 		default:
 		{
 			ostringstream s;
@@ -158,11 +158,20 @@ void prepared_stmt::reset( ) {
 	int rc;
 	assert( _stmt != NULL );
 	rc = sqlite3_reset( _stmt );
-	if( rc != SQLITE_OK ) { 
-		ostringstream s;
-		s << "sqlite3::prepared_stmt::reset error: " << sqlite3_errmsg( _db );
-		string msg = s.str( );
-		throw sql_error( msg, _sql );
+	switch( rc ) {
+		case SQLITE_OK:
+			break;
+			
+		case SQLITE_BUSY:
+			throw database_locked( );
+		
+		default:
+		{
+			ostringstream s;
+			s << "sqlite3::prepared_stmt::reset error: " << sqlite3_errmsg( _db );
+			string msg = s.str( );
+			throw sql_error( msg, _sql );
+		}
 	}
 }