IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add extra status checking for return codes. Errors cause a CRIT message to the

Browse Source 
trace file and set the background error status.  Note that not all times when the
background error status is set will result in a notification to the user.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18033 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Phil Longstaff 2009-04-09 22:23:34 +00:00
parent 29d9be3aa9
commit 0e4c9a03f9
1 changed files with 198 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

245
src/backend/dbi/gnc-backend-dbi.c
View File

@ -102,7 +102,7 @@ static provider_functions_t provider_pgsql =
pgsql_get_column_type_name pgsql_get_column_type_name
}; };
static GncSqlConnection* create_dbi_connection( /*@ observer @*/ provider_functions_t* provider, /*@ observer @*/ dbi_conn conn ); static GncSqlConnection* create_dbi_connection( /*@ observer @*/ provider_functions_t* provider, /*@ observer @*/ QofBackend* qbe, /*@ observer @*/ dbi_conn conn );
#define GNC_DBI_PROVIDER_SQLITE (&provider_sqlite3) #define GNC_DBI_PROVIDER_SQLITE (&provider_sqlite3)
#define GNC_DBI_PROVIDER_MYSQL (&provider_mysql) #define GNC_DBI_PROVIDER_MYSQL (&provider_mysql)
@ -178,9 +178,9 @@ gnc_dbi_sqlite3_session_begin( QofBackend *qbe, QofSession *session,
book_id += strlen( SQLITE3_URI_PREFIX ); book_id += strlen( SQLITE3_URI_PREFIX );
} }
if (!create_if_nonexistent if( !create_if_nonexistent
&& !g_file_test(book_id, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS)) { && !g_file_test( book_id, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS ) ) {
qof_backend_set_error(qbe, ERR_FILEIO_FILE_NOT_FOUND); qof_backend_set_error( qbe, ERR_FILEIO_FILE_NOT_FOUND );
LEAVE(" "); LEAVE(" ");
return; return;
} }
@ -199,9 +199,27 @@ gnc_dbi_sqlite3_session_begin( QofBackend *qbe, QofSession *session,
dirname = g_path_get_dirname( book_id ); dirname = g_path_get_dirname( book_id );
basename = g_path_get_basename( book_id ); basename = g_path_get_basename( book_id );
dbi_conn_error_handler( be->conn, sqlite3_error_fn, be ); dbi_conn_error_handler( be->conn, sqlite3_error_fn, be );
(void)dbi_conn_set_option( be->conn, "host", "localhost" ); result = dbi_conn_set_option( be->conn, "host", "localhost" );
(void)dbi_conn_set_option( be->conn, "dbname", basename ); if( result < 0 ) {
(void)dbi_conn_set_option( be->conn, "sqlite3_dbdir", dirname ); PERR( "Error setting 'host' option\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
LEAVE( " " );
return;
}
result = dbi_conn_set_option( be->conn, "dbname", basename );
if( result < 0 ) {
PERR( "Error setting 'dbname' option\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
LEAVE( " " );
return;
}
result = dbi_conn_set_option( be->conn, "sqlite3_dbdir", dirname );
if( result < 0 ) {
PERR( "Error setting 'sqlite3_dbdir' option\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
LEAVE( " " );
return;
}
result = dbi_conn_connect( be->conn ); result = dbi_conn_connect( be->conn );
g_free( basename ); g_free( basename );
g_free( dirname ); g_free( dirname );
@ -215,7 +233,7 @@ gnc_dbi_sqlite3_session_begin( QofBackend *qbe, QofSession *session,
if( be->sql_be.conn != NULL ) { if( be->sql_be.conn != NULL ) {
gnc_sql_connection_dispose( be->sql_be.conn ); gnc_sql_connection_dispose( be->sql_be.conn );
} }
be->sql_be.conn = create_dbi_connection( GNC_DBI_PROVIDER_SQLITE, be->conn ); be->sql_be.conn = create_dbi_connection( GNC_DBI_PROVIDER_SQLITE, qbe, be->conn );
LEAVE (" "); LEAVE (" ");
} }
@ -275,11 +293,41 @@ gnc_dbi_mysql_session_begin( QofBackend *qbe, QofSession *session,
return; return;
} }
dbi_conn_error_handler( be->conn, mysql_error_fn, be ); dbi_conn_error_handler( be->conn, mysql_error_fn, be );
(void)dbi_conn_set_option( be->conn, "host", host ); result = dbi_conn_set_option( be->conn, "host", host );
(void)dbi_conn_set_option_numeric( be->conn, "port", 0 ); if( result < 0 ) {
(void)dbi_conn_set_option( be->conn, "dbname", "mysql" ); PERR( "Error setting 'host' option\n" );
(void)dbi_conn_set_option( be->conn, "username", username ); qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
(void)dbi_conn_set_option( be->conn, "password", password ); LEAVE( " " );
return;
}
result = dbi_conn_set_option_numeric( be->conn, "port", 0 );
if( result < 0 ) {
PERR( "Error setting 'port' option\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
LEAVE( " " );
return;
}
result = dbi_conn_set_option( be->conn, "dbname", "mysql" );
if( result < 0 ) {
PERR( "Error setting 'dbname' option\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
LEAVE( " " );
return;
}
result = dbi_conn_set_option( be->conn, "username", username );
if( result < 0 ) {
PERR( "Error setting 'username' option\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
LEAVE( " " );
return;
}
result = dbi_conn_set_option( be->conn, "password", password );
if( result < 0 ) {
PERR( "Error setting 'password' option\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
LEAVE( " " );
return;
}
be->exists = TRUE; be->exists = TRUE;
result = dbi_conn_connect( be->conn ); result = dbi_conn_connect( be->conn );
if( result == 0 ) { if( result == 0 ) {
@ -288,7 +336,7 @@ gnc_dbi_mysql_session_begin( QofBackend *qbe, QofSession *session,
if( be->sql_be.conn != NULL ) { if( be->sql_be.conn != NULL ) {
gnc_sql_connection_dispose( be->sql_be.conn ); gnc_sql_connection_dispose( be->sql_be.conn );
} }
be->sql_be.conn = create_dbi_connection( GNC_DBI_PROVIDER_MYSQL, be->conn ); be->sql_be.conn = create_dbi_connection( GNC_DBI_PROVIDER_MYSQL, qbe, be->conn );
} else { } else {
if( create_if_nonexistent ) { if( create_if_nonexistent ) {
/* Couldn't select the db, so try to create it */ /* Couldn't select the db, so try to create it */
@ -299,13 +347,17 @@ gnc_dbi_mysql_session_begin( QofBackend *qbe, QofSession *session,
if( be->sql_be.conn != NULL ) { if( be->sql_be.conn != NULL ) {
gnc_sql_connection_dispose( be->sql_be.conn ); gnc_sql_connection_dispose( be->sql_be.conn );
} }
be->sql_be.conn = create_dbi_connection( GNC_DBI_PROVIDER_MYSQL, be->conn ); be->sql_be.conn = create_dbi_connection( GNC_DBI_PROVIDER_MYSQL, qbe, be->conn );
} else { } else {
PERR( "Unable to connect to %s: %d\n", book_id, result ); PERR( "Unable to connect to %s: %d\n", book_id, result );
qof_backend_set_error( qbe, ERR_BACKEND_CANT_CONNECT ); qof_backend_set_error( qbe, ERR_BACKEND_CANT_CONNECT );
} }
if( dresult != NULL ) { if( dresult != NULL ) {
(void)dbi_result_free( dresult ); gint status = dbi_result_free( dresult );
if( status < 0 ) {
PERR( "Error in dbi_result_free() result\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
}
} }
} else { } else {
qof_backend_set_error( qbe, ERR_BACKEND_NO_SUCH_DB ); qof_backend_set_error( qbe, ERR_BACKEND_NO_SUCH_DB );
@ -372,11 +424,41 @@ gnc_dbi_postgres_session_begin( QofBackend *qbe, QofSession *session,
return; return;
} }
dbi_conn_error_handler( be->conn, pgsql_error_fn, be ); dbi_conn_error_handler( be->conn, pgsql_error_fn, be );
(void)dbi_conn_set_option( be->conn, "host", host ); result = dbi_conn_set_option( be->conn, "host", host );
(void)dbi_conn_set_option_numeric( be->conn, "port", 0 ); if( result < 0 ) {
(void)dbi_conn_set_option( be->conn, "dbname", dbname ); PERR( "Error setting 'host' option\n" );
(void)dbi_conn_set_option( be->conn, "username", username ); qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
(void)dbi_conn_set_option( be->conn, "password", password ); LEAVE( " " );
return;
}
result = dbi_conn_set_option_numeric( be->conn, "port", 0 );
if( result < 0 ) {
PERR( "Error setting 'port' option\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
LEAVE( " " );
return;
}
result = dbi_conn_set_option( be->conn, "dbname", dbname );
if( result < 0 ) {
PERR( "Error setting 'dbname' option\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
LEAVE( " " );
return;
}
result = dbi_conn_set_option( be->conn, "username", username );
if( result < 0 ) {
PERR( "Error setting 'username' option\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
LEAVE( " " );
return;
}
result = dbi_conn_set_option( be->conn, "password", password );
if( result < 0 ) {
PERR( "Error setting 'password' option\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
LEAVE( " " );
return;
}
result = dbi_conn_connect( be->conn ); result = dbi_conn_connect( be->conn );
g_free( dsn ); g_free( dsn );
if( result < 0 ) { if( result < 0 ) {
@ -389,7 +471,7 @@ gnc_dbi_postgres_session_begin( QofBackend *qbe, QofSession *session,
if( be->sql_be.conn != NULL ) { if( be->sql_be.conn != NULL ) {
gnc_sql_connection_dispose( be->sql_be.conn ); gnc_sql_connection_dispose( be->sql_be.conn );
} }
be->sql_be.conn = create_dbi_connection( GNC_DBI_PROVIDER_PGSQL, be->conn ); be->sql_be.conn = create_dbi_connection( GNC_DBI_PROVIDER_PGSQL, qbe, be->conn );
LEAVE (" "); LEAVE (" ");
} }
@ -456,12 +538,17 @@ gnc_dbi_save_may_clobber_data( QofBackend* qbe )
const gchar* dbname; const gchar* dbname;
dbi_result tables; dbi_result tables;
unsigned long long numTables; unsigned long long numTables;
gint status;
/* Data may be clobbered iff the number of tables != 0 */ /* Data may be clobbered iff the number of tables != 0 */
dbname = dbi_conn_get_option( be->conn, "dbname" ); dbname = dbi_conn_get_option( be->conn, "dbname" );
tables = dbi_conn_get_table_list( be->conn, dbname, NULL ); tables = dbi_conn_get_table_list( be->conn, dbname, NULL );
numTables = dbi_result_get_numrows( tables ); numTables = dbi_result_get_numrows( tables );
(void)dbi_result_free( tables ); status = dbi_result_free( tables );
if( status < 0 ) {
PERR( "Error in dbi_result_free() result\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
}
return (numTables != 0); return (numTables != 0);
} }
@ -472,6 +559,7 @@ gnc_dbi_sync_all( QofBackend* qbe, /*@ dependent @*/ QofBook *book )
GncDbiBackend* be = (GncDbiBackend*)qbe; GncDbiBackend* be = (GncDbiBackend*)qbe;
dbi_result tables; dbi_result tables;
const gchar* dbname; const gchar* dbname;
gint status;
g_return_if_fail( be != NULL ); g_return_if_fail( be != NULL );
g_return_if_fail( book != NULL ); g_return_if_fail( book != NULL );
@ -487,9 +575,17 @@ gnc_dbi_sync_all( QofBackend* qbe, /*@ dependent @*/ QofBook *book )
table_name = dbi_result_get_string_idx( tables, 1 ); table_name = dbi_result_get_string_idx( tables, 1 );
result = dbi_conn_queryf( be->conn, "DROP TABLE %s", table_name ); result = dbi_conn_queryf( be->conn, "DROP TABLE %s", table_name );
(void)dbi_result_free( result ); status = dbi_result_free( result );
if( status < 0 ) {
PERR( "Error in dbi_result_free() result\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
}
}
status = dbi_result_free( tables );
if( status < 0 ) {
PERR( "Error in dbi_result_free() result\n" );
qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
} }
(void)dbi_result_free( tables );
/* Save all contents */ /* Save all contents */
be->is_pristine_db = TRUE; be->is_pristine_db = TRUE;
@ -627,6 +723,7 @@ gnc_dbi_check_sqlite3_file( const gchar *path )
FILE* f; FILE* f;
gchar buf[50]; gchar buf[50];
size_t chars_read; size_t chars_read;
gint status;
// BAD if the path is null // BAD if the path is null
g_return_val_if_fail( path != NULL, FALSE ); g_return_val_if_fail( path != NULL, FALSE );
@ -641,7 +738,10 @@ gnc_dbi_check_sqlite3_file( const gchar *path )
// OK if file has the correct header // OK if file has the correct header
chars_read = fread( buf, sizeof(buf), 1, f ); chars_read = fread( buf, sizeof(buf), 1, f );
(void)fclose( f ); status = fclose( f );
if( status < 0 ) {
PERR( "Error in fclose(): %d\n", errno );
}
if( g_str_has_prefix( buf, "SQLite format 3" ) ) { if( g_str_has_prefix( buf, "SQLite format 3" ) ) {
PINFO( "has SQLite format string -> DBI" ); PINFO( "has SQLite format string -> DBI" );
return TRUE; return TRUE;
@ -653,7 +753,7 @@ gnc_dbi_check_sqlite3_file( const gchar *path )
} }
G_MODULE_EXPORT void G_MODULE_EXPORT void
qof_backend_module_init(void) qof_backend_module_init( void )
{ {
QofBackendProvider *prov; QofBackendProvider *prov;
#define DEFAULT_DBD_DIR "/usr/lib/dbd" #define DEFAULT_DBD_DIR "/usr/lib/dbd"
@ -823,10 +923,20 @@ create_dbi_row( /*@ dependent @*/ dbi_result result )
return (GncSqlRow*)row; return (GncSqlRow*)row;
} }
/* --------------------------------------------------------- */ /* --------------------------------------------------------- */
typedef struct
{
GncSqlConnection base;
/*@ observer @*/ QofBackend* qbe;
/*@ observer @*/ dbi_conn conn;
/*@ observer @*/ provider_functions_t* provider;
} GncDbiSqlConnection;
typedef struct typedef struct
{ {
GncSqlResult base; GncSqlResult base;
/*@ observer @*/ GncDbiSqlConnection* dbi_conn;
/*@ owned @*/ dbi_result result; /*@ owned @*/ dbi_result result;
guint num_rows; guint num_rows;
guint cur_row; guint cur_row;
@ -842,7 +952,13 @@ result_dispose( /*@ only @*/ GncSqlResult* result )
gnc_sql_row_dispose( dbi_result->row ); gnc_sql_row_dispose( dbi_result->row );
} }
if( dbi_result->result != NULL ) { if( dbi_result->result != NULL ) {
(void)dbi_result_free( dbi_result->result ); gint status;
status = dbi_result_free( dbi_result->result );
if( status < 0 ) {
PERR( "Error in dbi_result_free() result\n" );
qof_backend_set_error( dbi_result->dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
}
} }
g_free( result ); g_free( result );
} }
@ -865,7 +981,11 @@ result_get_first_row( GncSqlResult* result )
dbi_result->row = NULL; dbi_result->row = NULL;
} }
if( dbi_result->num_rows > 0 ) { if( dbi_result->num_rows > 0 ) {
(void)dbi_result_first_row( dbi_result->result ); gint status = dbi_result_first_row( dbi_result->result );
if( status == 0 ) {
PERR( "Error in dbi_result_first_row()\n" );
qof_backend_set_error( dbi_result->dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
}
dbi_result->cur_row = 1; dbi_result->cur_row = 1;
dbi_result->row = create_dbi_row( dbi_result->result ); dbi_result->row = create_dbi_row( dbi_result->result );
return dbi_result->row; return dbi_result->row;
@ -884,7 +1004,11 @@ result_get_next_row( GncSqlResult* result )
dbi_result->row = NULL; dbi_result->row = NULL;
} }
if( dbi_result->cur_row < dbi_result->num_rows ) { if( dbi_result->cur_row < dbi_result->num_rows ) {
(void)dbi_result_next_row( dbi_result->result ); gint status = dbi_result_next_row( dbi_result->result );
if( status == 0 ) {
PERR( "Error in dbi_result_first_row()\n" );
qof_backend_set_error( dbi_result->dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
}
dbi_result->cur_row++; dbi_result->cur_row++;
dbi_result->row = create_dbi_row( dbi_result->result ); dbi_result->row = create_dbi_row( dbi_result->result );
return dbi_result->row; return dbi_result->row;
@ -894,7 +1018,7 @@ result_get_next_row( GncSqlResult* result )
} }
static GncSqlResult* static GncSqlResult*
create_dbi_result( /*@ owned @*/ dbi_result result ) create_dbi_result( /*@ observer @*/ GncDbiSqlConnection* dbi_conn, /*@ owned @*/ dbi_result result )
{ {
GncDbiSqlResult* dbi_result; GncDbiSqlResult* dbi_result;
@ -908,6 +1032,7 @@ create_dbi_result( /*@ owned @*/ dbi_result result )
dbi_result->result = result; dbi_result->result = result;
dbi_result->num_rows = (guint)dbi_result_get_numrows( result ); dbi_result->num_rows = (guint)dbi_result_get_numrows( result );
dbi_result->cur_row = 0; dbi_result->cur_row = 0;
dbi_result->dbi_conn = dbi_conn;
return (GncSqlResult*)dbi_result; return (GncSqlResult*)dbi_result;
} }
@ -972,14 +1097,6 @@ create_dbi_statement( /*@ observer @*/ GncSqlConnection* conn, const gchar* sql
return (GncSqlStatement*)stmt; return (GncSqlStatement*)stmt;
} }
/* --------------------------------------------------------- */ /* --------------------------------------------------------- */
typedef struct
{
GncSqlConnection base;
/*@ observer @*/ dbi_conn conn;
/*@ observer @*/ provider_functions_t* provider;
} GncDbiSqlConnection;
static void static void
conn_dispose( /*@ only @*/ GncSqlConnection* conn ) conn_dispose( /*@ only @*/ GncSqlConnection* conn )
{ {
@ -1001,7 +1118,7 @@ conn_execute_select_statement( GncSqlConnection* conn, GncSqlStatement* stmt )
return NULL; return NULL;
} }
DEBUG( "SQL: %s\n", dbi_stmt->sql->str ); DEBUG( "SQL: %s\n", dbi_stmt->sql->str );
return create_dbi_result( result ); return create_dbi_result( dbi_conn, result );
} }
static gint static gint
@ -1011,6 +1128,7 @@ conn_execute_nonselect_statement( GncSqlConnection* conn, GncSqlStatement* stmt
GncDbiSqlStatement* dbi_stmt = (GncDbiSqlStatement*)stmt; GncDbiSqlStatement* dbi_stmt = (GncDbiSqlStatement*)stmt;
dbi_result result; dbi_result result;
gint num_rows; gint num_rows;
gint status;
result = dbi_conn_query( dbi_conn->conn, dbi_stmt->sql->str ); result = dbi_conn_query( dbi_conn->conn, dbi_stmt->sql->str );
if( result == NULL ) { if( result == NULL ) {
@ -1019,7 +1137,11 @@ conn_execute_nonselect_statement( GncSqlConnection* conn, GncSqlStatement* stmt
} }
DEBUG( "SQL: %s\n", dbi_stmt->sql->str ); DEBUG( "SQL: %s\n", dbi_stmt->sql->str );
num_rows = (gint)dbi_result_get_numrows_affected( result ); num_rows = (gint)dbi_result_get_numrows_affected( result );
(void)dbi_result_free( result ); status = dbi_result_free( result );
if( status < 0 ) {
PERR( "Error in dbi_result_free() result\n" );
qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
}
return num_rows; return num_rows;
} }
@ -1052,6 +1174,7 @@ conn_does_table_exist( GncSqlConnection* conn, const gchar* table_name )
gint nTables; gint nTables;
dbi_result tables; dbi_result tables;
const gchar* dbname; const gchar* dbname;
gint status;
g_return_val_if_fail( conn != NULL, FALSE ); g_return_val_if_fail( conn != NULL, FALSE );
g_return_val_if_fail( table_name != NULL, FALSE ); g_return_val_if_fail( table_name != NULL, FALSE );
@ -1059,7 +1182,11 @@ conn_does_table_exist( GncSqlConnection* conn, const gchar* table_name )
dbname = dbi_conn_get_option( dbi_conn->conn, "dbname" ); dbname = dbi_conn_get_option( dbi_conn->conn, "dbname" );
tables = dbi_conn_get_table_list( dbi_conn->conn, dbname, table_name ); tables = dbi_conn_get_table_list( dbi_conn->conn, dbname, table_name );
nTables = (gint)dbi_result_get_numrows( tables ); nTables = (gint)dbi_result_get_numrows( tables );
(void)dbi_result_free( tables ); status = dbi_result_free( tables );
if( status < 0 ) {
PERR( "Error in dbi_result_free() result\n" );
qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
}
if( nTables == 1 ) { if( nTables == 1 ) {
return TRUE; return TRUE;
@ -1073,10 +1200,15 @@ conn_begin_transaction( /*@ unused @*/ GncSqlConnection* conn )
{ {
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn; GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
dbi_result result; dbi_result result;
gint status;
result = dbi_conn_queryf( dbi_conn->conn, "BEGIN" ); result = dbi_conn_queryf( dbi_conn->conn, "BEGIN" );
DEBUG( "BEGIN\n" ); DEBUG( "BEGIN\n" );
(void)dbi_result_free( result ); status = dbi_result_free( result );
if( status < 0 ) {
PERR( "Error in dbi_result_free() result\n" );
qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
}
return TRUE; return TRUE;
} }
@ -1086,10 +1218,15 @@ conn_rollback_transaction( /*@ unused @*/ GncSqlConnection* conn )
{ {
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn; GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
dbi_result result; dbi_result result;
gint status;
result = dbi_conn_queryf( dbi_conn->conn, "ROLLBACK" ); result = dbi_conn_queryf( dbi_conn->conn, "ROLLBACK" );
DEBUG( "ROLLBACK\n" ); DEBUG( "ROLLBACK\n" );
(void)dbi_result_free( result ); status = dbi_result_free( result );
if( status < 0 ) {
PERR( "Error in dbi_result_free() result\n" );
qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
}
return TRUE; return TRUE;
} }
@ -1099,10 +1236,15 @@ conn_commit_transaction( /*@ unused @*/ GncSqlConnection* conn )
{ {
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn; GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
dbi_result result; dbi_result result;
gint status;
result = dbi_conn_queryf( dbi_conn->conn, "COMMIT" ); result = dbi_conn_queryf( dbi_conn->conn, "COMMIT" );
DEBUG( "COMMIT\n" ); DEBUG( "COMMIT\n" );
(void)dbi_result_free( result ); status = dbi_result_free( result );
if( status < 0 ) {
PERR( "Error in dbi_result_free() result\n" );
qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
}
return TRUE; return TRUE;
} }
@ -1336,9 +1478,15 @@ conn_create_table( GncSqlConnection* conn, const gchar* table_name,
ddl = dbi_conn->provider->create_table_ddl( conn, table_name, ddl = dbi_conn->provider->create_table_ddl( conn, table_name,
col_info_list ); col_info_list );
if( ddl != NULL ) { if( ddl != NULL ) {
gint status;
DEBUG( "SQL: %s\n", ddl ); DEBUG( "SQL: %s\n", ddl );
result = dbi_conn_query( dbi_conn->conn, ddl ); result = dbi_conn_query( dbi_conn->conn, ddl );
(void)dbi_result_free( result ); status = dbi_result_free( result );
if( status < 0 ) {
PERR( "Error in dbi_result_free() result\n" );
qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
}
} else { } else {
return FALSE; return FALSE;
} }
@ -1448,7 +1596,9 @@ conn_quote_string( const GncSqlConnection* conn, gchar* unquoted_str )
} }
static GncSqlConnection* static GncSqlConnection*
create_dbi_connection( /*@ observer @*/ provider_functions_t* provider, /*@ observer @*/ dbi_conn conn ) create_dbi_connection( /*@ observer @*/ provider_functions_t* provider,
/*@ observer @*/ QofBackend* qbe,
/*@ observer @*/ dbi_conn conn )
{ {
GncDbiSqlConnection* dbi_conn; GncDbiSqlConnection* dbi_conn;
@ -1467,6 +1617,7 @@ create_dbi_connection( /*@ observer @*/ provider_functions_t* provider, /*@ obse
dbi_conn->base.createTable = conn_create_table; dbi_conn->base.createTable = conn_create_table;
dbi_conn->base.createIndex = conn_create_index; dbi_conn->base.createIndex = conn_create_index;
dbi_conn->base.quoteString = conn_quote_string; dbi_conn->base.quoteString = conn_quote_string;
dbi_conn->qbe = qbe;
dbi_conn->conn = conn; dbi_conn->conn = conn;
dbi_conn->provider = provider; dbi_conn->provider = provider;