r17233 - gnucash/branches/gda-dev2/src - 1) Cleanup - remove unused routines/arguments.
Phil Longstaff
plongstaff at cvs.gnucash.org
Sat Jun 14 11:23:35 EDT 2008
Author: plongstaff
Date: 2008-06-14 11:23:34 -0400 (Sat, 14 Jun 2008)
New Revision: 17233
Trac: http://svn.gnucash.org/trac/changeset/17233
Removed:
gnucash/branches/gda-dev2/src/backend/sql/gncmod-backend-sql.c
Modified:
gnucash/branches/gda-dev2/src/backend/sql/gnc-account-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.h
gnucash/branches/gda-dev2/src/backend/sql/gnc-book-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-budget-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-commodity-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-lots-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-price-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-recurrence-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-schedxaction-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-slots-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-transaction-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-bill-term-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-customer-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-employee-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-entry-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-invoice-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-job-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-order-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-tax-table-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-vendor-sql.c
Log:
1) Cleanup - remove unused routines/arguments.
2) Add doxygen comments to gnc-backend-sql.h
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-account-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-account-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-account-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -188,7 +188,7 @@
pBook = be->primary_book;
pTable = gnc_commodity_table_get_table( pBook );
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME, col_table );
+ stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -253,12 +253,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -62,6 +62,20 @@
static const gchar* convert_search_obj( QofIdType objType );
static void gnc_sql_init_object_handlers( void );
static void update_save_progress( GncSqlBackend* be );
+static void register_standard_col_type_handlers( void );
+static void reset_version_info( GncSqlBackend* be );
+static GncSqlStatement* build_insert_statement( GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const col_cvt_t* table );
+static GncSqlStatement* build_update_statement( GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const col_cvt_t* table );
+static GncSqlStatement* build_delete_statement( GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const col_cvt_t* table );
#define TRANSACTION_NAME "trans"
@@ -90,7 +104,7 @@
void
gnc_sql_init( GncSqlBackend* be )
{
- gnc_sql_register_standard_col_type_handlers();
+ register_standard_col_type_handlers();
gnc_sql_init_object_handlers();
}
@@ -151,12 +165,6 @@
g_assert( be->primary_book == NULL );
be->primary_book = book;
- // Set up table version information
-// gnc_sql_init_version_info( be );
-
- // Call all object backends to create any required tables
-// qof_object_foreach_backend( GNC_SQL_BACKEND, create_tables_cb, be );
-
/* Load any initial stuff */
be->loading = TRUE;
@@ -387,7 +395,7 @@
}
#endif
- gnc_sql_reset_version_info( be );
+ reset_version_info( be );
/* Create new tables */
be->is_pristine_db = TRUE;
@@ -833,11 +841,6 @@
/* ================================================================= */
-G_MODULE_EXPORT void
-qof_backend_module_init(void)
-{
-}
-
static void register_table_version( const GncSqlBackend* be, const gchar* table_name, gint version );
static gint get_table_version( const GncSqlBackend* be, const gchar* table_name );
@@ -1807,8 +1810,8 @@
return pHandler;
}
-void
-gnc_sql_register_standard_col_type_handlers( void )
+static void
+register_standard_col_type_handlers( void )
{
gnc_sql_register_col_type_handler( CT_STRING, &string_handler );
gnc_sql_register_col_type_handler( CT_BOOLEAN, &boolean_handler );
@@ -1904,11 +1907,13 @@
/* ================================================================= */
GncSqlStatement*
-gnc_sql_create_select_statement( const GncSqlBackend* be, const gchar* table_name,
- const col_cvt_t* table_row )
+gnc_sql_create_select_statement( const GncSqlBackend* be, const gchar* table_name )
{
gchar* sql;
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( table_name != NULL, NULL );
+
sql = g_strdup_printf( "SELECT * FROM %s", table_name );
return gnc_sql_create_statement_from_sql( be, sql );
}
@@ -1920,29 +1925,16 @@
{
gchar* sql;
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( table_name != NULL, NULL );
+ g_return_val_if_fail( table_row != NULL, NULL );
+
sql = g_strdup_printf( "SELECT %s FROM %s", table_row->col_name, table_name );
return gnc_sql_create_statement_from_sql( be, sql );
}
/* ================================================================= */
-gint
-gnc_sql_execute_statement( GncSqlBackend* be, GncSqlStatement* stmt )
-{
- GError* error = NULL;
- gint numRows;
- g_return_val_if_fail( be != NULL, -1 );
- g_return_val_if_fail( stmt != NULL, -1 );
-
- numRows = gnc_sql_connection_execute_nonselect_statement( be->conn, stmt );
- if( error != NULL ) {
- PERR( "SQL error: %s\n%s\n", gnc_sql_statement_to_sql( stmt ), error->message );
- qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
- }
-
- return numRows;
-}
-
GncSqlResult*
gnc_sql_execute_select_statement( GncSqlBackend* be, GncSqlStatement* stmt )
{
@@ -2000,11 +1992,10 @@
return result;
}
-gint
-gnc_sql_execute_nonselect_sql( const GncSqlBackend* be, gchar* sql )
+static gint
+execute_nonselect_sql( const GncSqlBackend* be, gchar* sql )
{
GncSqlStatement* stmt;
- GError* error = NULL;
gint result;
g_return_val_if_fail( be != NULL, 0 );
@@ -2016,34 +2007,13 @@
}
result = gnc_sql_connection_execute_nonselect_statement( be->conn, stmt );
gnc_sql_statement_dispose( stmt );
- if( error != NULL ) {
- PERR( "SQL error: %s\n%s\n", sql, error->message );
- }
return result;
}
-int
-gnc_sql_execute_select_get_count( const GncSqlBackend* be, gchar* sql )
+static int
+execute_statement_get_count( GncSqlBackend* be, GncSqlStatement* stmt )
{
- int count = 0;
GncSqlResult* result;
-
- g_return_val_if_fail( be != NULL, 0 );
- g_return_val_if_fail( sql != NULL, 0 );
-
- result = gnc_sql_execute_select_sql( be, sql );
- if( result != NULL ) {
- count = gnc_sql_result_get_num_rows( result );
- gnc_sql_result_dispose( result );
- }
-
- return count;
-}
-
-int
-gnc_sql_execute_statement_get_count( GncSqlBackend* be, GncSqlStatement* stmt )
-{
- GncSqlResult* result;
int count = 0;
g_return_val_if_fail( be != NULL, 0 );
@@ -2110,7 +2080,7 @@
pHandler->add_gvalue_to_slist_fn( be, obj_name, pObject, table, &list );
gnc_sql_statement_add_where_cond( sqlStmt, obj_name, pObject, &table[0], (GValue*)(list->data) );
- count = gnc_sql_execute_statement_get_count( be, sqlStmt );
+ count = execute_statement_get_count( be, sqlStmt );
gnc_sql_statement_dispose( sqlStmt );
if( count == 0 ) {
return FALSE;
@@ -2126,7 +2096,7 @@
QofIdTypeConst obj_name, gpointer pObject,
const col_cvt_t* table )
{
- GncSqlStatement* sqlStmt;
+ GncSqlStatement* stmt;
g_return_val_if_fail( be != NULL, FALSE );
g_return_val_if_fail( table_name != NULL, FALSE );
@@ -2136,20 +2106,20 @@
if( op == OP_DB_ADD_OR_UPDATE ) {
if( gnc_sql_object_is_it_in_db( be, table_name, obj_name, pObject, table ) ) {
- sqlStmt = gnc_sql_build_update_statement( be, table_name, obj_name, pObject, table );
+ stmt = build_update_statement( be, table_name, obj_name, pObject, table );
} else {
- sqlStmt = gnc_sql_build_insert_statement( be, table_name, obj_name, pObject, table );
+ stmt = build_insert_statement( be, table_name, obj_name, pObject, table );
}
} else if( op == OP_DB_DELETE ) {
- sqlStmt = gnc_sql_build_delete_statement( be, table_name, obj_name, pObject, table );
+ stmt = build_delete_statement( be, table_name, obj_name, pObject, table );
} else if( op == OP_DB_ADD ) {
- sqlStmt = gnc_sql_build_insert_statement( be, table_name, obj_name, pObject, table );
+ stmt = build_insert_statement( be, table_name, obj_name, pObject, table );
} else {
g_assert( FALSE );
}
- if( sqlStmt != NULL ) {
- gnc_sql_execute_statement( be, sqlStmt );
- gnc_sql_statement_dispose( sqlStmt );
+ if( stmt != NULL ) {
+ gnc_sql_connection_execute_nonselect_statement( be->conn, stmt );
+ gnc_sql_statement_dispose( stmt );
return TRUE;
} else {
@@ -2207,11 +2177,11 @@
}
}
-GncSqlStatement*
-gnc_sql_build_insert_statement( GncSqlBackend* be,
- const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table )
+static GncSqlStatement*
+build_insert_statement( GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const col_cvt_t* table )
{
GncSqlStatement* stmt;
GString* sql;
@@ -2248,11 +2218,11 @@
return stmt;
}
-GncSqlStatement*
-gnc_sql_build_update_statement( GncSqlBackend* be,
- const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table )
+static GncSqlStatement*
+build_update_statement( GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const col_cvt_t* table )
{
GncSqlStatement* stmt;
GString* sql;
@@ -2312,11 +2282,11 @@
return stmt;
}
-GncSqlStatement*
-gnc_sql_build_delete_statement( GncSqlBackend* be,
- const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table )
+static GncSqlStatement*
+build_delete_statement( GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const col_cvt_t* table )
{
GncSqlStatement* stmt;
GString* sql;
@@ -2347,14 +2317,13 @@
static gboolean
create_table( const GncSqlBackend* be, const gchar* table_name,
- const col_cvt_t* col_table, GError** pError )
+ const col_cvt_t* col_table )
{
GList* col_info_list = NULL;
g_return_val_if_fail( be != NULL, FALSE );
g_return_val_if_fail( table_name != NULL, FALSE );
g_return_val_if_fail( col_table != NULL, FALSE );
- g_return_val_if_fail( pError != NULL, FALSE );
for( ; col_table->col_name != NULL; col_table++ ) {
col_type_handler_t* pHandler;
@@ -2368,11 +2337,11 @@
gboolean
gnc_sql_create_table( const GncSqlBackend* be, const gchar* table_name,
- gint table_version, const col_cvt_t* col_table, GError** error )
+ gint table_version, const col_cvt_t* col_table )
{
gboolean ok;
- ok = create_table( be, table_name, col_table, error );
+ ok = create_table( be, table_name, col_table );
if( ok ) {
register_table_version( be, table_name, table_version );
}
@@ -2461,12 +2430,8 @@
}
} else {
gboolean ok;
- GError* error = NULL;
- ok = create_table( be, VERSION_TABLE_NAME, version_table, &error );
- if( error != NULL ) {
- PERR( "Error creating versions table: %s\n", error->message );
- }
+ ok = create_table( be, VERSION_TABLE_NAME, version_table );
}
}
@@ -2476,18 +2441,14 @@
*
* @param be Backend struct
*/
-void
-gnc_sql_reset_version_info( GncSqlBackend* be )
+static void
+reset_version_info( GncSqlBackend* be )
{
gboolean ok;
- GError* error = NULL;
g_return_if_fail( be != NULL );
- ok = create_table( be, VERSION_TABLE_NAME, version_table, &error );
- if( error != NULL ) {
- PERR( "Error creating versions table: %s\n", error->message );
- }
+ ok = create_table( be, VERSION_TABLE_NAME, version_table );
if( be->versions == NULL ) {
be->versions = g_hash_table_new_full( g_str_hash, g_str_equal, g_free, NULL );
} else {
@@ -2536,7 +2497,7 @@
VERSION_COL_NAME, version,
TABLE_COL_NAME, table_name );
}
- (void)gnc_sql_execute_nonselect_sql( be, sql );
+ execute_nonselect_sql( be, sql );
}
g_hash_table_insert( be->versions, g_strdup( table_name ), GINT_TO_POINTER(version) );
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.h
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.h 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.h 2008-06-14 15:23:34 UTC (rev 17233)
@@ -225,6 +225,8 @@
(RESULT)->dispose(RESULT)
/**
+ * @struct GncSqlDataType_t
+ *
* Struct used to pass in a new data type for GDA storage. This contains
* the set of callbacks to read and write GDA for new data objects.. New
* types should register an instance of this object with the engine.
@@ -245,12 +247,12 @@
const gchar * type_name; /* The XML tag for this type */
void (*commit)( QofInstance* inst, GncSqlBackend* be );
- void (*initial_load)( GncSqlBackend* pBackend );
- void (*create_tables)( GncSqlBackend* pBackend );
- gpointer (*compile_query)( GncSqlBackend* pBackend, QofQuery* pQuery );
- void (*run_query)( GncSqlBackend* pBackend, gpointer pQuery );
- void (*free_query)( GncSqlBackend* pBackend, gpointer pQuery );
- void (*write)( GncSqlBackend* pBackend );
+ void (*initial_load)( GncSqlBackend* be );
+ void (*create_tables)( GncSqlBackend* be );
+ gpointer (*compile_query)( GncSqlBackend* be, QofQuery* pQuery );
+ void (*run_query)( GncSqlBackend* be, gpointer pQuery );
+ void (*free_query)( GncSqlBackend* be, gpointer pQuery );
+ void (*write)( GncSqlBackend* be );
} GncSqlDataType_t;
// Type for conversion of db row to object.
@@ -308,77 +310,246 @@
GNC_SQL_ADD_GVALUE_TO_SLIST_FN add_gvalue_to_slist_fn;
} col_type_handler_t;
+/**
+ * Creates a GncSqlColumnInfo structure for a column.
+ *
+ * @param table_row DB table column
+ * @param type Type name
+ * @param size Field size (if string)
+ * @return Column info
+ */
GncSqlColumnInfo* gnc_sql_create_column_info( const col_cvt_t* table_row, const gchar* type, gint size );
+
+/**
+ * Returns the QOF access function for a column.
+ *
+ * @param obj_name QOF object type name
+ * @param table_row DB table column
+ * @return Access function
+ */
QofAccessFunc gnc_sql_get_getter( QofIdTypeConst obj_name, const col_cvt_t* table_row );
+/**
+ * Adds a column name to a list. If the column type spans multiple columns,
+ * all of the column names for the pieces are added.
+ *
+ * @param table_row DB table column
+ * @pList List
+ */
void gnc_sql_add_colname_to_list( const col_cvt_t* table_row, GList** pList );
-gboolean gnc_sql_do_db_operation( GncSqlBackend* pBackend,
+/**
+ * Performs an operation on the database.
+ *
+ * @param be SQL backend struct
+ * @param op Operation type
+ * @param table_name SQL table name
+ * @param obj_name QOF object type name
+ * @param pObject Gnucash object
+ * @param table DB table description
+ * @return TRUE if successful, FALSE if not
+ */
+gboolean gnc_sql_do_db_operation( GncSqlBackend* be,
E_DB_OPERATION op,
const gchar* table_name,
QofIdTypeConst obj_name,
gpointer pObject,
const col_cvt_t* table );
-GncSqlStatement* gnc_sql_build_insert_statement( GncSqlBackend* pBackend,
- const gchar* table_name,
- QofIdTypeConst obj_name,
- gpointer pObject,
- const col_cvt_t* table );
-GncSqlStatement* gnc_sql_build_update_statement( GncSqlBackend* pBackend,
- const gchar* table_name,
- QofIdTypeConst obj_name,
- gpointer pObject,
- const col_cvt_t* table );
-GncSqlStatement* gnc_sql_build_delete_statement( GncSqlBackend* pBackend,
- const gchar* table_name,
- QofIdTypeConst obj_name,
- gpointer pObject,
- const col_cvt_t* table );
-gint gnc_sql_execute_statement( GncSqlBackend* pBackend, GncSqlStatement* statement );
-GncSqlResult* gnc_sql_execute_select_statement( GncSqlBackend* pBackend, GncSqlStatement* statement );
-GncSqlResult* gnc_sql_execute_select_sql( const GncSqlBackend* pBackend, gchar* sql );
-gint gnc_sql_execute_nonselect_sql( const GncSqlBackend* pBackend, gchar* sql );
-GncSqlStatement* gnc_sql_create_statement_from_sql( const GncSqlBackend* pBackend, gchar* sql );
-int gnc_sql_execute_select_get_count( const GncSqlBackend* pBackend, gchar* sql );
-int gnc_sql_execute_statement_get_count( GncSqlBackend* pBackend, GncSqlStatement* statement );
+
+/**
+ * Execute an SQL SELECT statement.
+ *
+ * @param be SQL backend struct
+ * @param statement Statement
+ * @return Results
+ */
+GncSqlResult* gnc_sql_execute_select_statement( GncSqlBackend* be, GncSqlStatement* statement );
+
+/**
+ * Executes an SQL SELECT statement from an SQL char string.
+ *
+ * @param be SQL backend struct
+ * @param sql SQL SELECT string
+ * @return Results
+ */
+GncSqlResult* gnc_sql_execute_select_sql( const GncSqlBackend* be, gchar* sql );
+
+/**
+ * Creates a statement from an SQL char string.
+ *
+ * @param be SQL backend struct
+ * @param sql SQL char string
+ * @return Statement
+ */
+GncSqlStatement* gnc_sql_create_statement_from_sql( const GncSqlBackend* be, gchar* sql );
+
+/**
+ * Loads a Gnucash object from the database.
+ *
+ * @param be SQL backend struct
+ * @param row DB result row
+ * @param obj_name QOF object type name
+ * @param pObject Object to be loaded
+ * @param table DB table description
+ */
void gnc_sql_load_object( const GncSqlBackend* be, GncSqlRow* row,
QofIdTypeConst obj_name, gpointer pObject,
const col_cvt_t* table );
+
+/**
+ * Checks whether an object is in the database or not.
+ *
+ * @param be SQL backend struct
+ * @param table_name DB table name
+ * @param obj_name QOF object type name
+ * @param pObject Object to be checked
+ * @param table DB table description
+ * @return TRUE if the object is in the database, FALSE otherwise
+ */
gboolean gnc_sql_object_is_it_in_db( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, const gpointer pObject,
const col_cvt_t* table );
+
+/**
+ * Returns the version number for a DB table.
+ *
+ * @param be SQL backend struct
+ * @param table_name Table name
+ * @return Version number, or 0 if the table does not exist
+ */
gint gnc_sql_get_table_version( const GncSqlBackend* be, const gchar* table_name );
+
+/**
+ * Creates a table in the database
+ *
+ * @param be SQL backend struct
+ * @param table_name Table name
+ * @param table_version Table version
+ * @param col_table DB table description
+ * @return TRUE if successful, FALSE if unsuccessful
+ */
gboolean gnc_sql_create_table( const GncSqlBackend* be, const gchar* table_name,
- gint table_version, const col_cvt_t* col_table,
- GError** error );
+ gint table_version, const col_cvt_t* col_table );
+
+/**
+ * Creates an index in the database
+ *
+ * @param be SQL backend struct
+ * @param index_name Index name
+ * @param table_name Table name
+ * @param col_table Columns that the index should index
+ */
void gnc_sql_create_index( const GncSqlBackend* be, const gchar* index_name,
const gchar* table_name, const col_cvt_t* col_table );
+
+/**
+ * Loads the object guid from a database row. The table must have a column
+ * named "guid" with type CT_GUID.
+ *
+ * @param be SQL backend struct
+ * @param row Database row
+ * @return GUID
+ */
const GUID* gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row );
+
+/**
+ * Loads the transaction guid from a database row. The table must have a column
+ * named "tx_guid" with type CT_GUID.
+ *
+ * @param be SQL backend struct
+ * @param row Database row
+ * @return GUID
+ */
const GUID* gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row );
-GncSqlStatement* gnc_sql_create_select_statement( const GncSqlBackend* be, const gchar* table_name,
- const col_cvt_t* col_table );
+
+/**
+ * Creates a basic SELECT statement for a table.
+ *
+ * @param be SQL backend struct
+ * @param table_name Table name
+ * @return Statement
+ */
+GncSqlStatement* gnc_sql_create_select_statement( const GncSqlBackend* be,
+ const gchar* table_name );
+
+/**
+ * Registers a column handler for a new column type.
+ *
+ * @param colType Column type
+ * @param handler Column handler
+ */
void gnc_sql_register_col_type_handler( const gchar* colType, const col_type_handler_t* handler );
-void gnc_sql_register_standard_col_type_handlers( void );
-void gnc_sql_add_gvalue_objectref_guid_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList );
+/**
+ * Adds a GValue for an object reference GUID to the end of a GSList.
+ *
+ * @param be SQL backend struct
+ * @param obj_name QOF object type name
+ * @param pObject Object
+ * @param table_row DB table column description
+ * @param pList List
+ */
+void gnc_sql_add_gvalue_objectref_guid_to_slist( const GncSqlBackend* be,
+ QofIdTypeConst obj_name, const gpointer pObject,
+ const col_cvt_t* table_row, GSList** pList );
+
+/**
+ * Adds a column info structure for an object reference GUID to the end of a
+ * GList.
+ *
+ * @param be SQL backend struct
+ * @param table_row DB table column description
+ * @param pList List
+ */
void gnc_sql_add_objectref_guid_col_info_to_list( const GncSqlBackend* be,
const col_cvt_t* table_row, GList** pList );
+
+/**
+ * Appends the ascii strings for a list of GUIDs to the end of an SQL string.
+ *
+ * @param str SQL string
+ * @param list List of GUIDs
+ * @param maxCount Max # of GUIDs to append
+ * @return Number of GUIDs appended
+ */
guint gnc_sql_append_guid_list_to_sql( GString* str, GList* list, guint maxCount );
-void gnc_sql_add_subtable_colnames_to_list( const col_cvt_t* table_row, const col_cvt_t* subtable,
+
+/**
+ * Appends column names for a subtable to the end of a GList.
+ *
+ * @param table_row Main DB column description
+ * @param subtable Sub-column description table
+ * @param pList List
+ */
+void gnc_sql_add_subtable_colnames_to_list( const col_cvt_t* table_row,
+ const col_cvt_t* subtable,
GList** pList );
+
+/**
+ * Returns a string corresponding to the SQL representation of a GValue. The
+ * caller must free the string.
+ *
+ * @param conn SQL connection
+ * @param value Value to be converted
+ * @return String
+ */
gchar* gnc_sql_get_sql_value( const GncSqlConnection* conn, const GValue* value );
-void _retrieve_guid_( gpointer pObject, gpointer pValue );
+/**
+ * Initializes DB table version information.
+ *
+ * @param be SQL backend struct
+ */
void gnc_sql_init_version_info( GncSqlBackend* be );
-void gnc_sql_reset_version_info( GncSqlBackend* be );
+
+/**
+ * Finalizes DB table version information.
+ *
+ * @param be SQL backend struct
+ */
void gnc_sql_finalize_version_info( GncSqlBackend* be );
-G_MODULE_EXPORT const gchar *
-g_module_check_init( GModule *module );
+void _retrieve_guid_( gpointer pObject, gpointer pValue );
-G_MODULE_EXPORT void
-qof_backend_module_init(void);
-
#endif /* GNC_BACKEND_SQL_H_ */
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-book-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-book-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-book-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -157,7 +157,7 @@
g_return_if_fail( be != NULL );
- stmt = gnc_sql_create_select_statement( be, BOOK_TABLE, col_table );
+ stmt = gnc_sql_create_select_statement( be, BOOK_TABLE );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -185,12 +185,7 @@
version = gnc_sql_get_table_version( be, BOOK_TABLE );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, BOOK_TABLE, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, BOOK_TABLE, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-budget-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-budget-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-budget-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -97,7 +97,7 @@
g_return_if_fail( be != NULL );
- stmt = gnc_sql_create_select_statement( be, BUDGET_TABLE, col_table );
+ stmt = gnc_sql_create_select_statement( be, BUDGET_TABLE );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -125,12 +125,7 @@
version = gnc_sql_get_table_version( be, BUDGET_TABLE );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, BUDGET_TABLE, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, BUDGET_TABLE, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-commodity-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-commodity-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-commodity-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -136,7 +136,7 @@
gnc_commodity_table* pTable;
pTable = gnc_commodity_table_get_table( be->primary_book );
- stmt = gnc_sql_create_select_statement( be, COMMODITIES_TABLE, col_table );
+ stmt = gnc_sql_create_select_statement( be, COMMODITIES_TABLE );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -177,12 +177,7 @@
version = gnc_sql_get_table_version( be, COMMODITIES_TABLE );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, COMMODITIES_TABLE, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, COMMODITIES_TABLE, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-lots-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-lots-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-lots-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -122,7 +122,7 @@
g_return_if_fail( be != NULL );
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME, col_table );
+ stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -152,12 +152,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-price-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-price-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-price-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -91,7 +91,7 @@
pBook = be->primary_book;
pPriceDB = gnc_book_get_pricedb( pBook );
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME, col_table );
+ stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -126,12 +126,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-recurrence-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-recurrence-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-recurrence-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -320,12 +320,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-schedxaction-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-schedxaction-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-schedxaction-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -217,7 +217,7 @@
g_return_if_fail( be != NULL );
- stmt = gnc_sql_create_select_statement( be, SCHEDXACTION_TABLE, col_table );
+ stmt = gnc_sql_create_select_statement( be, SCHEDXACTION_TABLE );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -255,12 +255,7 @@
version = gnc_sql_get_table_version( be, SCHEDXACTION_TABLE );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, SCHEDXACTION_TABLE, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, SCHEDXACTION_TABLE, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-slots-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-slots-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-slots-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -531,7 +531,6 @@
static void
create_slots_tables( GncSqlBackend* be )
{
- GError* error = NULL;
gboolean ok;
gint version;
@@ -539,15 +538,12 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- g_critical( "Unable to create SLOTS table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
#if 0
// FIXME: Create index
ok = gnc_sql_create_index( be, "slots_guid_index", TABLE_NAME, obj_guid_col_table, &error );
if( !ok ) {
- g_critical( "Unable to create index: %s\n", error->message );
+ PERR( "Unable to create index: %s\n", error->message );
}
#endif
}
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-transaction-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-transaction-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-transaction-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -385,22 +385,12 @@
version = gnc_sql_get_table_version( be, TRANSACTION_TABLE );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TRANSACTION_TABLE, TX_TABLE_VERSION, tx_col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TRANSACTION_TABLE, TX_TABLE_VERSION, tx_col_table );
}
version = gnc_sql_get_table_version( be, SPLIT_TABLE );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, SPLIT_TABLE, SPLIT_TABLE_VERSION, split_col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, SPLIT_TABLE, SPLIT_TABLE_VERSION, split_col_table );
}
}
/* ================================================================= */
Deleted: gnucash/branches/gda-dev2/src/backend/sql/gncmod-backend-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gncmod-backend-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/backend/sql/gncmod-backend-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -1,63 +0,0 @@
-/*********************************************************************
- * gncmod-backend-gda.c
- * module definition/initialization for the gda backend module
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-
-#include <stdio.h>
-#include <gmodule.h>
-/* #include <glib-gobject.h> */
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-/* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int gnc_module_current = 0;
-int gnc_module_revision = 0;
-int gnc_module_age = 0;
-
-static GNCModule engine;
-
-gchar *
-gnc_module_path(void)
-{
- return g_strdup("gnucash/backend/gda");
-}
-
-gchar *
-gnc_module_description(void)
-{
- return g_strdup("The GDA/SQL backend for GnuCash");
-}
-
-int
-gnc_module_init(int refcount)
-{
- engine = gnc_module_load("gnucash/engine", 0);
- if(!engine) return FALSE;
-
- /* Need to initialize g-type engine for gconf */
- if (refcount == 0) {
- g_type_init();
- }
-
- return TRUE;
-}
-
-int
-gnc_module_end(int refcount)
-{
- int unload = TRUE;
-
- if (engine)
- unload = gnc_module_unload(engine);
-
- if (refcount == 0)
- engine = NULL;
-
- return unload;
-}
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-bill-term-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-bill-term-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-bill-term-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -119,7 +119,7 @@
pBook = be->primary_book;
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME, col_table );
+ stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -153,12 +153,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-customer-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-customer-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-customer-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -109,7 +109,7 @@
pBook = be->primary_book;
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME, col_table );
+ stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -134,12 +134,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-employee-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-employee-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-employee-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -106,7 +106,7 @@
pBook = be->primary_book;
pTable = gnc_commodity_table_get_table( pBook );
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME, col_table );
+ stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -130,12 +130,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-entry-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-entry-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-entry-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -128,7 +128,7 @@
pBook = be->primary_book;
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME, col_table );
+ stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -153,12 +153,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-invoice-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-invoice-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-invoice-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -113,7 +113,7 @@
pBook = be->primary_book;
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME, col_table );
+ stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -138,12 +138,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-job-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-job-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-job-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -96,7 +96,7 @@
pBook = be->primary_book;
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME, col_table );
+ stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -121,12 +121,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-order-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-order-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-order-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -97,7 +97,7 @@
pBook = be->primary_book;
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME, col_table );
+ stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -122,12 +122,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-tax-table-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-tax-table-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-tax-table-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -232,7 +232,7 @@
g_return_if_fail( be != NULL );
/* First time, create the query */
- stmt = gnc_sql_create_select_statement( be, TT_TABLE_NAME, tt_col_table );
+ stmt = gnc_sql_create_select_statement( be, TT_TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -257,22 +257,12 @@
version = gnc_sql_get_table_version( be, TT_TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TT_TABLE_NAME, TT_TABLE_VERSION, tt_col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TT_TABLE_NAME, TT_TABLE_VERSION, tt_col_table );
}
version = gnc_sql_get_table_version( be, TTENTRIES_TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TTENTRIES_TABLE_NAME, TTENTRIES_TABLE_VERSION, ttentries_col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TTENTRIES_TABLE_NAME, TTENTRIES_TABLE_VERSION, ttentries_col_table );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-vendor-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-vendor-sql.c 2008-06-14 14:05:01 UTC (rev 17232)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-vendor-sql.c 2008-06-14 15:23:34 UTC (rev 17233)
@@ -110,7 +110,7 @@
pBook = be->primary_book;
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME, col_table );
+ stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
result = gnc_sql_execute_select_statement( be, stmt );
gnc_sql_statement_dispose( stmt );
if( result != NULL ) {
@@ -135,12 +135,7 @@
version = gnc_sql_get_table_version( be, TABLE_NAME );
if( version == 0 ) {
- GError* error = NULL;
-
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table, &error );
- if( error != NULL ) {
- PERR( "Error creating table: %s\n", error->message );
- }
+ gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
More information about the gnucash-changes
mailing list