r18971 - gnucash/trunk/src - Re-indentation of source code (sql parts).
Christian Stimming
cstim at code.gnucash.org
Sat Mar 27 17:02:18 EDT 2010
Author: cstim
Date: 2010-03-27 17:02:18 -0400 (Sat, 27 Mar 2010)
New Revision: 18971
Trac: http://svn.gnucash.org/trac/changeset/18971
Modified:
gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
gnucash/trunk/src/backend/dbi/test/test-dbi-basic.c
gnucash/trunk/src/backend/sql/escape.c
gnucash/trunk/src/backend/sql/gnc-account-sql.c
gnucash/trunk/src/backend/sql/gnc-backend-sql.c
gnucash/trunk/src/backend/sql/gnc-book-sql.c
gnucash/trunk/src/backend/sql/gnc-budget-sql.c
gnucash/trunk/src/backend/sql/gnc-commodity-sql.c
gnucash/trunk/src/backend/sql/gnc-lots-sql.c
gnucash/trunk/src/backend/sql/gnc-price-sql.c
gnucash/trunk/src/backend/sql/gnc-recurrence-sql.c
gnucash/trunk/src/backend/sql/gnc-schedxaction-sql.c
gnucash/trunk/src/backend/sql/gnc-slots-sql.c
gnucash/trunk/src/backend/sql/gnc-transaction-sql.c
gnucash/trunk/src/business/business-core/sql/gnc-bill-term-sql.c
gnucash/trunk/src/business/business-core/sql/gnc-tax-table-sql.c
gnucash/trunk/src/business/business-core/sql/test/test-dbi-business.c
Log:
Re-indentation of source code (sql parts).
This also strips trailing whitespaces from lines where they existed.
This re-indentation was done using astyle-1.24 using the following options:
astyle --indent=spaces=4 --brackets=break --pad-oper --pad-header --suffix
Modified: gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
===================================================================
--- gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -152,10 +152,10 @@
provider_functions_t* provider;
gint last_error; // Code of the last error that occurred. This is set in the error callback function
gint error_repeat; // Used in case of transient errors. After such error, another attempt at the
- // original call is allowed. error_repeat tracks the number of attempts and can
- // be used to prevent infinite loops.
+ // original call is allowed. error_repeat tracks the number of attempts and can
+ // be used to prevent infinite loops.
gboolean retry; // Signals the calling function that it should retry (the error handler detected
- // transient error and managed to resolve it, but it can't run the original query)
+ // transient error and managed to resolve it, but it can't run the original query)
} GncDbiSqlConnection;
#define DBI_MAX_CONN_ATTEMPTS 5
@@ -323,7 +323,8 @@
{
PERR( "DBI error: %s - Failed to reconnect after %d attempts.\n", msg, DBI_MAX_CONN_ATTEMPTS );
gnc_dbi_set_error( dbi_conn, ERR_BACKEND_CANT_CONNECT, 0, FALSE );
- } else
+ }
+ else
{
PINFO( "DBI error: %s - Reconnecting...\n", msg );
gnc_dbi_set_error( dbi_conn, ERR_BACKEND_CONN_LOST, 1, TRUE );
@@ -811,10 +812,12 @@
const gchar* table_name = (const gchar*)node->data;
dbi_result result;
- do {
+ do
+ {
gnc_dbi_init_error( ((GncDbiSqlConnection*)(be->sql_be.conn)) );
result = dbi_conn_queryf( be->conn, "DROP TABLE %s", table_name );
- } while ( ((GncDbiSqlConnection*)(be->sql_be.conn))->retry );
+ }
+ while ( ((GncDbiSqlConnection*)(be->sql_be.conn))->retry );
if ( result != NULL )
{
status = dbi_result_free( result );
@@ -1445,10 +1448,12 @@
dbi_result result;
DEBUG( "SQL: %s\n", dbi_stmt->sql->str );
- do {
+ do
+ {
gnc_dbi_init_error( dbi_conn );
result = dbi_conn_query( dbi_conn->conn, dbi_stmt->sql->str );
- } while ( dbi_conn->retry );
+ }
+ while ( dbi_conn->retry );
if ( result == NULL )
{
PERR( "Error executing SQL %s\n", dbi_stmt->sql->str );
@@ -1467,10 +1472,12 @@
gint status;
DEBUG( "SQL: %s\n", dbi_stmt->sql->str );
- do {
+ do
+ {
gnc_dbi_init_error( dbi_conn );
result = dbi_conn_query( dbi_conn->conn, dbi_stmt->sql->str );
- } while( dbi_conn->retry );
+ }
+ while ( dbi_conn->retry );
if ( result == NULL )
{
PERR( "Error executing SQL %s\n", dbi_stmt->sql->str );
@@ -1549,10 +1556,12 @@
DEBUG( "BEGIN\n" );
- do {
+ do
+ {
gnc_dbi_init_error( dbi_conn );
result = dbi_conn_queryf( dbi_conn->conn, "BEGIN" );
- } while( dbi_conn->retry );
+ }
+ while ( dbi_conn->retry );
status = dbi_result_free( result );
if ( status < 0 )
Modified: gnucash/trunk/src/backend/dbi/test/test-dbi-basic.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/test-dbi-basic.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/dbi/test/test-dbi-basic.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -54,7 +54,7 @@
struct timeval tv;
gnc_commodity_table* table;
gnc_commodity* currency;
-
+
table = gnc_commodity_table_get_table( book );
currency = gnc_commodity_table_lookup( table, GNC_COMMODITY_NS_CURRENCY, "CAD" );
@@ -110,7 +110,7 @@
filename = tempnam( "/tmp", "test-sqlite3-" );
printf( "Using filename: %s\n", filename );
test_dbi_store_and_reload( "sqlite3", session_1, filename );
- #if 0
+#if 0
printf( "TEST_MYSQL_URL='%s'\n", TEST_MYSQL_URL );
if ( strlen( TEST_MYSQL_URL ) > 0 )
{
@@ -123,7 +123,7 @@
session_1 = create_session();
test_dbi_store_and_reload( "pgsql", session_1, TEST_PGSQL_URL );
}
- #endif
+#endif
print_test_results();
qof_close();
exit(get_rv());
Modified: gnucash/trunk/src/backend/sql/escape.c
===================================================================
--- gnucash/trunk/src/backend/sql/escape.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/escape.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -35,90 +35,93 @@
#include "gnc-engine.h"
#include "escape.h"
-static QofLogModule log_module = GNC_MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
/* ================================================ */
-struct _escape {
- /* pointer to memory used for escaping arguments */
- char * escape;
- size_t esc_buflen;
+struct _escape
+{
+ /* pointer to memory used for escaping arguments */
+ char * escape;
+ size_t esc_buflen;
};
/* ================================================ */
-/* escape single-quote marks and backslashes so that the
- * database SQL parser doesn't puke on the query string
+/* escape single-quote marks and backslashes so that the
+ * database SQL parser doesn't puke on the query string
*/
const char *
sqlEscapeString (sqlEscape *b, const char *str)
{
- const char *p, *src_head;
- char *dst_tail;
- size_t len, slen;
+ const char *p, *src_head;
+ char *dst_tail;
+ size_t len, slen;
- ENTER("str = %s", str);
-
- if (!b || !str) { LEAVE("(null) args"); return NULL; }
+ ENTER("str = %s", str);
- /* if a string is escaped twice, just return the first */
- if (b->escape == str) {
- LEAVE("%s: already escaped", str);
- return str;
- }
+ if (!b || !str) { LEAVE("(null) args"); return NULL; }
- /* if nothing to escape, just return */
- len = strlen (str);
- slen = strcspn (str, "\\\'");
- if (len == slen) {
- LEAVE("nothing to escape");
- return str;
- }
+ /* if a string is escaped twice, just return the first */
+ if (b->escape == str)
+ {
+ LEAVE("%s: already escaped", str);
+ return str;
+ }
- /* count to see how much space we'll need */
- p = str + slen + 1;
- while (*p)
- {
- len ++;
- p += 1 + strcspn (p, "\\\'");
- }
+ /* if nothing to escape, just return */
+ len = strlen (str);
+ slen = strcspn (str, "\\\'");
+ if (len == slen)
+ {
+ LEAVE("nothing to escape");
+ return str;
+ }
- /* get more space, if needed */
- if (len >= b->esc_buflen)
- {
- b->escape = g_realloc(b->escape, len+100);
- b->esc_buflen = len+100;
- }
+ /* count to see how much space we'll need */
+ p = str + slen + 1;
+ while (*p)
+ {
+ len ++;
+ p += 1 + strcspn (p, "\\\'");
+ }
- /* copy and escape */
- src_head = (char *) str;
- dst_tail = b->escape;
- p = src_head + strcspn (src_head, "\\\'");
- while (*p)
- {
- size_t cp_len = p - src_head;
+ /* get more space, if needed */
+ if (len >= b->esc_buflen)
+ {
+ b->escape = g_realloc(b->escape, len + 100);
+ b->esc_buflen = len + 100;
+ }
- strncpy (dst_tail, src_head, cp_len);
- dst_tail += cp_len;
- *dst_tail = '\\';
- dst_tail ++;
- *dst_tail = *p;
- dst_tail ++;
+ /* copy and escape */
+ src_head = (char *) str;
+ dst_tail = b->escape;
+ p = src_head + strcspn (src_head, "\\\'");
+ while (*p)
+ {
+ size_t cp_len = p - src_head;
- src_head = p+1;
- p = src_head + strcspn (src_head, "\\\'");
- }
- if (p != src_head)
- {
- size_t cp_len = p - src_head;
+ strncpy (dst_tail, src_head, cp_len);
+ dst_tail += cp_len;
+ *dst_tail = '\\';
+ dst_tail ++;
+ *dst_tail = *p;
+ dst_tail ++;
- strncpy (dst_tail, src_head, cp_len);
- dst_tail += cp_len;
- }
- *dst_tail = 0;
+ src_head = p + 1;
+ p = src_head + strcspn (src_head, "\\\'");
+ }
+ if (p != src_head)
+ {
+ size_t cp_len = p - src_head;
- LEAVE("b->escape = %s", b->escape);
- return b->escape;
+ strncpy (dst_tail, src_head, cp_len);
+ dst_tail += cp_len;
+ }
+ *dst_tail = 0;
+
+ LEAVE("b->escape = %s", b->escape);
+ return b->escape;
}
/* ================================================ */
@@ -128,11 +131,11 @@
sqlEscape *
sqlEscape_new (void)
{
- sqlEscape *b = g_new (sqlEscape, 1);
+ sqlEscape *b = g_new (sqlEscape, 1);
- b->escape = g_malloc (INITIAL_BUFSZ);
- b->esc_buflen = INITIAL_BUFSZ;
- return (b);
+ b->escape = g_malloc (INITIAL_BUFSZ);
+ b->esc_buflen = INITIAL_BUFSZ;
+ return (b);
}
/* ================================================ */
@@ -141,10 +144,11 @@
sqlEscape_destroy (sqlEscape *b)
{
ENTER(" ");
- if (!b) { LEAVE("b is (null)"); return; }
- g_free (b->escape); b->escape = NULL;
- g_free (b);
- LEAVE(" ");
+ if (!b) { LEAVE("b is (null)"); return; }
+ g_free (b->escape);
+ b->escape = NULL;
+ g_free (b);
+ LEAVE(" ");
}
/* ================ END OF FILE ==================== */
Modified: gnucash/trunk/src/backend/sql/gnc-account-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-account-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/gnc-account-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
/** @file gnc-account-sql.c
- * @brief load and save data to SQL
+ * @brief load and save data to SQL
* @author Copyright (c) 2006-2008 Phil Longstaff <plongstaff at rogers.com>
*
* This file implements the top-level QofBackend API for saving/
@@ -62,33 +62,36 @@
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
- { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ /*@ -full_init_block @*/
+ { "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "name", CT_STRING, ACCOUNT_MAX_NAME_LEN, COL_NNUL, "name" },
{ "account_type", CT_STRING, ACCOUNT_MAX_TYPE_LEN, COL_NNUL, NULL, ACCOUNT_TYPE_ },
{ "commodity_guid", CT_COMMODITYREF, 0, 0, "commodity" },
- { "commodity_scu", CT_INT, 0, COL_NNUL, "commodity-scu" },
- { "non_std_scu", CT_BOOLEAN, 0, COL_NNUL, "non-std-scu" },
- { "parent_guid", CT_GUID, 0, 0, NULL, NULL,
- (QofAccessFunc)get_parent, set_parent },
+ { "commodity_scu", CT_INT, 0, COL_NNUL, "commodity-scu" },
+ { "non_std_scu", CT_BOOLEAN, 0, COL_NNUL, "non-std-scu" },
+ {
+ "parent_guid", CT_GUID, 0, 0, NULL, NULL,
+ (QofAccessFunc)get_parent, set_parent
+ },
{ "code", CT_STRING, ACCOUNT_MAX_CODE_LEN, 0, "code" },
{ "description", CT_STRING, ACCOUNT_MAX_DESCRIPTION_LEN, 0, "description" },
- { "hidden", CT_BOOLEAN, 0, 0, "hidden" },
- { "placeholder", CT_BOOLEAN, 0, 0, "placeholder" },
+ { "hidden", CT_BOOLEAN, 0, 0, "hidden" },
+ { "placeholder", CT_BOOLEAN, 0, 0, "placeholder" },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
static GncSqlColumnTableEntry parent_col_table[] =
{
- /*@ -full_init_block @*/
+ /*@ -full_init_block @*/
{ "parent_guid", CT_GUID, 0, 0, NULL, NULL, NULL, set_parent_guid },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
-typedef struct {
- /*@ dependent @*/ Account* pAccount;
- GncGUID guid;
+typedef struct
+{
+ /*@ dependent @*/ Account* pAccount;
+ GncGUID guid;
} account_parent_guid_struct;
/* ================================================================= */
@@ -100,36 +103,41 @@
const Account* pParent;
const GncGUID* parent_guid;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_ACCOUNT(pObject), NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( GNC_IS_ACCOUNT(pObject), NULL );
pAccount = GNC_ACCOUNT(pObject);
pParent = gnc_account_get_parent( pAccount );
- if( pParent == NULL ) {
+ if ( pParent == NULL )
+ {
parent_guid = NULL;
- } else {
+ }
+ else
+ {
parent_guid = qof_instance_get_guid( QOF_INSTANCE(pParent) );
}
return (gpointer)parent_guid;
}
-static void
+static void
set_parent( gpointer pObject, /*@ null @*/ gpointer pValue )
{
Account* pAccount;
QofBook* pBook;
GncGUID* guid = (GncGUID*)pValue;
Account* pParent;
-
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( GNC_IS_ACCOUNT(pObject) );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( GNC_IS_ACCOUNT(pObject) );
+
pAccount = GNC_ACCOUNT(pObject);
pBook = qof_instance_get_book( QOF_INSTANCE(pAccount) );
- if( guid != NULL ) {
+ if ( guid != NULL )
+ {
pParent = xaccAccountLookup( guid, pBook );
- if( pParent != NULL ) {
+ if ( pParent != NULL )
+ {
gnc_account_append_child( pParent, pAccount );
}
}
@@ -138,50 +146,53 @@
static void
set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
{
- account_parent_guid_struct* s = (account_parent_guid_struct*)pObject;
+ account_parent_guid_struct* s = (account_parent_guid_struct*)pObject;
GncGUID* guid = (GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pValue != NULL );
- s->guid = *guid;
+ s->guid = *guid;
}
static /*@ dependent @*//*@ null @*/ Account*
load_single_account( GncSqlBackend* be, GncSqlRow* row,
- GList** l_accounts_needing_parents )
+ GList** l_accounts_needing_parents )
{
const GncGUID* guid;
- Account* pAccount = NULL;
+ Account* pAccount = NULL;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
- g_return_val_if_fail( l_accounts_needing_parents != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail( l_accounts_needing_parents != NULL, NULL );
guid = gnc_sql_load_guid( be, row );
- if( guid != NULL ) {
- pAccount = xaccAccountLookup( guid, be->primary_book );
- }
- if( pAccount == NULL ) {
+ if ( guid != NULL )
+ {
+ pAccount = xaccAccountLookup( guid, be->primary_book );
+ }
+ if ( pAccount == NULL )
+ {
pAccount = xaccMallocAccount( be->primary_book );
}
- xaccAccountBeginEdit( pAccount );
+ xaccAccountBeginEdit( pAccount );
gnc_sql_load_object( be, row, GNC_ID_ACCOUNT, pAccount, col_table );
- xaccAccountCommitEdit( pAccount );
+ xaccAccountCommitEdit( pAccount );
- /* If we don't have a parent and this isn't the root account, it might be because the parent
- account hasn't been loaded yet. Remember the account and its parent guid for later. */
- if( gnc_account_get_parent( pAccount ) == NULL
- && pAccount != gnc_book_get_root_account( be->primary_book ) ) {
- account_parent_guid_struct* s = g_malloc( (gsize)sizeof(account_parent_guid_struct) );
- g_assert( s != NULL );
+ /* If we don't have a parent and this isn't the root account, it might be because the parent
+ account hasn't been loaded yet. Remember the account and its parent guid for later. */
+ if ( gnc_account_get_parent( pAccount ) == NULL
+ && pAccount != gnc_book_get_root_account( be->primary_book ) )
+ {
+ account_parent_guid_struct* s = g_malloc( (gsize)sizeof(account_parent_guid_struct) );
+ g_assert( s != NULL );
- s->pAccount = pAccount;
- gnc_sql_load_object( be, row, GNC_ID_ACCOUNT, s, parent_col_table );
- *l_accounts_needing_parents = g_list_prepend( *l_accounts_needing_parents, s );
- }
+ s->pAccount = pAccount;
+ gnc_sql_load_object( be, row, GNC_ID_ACCOUNT, s, parent_col_table );
+ *l_accounts_needing_parents = g_list_prepend( *l_accounts_needing_parents, s );
+ }
- return pAccount;
+ return pAccount;
}
static void
@@ -191,103 +202,115 @@
GncSqlResult* result;
QofBook* pBook;
gnc_commodity_table* pTable;
- GList* l_accounts_needing_parents = NULL;
- GSList* bal_slist;
- GSList* bal;
+ GList* l_accounts_needing_parents = NULL;
+ GSList* bal_slist;
+ GSList* bal;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- ENTER( "" );
+ ENTER( "" );
pBook = be->primary_book;
pTable = gnc_commodity_table_get_table( pBook );
stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- if( stmt == NULL ) {
- LEAVE( "stmt == NULL" );
- return;
- }
+ if ( stmt == NULL )
+ {
+ LEAVE( "stmt == NULL" );
+ return;
+ }
result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
- Account* acc;
- gchar* sql;
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
+ GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ Account* acc;
+ gchar* sql;
- while( row != NULL ) {
- acc = load_single_account( be, row, &l_accounts_needing_parents );
- row = gnc_sql_result_get_next_row( result );
- }
- gnc_sql_result_dispose( result );
+ while ( row != NULL )
+ {
+ acc = load_single_account( be, row, &l_accounts_needing_parents );
+ row = gnc_sql_result_get_next_row( result );
+ }
+ gnc_sql_result_dispose( result );
- sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", TABLE_NAME );
- gnc_sql_slots_load_for_sql_subquery( be, sql, (BookLookupFn)xaccAccountLookup );
- g_free( sql );
+ sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", TABLE_NAME );
+ gnc_sql_slots_load_for_sql_subquery( be, sql, (BookLookupFn)xaccAccountLookup );
+ g_free( sql );
- /* While there are items on the list of accounts needing parents,
- try to see if the parent has now been loaded. Theory says that if
- items are removed from the front and added to the back if the
- parent is still not available, then eventually, the list will
- shrink to size 0. */
- if( l_accounts_needing_parents != NULL ) {
- gboolean progress_made = TRUE;
- Account* root;
- Account* pParent;
- GList* elem;
-
- while( progress_made ) {
- progress_made = FALSE;
- for( elem = l_accounts_needing_parents; elem != NULL; elem = g_list_next( elem ) ) {
- account_parent_guid_struct* s = (account_parent_guid_struct*)elem->data;
- pParent = xaccAccountLookup( &s->guid, be->primary_book );
- if( pParent != NULL ) {
- gnc_account_append_child( pParent, s->pAccount );
- l_accounts_needing_parents = g_list_delete_link( l_accounts_needing_parents, elem );
- progress_made = TRUE;
- }
- }
- }
-
- /* Any non-ROOT accounts left over must be parented by the root account */
- root = gnc_book_get_root_account( pBook );
- for( elem = l_accounts_needing_parents; elem != NULL; elem = g_list_next( elem ) ) {
- account_parent_guid_struct* s = (account_parent_guid_struct*)elem->data;
- if( xaccAccountGetType( s->pAccount ) != ACCT_TYPE_ROOT ) {
- gnc_account_append_child( root, s->pAccount );
- }
- }
- }
+ /* While there are items on the list of accounts needing parents,
+ try to see if the parent has now been loaded. Theory says that if
+ items are removed from the front and added to the back if the
+ parent is still not available, then eventually, the list will
+ shrink to size 0. */
+ if ( l_accounts_needing_parents != NULL )
+ {
+ gboolean progress_made = TRUE;
+ Account* root;
+ Account* pParent;
+ GList* elem;
- /* Load starting balances */
- bal_slist = gnc_sql_get_account_balances_slist( be );
- for( bal = bal_slist; bal != NULL; bal = bal->next ) {
- acct_balances_t* balances = (acct_balances_t*)bal->data;
+ while ( progress_made )
+ {
+ progress_made = FALSE;
+ for ( elem = l_accounts_needing_parents; elem != NULL; elem = g_list_next( elem ) )
+ {
+ account_parent_guid_struct* s = (account_parent_guid_struct*)elem->data;
+ pParent = xaccAccountLookup( &s->guid, be->primary_book );
+ if ( pParent != NULL )
+ {
+ gnc_account_append_child( pParent, s->pAccount );
+ l_accounts_needing_parents = g_list_delete_link( l_accounts_needing_parents, elem );
+ progress_made = TRUE;
+ }
+ }
+ }
- g_object_set( balances->acct,
- "start-balance", &balances->balance,
- "start-cleared-balance", &balances->cleared_balance,
- "start-reconciled-balance", &balances->reconciled_balance,
- NULL);
+ /* Any non-ROOT accounts left over must be parented by the root account */
+ root = gnc_book_get_root_account( pBook );
+ for ( elem = l_accounts_needing_parents; elem != NULL; elem = g_list_next( elem ) )
+ {
+ account_parent_guid_struct* s = (account_parent_guid_struct*)elem->data;
+ if ( xaccAccountGetType( s->pAccount ) != ACCT_TYPE_ROOT )
+ {
+ gnc_account_append_child( root, s->pAccount );
+ }
+ }
+ }
- }
- if( bal_slist != NULL ) {
- g_slist_free( bal_slist );
- }
- }
+ /* Load starting balances */
+ bal_slist = gnc_sql_get_account_balances_slist( be );
+ for ( bal = bal_slist; bal != NULL; bal = bal->next )
+ {
+ acct_balances_t* balances = (acct_balances_t*)bal->data;
- LEAVE( "" );
+ g_object_set( balances->acct,
+ "start-balance", &balances->balance,
+ "start-cleared-balance", &balances->cleared_balance,
+ "start-reconciled-balance", &balances->reconciled_balance,
+ NULL);
+
+ }
+ if ( bal_slist != NULL )
+ {
+ g_slist_free( bal_slist );
+ }
+ }
+
+ LEAVE( "" );
}
/* ================================================================= */
static void
create_account_tables( GncSqlBackend* be )
{
- gint version;
+ gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if( version == 0 ) {
+ version = gnc_sql_get_table_version( be, TABLE_NAME );
+ if ( version == 0 )
+ {
(void)gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
@@ -298,95 +321,114 @@
{
Account* pAcc = GNC_ACCOUNT(inst);
const GncGUID* guid;
- gboolean is_infant;
- gboolean is_ok = FALSE;
- gnc_commodity* commodity;
- gint op;
+ gboolean is_infant;
+ gboolean is_ok = FALSE;
+ gnc_commodity* commodity;
+ gint op;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_ACCOUNT(inst), FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( inst != NULL, FALSE );
+ g_return_val_if_fail( GNC_IS_ACCOUNT(inst), FALSE );
- ENTER( "inst=%p", inst );
+ ENTER( "inst=%p", inst );
- is_infant = qof_instance_get_infant( inst );
+ is_infant = qof_instance_get_infant( inst );
// If there is no commodity yet, this might be because a new account name
- // has been entered directly into the register and an account window will
- // be opened. The account info is not complete yet, but the name has been
- // set, triggering this commit
+ // has been entered directly into the register and an account window will
+ // be opened. The account info is not complete yet, but the name has been
+ // set, triggering this commit
commodity = xaccAccountGetCommodity( pAcc );
- is_ok = TRUE;
- if( qof_instance_get_destroying( inst ) ) {
- op = OP_DB_DELETE;
- } else if( be->is_pristine_db || is_infant ) {
- op = OP_DB_INSERT;
- } else {
- op = OP_DB_UPDATE;
- }
+ is_ok = TRUE;
+ if ( qof_instance_get_destroying( inst ) )
+ {
+ op = OP_DB_DELETE;
+ }
+ else if ( be->is_pristine_db || is_infant )
+ {
+ op = OP_DB_INSERT;
+ }
+ else
+ {
+ op = OP_DB_UPDATE;
+ }
// If not deleting the account, ensure the commodity is in the db
- if( op != OP_DB_DELETE && commodity != NULL ) {
- is_ok = gnc_sql_save_commodity( be, commodity );
- }
+ if ( op != OP_DB_DELETE && commodity != NULL )
+ {
+ is_ok = gnc_sql_save_commodity( be, commodity );
+ }
- if( is_ok ) {
- is_ok = gnc_sql_do_db_operation( be, op, TABLE_NAME, GNC_ID_ACCOUNT, pAcc, col_table );
- }
+ if ( is_ok )
+ {
+ is_ok = gnc_sql_do_db_operation( be, op, TABLE_NAME, GNC_ID_ACCOUNT, pAcc, col_table );
+ }
- if( is_ok ) {
- // Now, commit or delete any slots
- guid = qof_instance_get_guid( inst );
- if( !qof_instance_get_destroying(inst) ) {
- is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
- } else {
- is_ok = gnc_sql_slots_delete( be, guid );
- }
- }
+ if ( is_ok )
+ {
+ // Now, commit or delete any slots
+ guid = qof_instance_get_guid( inst );
+ if ( !qof_instance_get_destroying(inst) )
+ {
+ is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
+ }
+ else
+ {
+ is_ok = gnc_sql_slots_delete( be, guid );
+ }
+ }
- LEAVE( "is_ok=%d", is_ok );
+ LEAVE( "is_ok=%d", is_ok );
- return is_ok;
+ return is_ok;
}
/* ================================================================= */
static void
load_account_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GncGUID guid;
- Account* account = NULL;
+ Account* account = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) {
+ if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ {
(void)string_to_guid( g_value_get_string( val ), &guid );
- account = xaccAccountLookup( &guid, be->primary_book );
- if( account != NULL ) {
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, account, NULL );
- } else {
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)account );
- }
- } else {
- PWARN( "Account ref '%s' not found", g_value_get_string( val ) );
- }
- }
+ account = xaccAccountLookup( &guid, be->primary_book );
+ if ( account != NULL )
+ {
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, account, NULL );
+ }
+ else
+ {
+ g_return_if_fail( setter != NULL );
+ (*setter)( pObject, (const gpointer)account );
+ }
+ }
+ else
+ {
+ PWARN( "Account ref '%s' not found", g_value_get_string( val ) );
+ }
+ }
}
static GncSqlColumnTypeHandler account_guid_handler
- = { load_account_guid,
- gnc_sql_add_objectref_guid_col_info_to_list,
- gnc_sql_add_colname_to_list,
- gnc_sql_add_gvalue_objectref_guid_to_slist };
+= { load_account_guid,
+ gnc_sql_add_objectref_guid_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ gnc_sql_add_gvalue_objectref_guid_to_slist
+ };
/* ================================================================= */
void
gnc_sql_init_account_handler( void )
@@ -398,14 +440,14 @@
gnc_sql_save_account, /* commit */
load_all_accounts, /* initial_load */
create_account_tables, /* create_tables */
- NULL, /* compile_query */
- NULL, /* run_query */
- NULL, /* free_query */
- NULL /* write */
+ NULL, /* compile_query */
+ NULL, /* run_query */
+ NULL, /* free_query */
+ NULL /* write */
};
(void)qof_object_register_backend( GNC_ID_ACCOUNT, GNC_SQL_BACKEND, &be_data );
- gnc_sql_register_col_type_handler( CT_ACCOUNTREF, &account_guid_handler );
+ gnc_sql_register_col_type_handler( CT_ACCOUNTREF, &account_guid_handler );
}
/* ========================== END OF FILE ===================== */
Modified: gnucash/trunk/src/backend/sql/gnc-backend-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-backend-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/gnc-backend-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
/** @file gnc-backend-sql.c
- * @brief load and save data to SQL
+ * @brief load and save data to SQL
* @author Copyright (c) 2006-2008 Phil Longstaff <plongstaff at rogers.com>
*
* This file implements the top-level QofBackend API for saving/
@@ -70,35 +70,46 @@
static void update_save_progress( GncSqlBackend* be );
static void register_standard_col_type_handlers( void );
static gboolean reset_version_info( GncSqlBackend* be );
-/*@ null @*/ static GncSqlStatement* build_insert_statement( GncSqlBackend* be,
- const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table );
-/*@ null @*/ static GncSqlStatement* build_update_statement( GncSqlBackend* be,
- const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table );
-/*@ null @*/ static GncSqlStatement* build_delete_statement( GncSqlBackend* be,
- const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table );
+/*@ null @*/
+static GncSqlStatement* build_insert_statement( GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table );
+/*@ null @*/
+static GncSqlStatement* build_update_statement( GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table );
+/*@ null @*/
+static GncSqlStatement* build_delete_statement( GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table );
#define TRANSACTION_NAME "trans"
-typedef struct {
+typedef struct
+{
/*@ dependent @*/ QofIdType searchObj;
- /*@ dependent @*/ gpointer pCompiledQuery;
+ /*@ dependent @*/
+ gpointer pCompiledQuery;
} gnc_sql_query_info;
/* callback structure */
-typedef struct {
+typedef struct
+{
gboolean is_known;
- gboolean is_ok;
- /*@ dependent @*/ GncSqlBackend* be;
- /*@ dependent @*/ QofInstance* inst;
- /*@ dependent @*/ QofQuery* pQuery;
- /*@ dependent @*/ gpointer pCompiledQuery;
- /*@ owned @*/ gnc_sql_query_info* pQueryInfo;
+ gboolean is_ok;
+ /*@ dependent @*/
+ GncSqlBackend* be;
+ /*@ dependent @*/
+ QofInstance* inst;
+ /*@ dependent @*/
+ QofQuery* pQuery;
+ /*@ dependent @*/
+ gpointer pCompiledQuery;
+ /*@ owned @*/
+ gnc_sql_query_info* pQueryInfo;
} sql_backend;
static QofLogModule log_module = G_LOG_DOMAIN;
@@ -110,13 +121,14 @@
void
gnc_sql_init( /*@ unused @*/ GncSqlBackend* be )
{
- static gboolean initialized = FALSE;
+ static gboolean initialized = FALSE;
- if( !initialized ) {
- register_standard_col_type_handlers();
- gnc_sql_init_object_handlers();
- initialized = TRUE;
- }
+ if ( !initialized )
+ {
+ register_standard_col_type_handlers();
+ gnc_sql_init_object_handlers();
+ initialized = TRUE;
+ }
}
/* ================================================================= */
@@ -130,7 +142,8 @@
g_return_if_fail( type != NULL && data_p != NULL && be_p != NULL );
g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
- if( pData->create_tables != NULL ) {
+ if ( pData->create_tables != NULL )
+ {
(pData->create_tables)( be );
}
}
@@ -155,22 +168,26 @@
{
GncSqlObjectBackend* pData = data_p;
GncSqlBackend* be = be_p;
- gint i;
+ gint i;
g_return_if_fail( type != NULL && data_p != NULL && be_p != NULL );
g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
- // Don't need to load anything if it has already been loaded with the fixed order
- for( i = 0; fixed_load_order[i] != NULL; i++ ) {
- if( g_ascii_strcasecmp( type, fixed_load_order[i] ) == 0 ) return;
- }
- if( other_load_order != NULL ) {
- for( i = 0; other_load_order[i] != NULL; i++ ) {
- if( g_ascii_strcasecmp( type, other_load_order[i] ) == 0 ) return;
+ // Don't need to load anything if it has already been loaded with the fixed order
+ for ( i = 0; fixed_load_order[i] != NULL; i++ )
+ {
+ if ( g_ascii_strcasecmp( type, fixed_load_order[i] ) == 0 ) return;
+ }
+ if ( other_load_order != NULL )
+ {
+ for ( i = 0; other_load_order[i] != NULL; i++ )
+ {
+ if ( g_ascii_strcasecmp( type, other_load_order[i] ) == 0 ) return;
}
- }
+ }
- if( pData->initial_load != NULL ) {
+ if ( pData->initial_load != NULL )
+ {
(pData->initial_load)( be );
}
}
@@ -179,51 +196,59 @@
gnc_sql_load( GncSqlBackend* be, /*@ dependent @*/ QofBook *book, QofBackendLoadType loadType )
{
GncSqlObjectBackend* pData;
- gint i;
- Account* root;
+ gint i;
+ Account* root;
- g_return_if_fail( be != NULL );
- g_return_if_fail( book != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( book != NULL );
ENTER( "be=%p, book=%p", be, book );
be->loading = TRUE;
-
- if( loadType == LOAD_TYPE_INITIAL_LOAD ) {
- g_assert( be->primary_book == NULL );
- be->primary_book = book;
- /* Load any initial stuff. Some of this needs to happen in a certain order */
- for( i = 0; fixed_load_order[i] != NULL; i++ ) {
- pData = qof_object_lookup_backend( fixed_load_order[i], GNC_SQL_BACKEND );
- if( pData->initial_load != NULL ) {
- (pData->initial_load)( be );
- }
- }
- if( other_load_order != NULL ) {
- for( i = 0; other_load_order[i] != NULL; i++ ) {
- pData = qof_object_lookup_backend( other_load_order[i], GNC_SQL_BACKEND );
- if( pData->initial_load != NULL ) {
- (pData->initial_load)( be );
- }
+ if ( loadType == LOAD_TYPE_INITIAL_LOAD )
+ {
+ g_assert( be->primary_book == NULL );
+ be->primary_book = book;
+
+ /* Load any initial stuff. Some of this needs to happen in a certain order */
+ for ( i = 0; fixed_load_order[i] != NULL; i++ )
+ {
+ pData = qof_object_lookup_backend( fixed_load_order[i], GNC_SQL_BACKEND );
+ if ( pData->initial_load != NULL )
+ {
+ (pData->initial_load)( be );
}
- }
+ }
+ if ( other_load_order != NULL )
+ {
+ for ( i = 0; other_load_order[i] != NULL; i++ )
+ {
+ pData = qof_object_lookup_backend( other_load_order[i], GNC_SQL_BACKEND );
+ if ( pData->initial_load != NULL )
+ {
+ (pData->initial_load)( be );
+ }
+ }
+ }
- root = gnc_book_get_root_account( book );
- gnc_account_foreach_descendant( root, (AccountCb)xaccAccountBeginEdit, NULL );
+ root = gnc_book_get_root_account( book );
+ gnc_account_foreach_descendant( root, (AccountCb)xaccAccountBeginEdit, NULL );
- qof_object_foreach_backend( GNC_SQL_BACKEND, initial_load_cb, be );
+ qof_object_foreach_backend( GNC_SQL_BACKEND, initial_load_cb, be );
- gnc_account_foreach_descendant( root, (AccountCb)xaccAccountCommitEdit, NULL );
- } else if( loadType == LOAD_TYPE_LOAD_ALL ) {
- // Load all transactions
- gnc_sql_transaction_load_all_tx( be );
- }
+ gnc_account_foreach_descendant( root, (AccountCb)xaccAccountCommitEdit, NULL );
+ }
+ else if ( loadType == LOAD_TYPE_LOAD_ALL )
+ {
+ // Load all transactions
+ gnc_sql_transaction_load_all_tx( be );
+ }
be->loading = FALSE;
- // Mark the book as clean
- qof_book_mark_saved( book );
+ // Mark the book as clean
+ qof_book_mark_saved( book );
LEAVE( "" );
}
@@ -245,9 +270,9 @@
{
const gnc_commodity *ca = (const gnc_commodity *) a;
const gnc_commodity *cb = (const gnc_commodity *) b;
-
+
return( safe_strcmp( gnc_commodity_get_mnemonic( ca ),
- gnc_commodity_get_mnemonic( cb ) ) );
+ gnc_commodity_get_mnemonic( cb ) ) );
}
static void
@@ -257,23 +282,26 @@
GList* namespaces;
GList* lp;
- g_return_if_fail( be != NULL );
- g_return_if_fail( book != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( book != NULL );
tbl = gnc_book_get_commodity_table( book );
namespaces = gnc_commodity_table_get_namespaces( tbl );
- if( namespaces != NULL ) {
+ if ( namespaces != NULL )
+ {
namespaces = g_list_sort( namespaces, compare_namespaces );
}
- for( lp = namespaces; lp != NULL; lp = lp->next ) {
+ for ( lp = namespaces; lp != NULL; lp = lp->next )
+ {
GList* comms;
GList* lp2;
-
+
comms = gnc_commodity_table_get_commodities( tbl, lp->data );
comms = g_list_sort( comms, compare_commodity_ids );
- for( lp2 = comms; lp2 != NULL; lp2 = lp2->next ) {
- gnc_sql_save_commodity( be, GNC_COMMODITY(lp2->data) );
+ for ( lp2 = comms; lp2 != NULL; lp2 = lp2->next )
+ {
+ gnc_sql_save_commodity( be, GNC_COMMODITY(lp2->data) );
}
}
}
@@ -283,90 +311,98 @@
write_account_tree( GncSqlBackend* be, Account* root )
{
GList* descendants;
- /*@ dependent @*/ GList* node;
- gboolean is_ok = TRUE;
+ /*@ dependent @*/
+ GList* node;
+ gboolean is_ok = TRUE;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( root != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( root != NULL, FALSE );
- is_ok = gnc_sql_save_account( be, QOF_INSTANCE(root) );
- if( is_ok ) {
+ is_ok = gnc_sql_save_account( be, QOF_INSTANCE(root) );
+ if ( is_ok )
+ {
descendants = gnc_account_get_descendants( root );
- for( node = descendants; node != NULL && is_ok; node = g_list_next(node) ) {
+ for ( node = descendants; node != NULL && is_ok; node = g_list_next(node) )
+ {
is_ok = gnc_sql_save_account( be, QOF_INSTANCE(GNC_ACCOUNT(node->data)) );
- if( !is_ok ) break;
- update_save_progress( be );
+ if ( !is_ok ) break;
+ update_save_progress( be );
}
g_list_free( descendants );
- }
+ }
- return is_ok;
+ return is_ok;
}
static gboolean
write_accounts( GncSqlBackend* be )
{
- gboolean is_ok;
+ gboolean is_ok;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
is_ok = write_account_tree( be, gnc_book_get_root_account( be->primary_book ) );
- if( is_ok ) {
+ if ( is_ok )
+ {
is_ok = write_account_tree( be, gnc_book_get_template_root( be->primary_book ) );
- }
+ }
- return is_ok;
+ return is_ok;
}
static int
write_tx( Transaction* tx, gpointer data )
{
- write_objects_t* s = (write_objects_t*)data;
+ write_objects_t* s = (write_objects_t*)data;
- g_return_val_if_fail( tx != NULL, 0 );
- g_return_val_if_fail( data != NULL, 0 );
+ g_return_val_if_fail( tx != NULL, 0 );
+ g_return_val_if_fail( data != NULL, 0 );
s->is_ok = gnc_sql_save_transaction( s->be, QOF_INSTANCE(tx) );
- update_save_progress( s->be );
+ update_save_progress( s->be );
- if( s->is_ok ) {
- return 0;
- } else {
- return 1;
- }
+ if ( s->is_ok )
+ {
+ return 0;
+ }
+ else
+ {
+ return 1;
+ }
}
static gboolean
write_transactions( GncSqlBackend* be )
{
- write_objects_t data;
+ write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
- data.be = be;
- data.is_ok = TRUE;
+ data.be = be;
+ data.is_ok = TRUE;
(void)xaccAccountTreeForEachTransaction( gnc_book_get_root_account( be->primary_book ),
- write_tx,
- &data );
- return data.is_ok;
+ write_tx,
+ &data );
+ return data.is_ok;
}
static gboolean
write_template_transactions( GncSqlBackend* be )
{
Account* ra;
- write_objects_t data;
+ write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
- data.is_ok = TRUE;
- data.be = be;
+ data.is_ok = TRUE;
+ data.be = be;
ra = gnc_book_get_template_root( be->primary_book );
- if( gnc_account_n_descendants( ra ) > 0 ) {
+ if ( gnc_account_n_descendants( ra ) > 0 )
+ {
(void)xaccAccountTreeForEachTransaction( ra, write_tx, &data );
}
- return data.is_ok;
+ return data.is_ok;
}
static gboolean
@@ -374,18 +410,19 @@
{
GList* schedXactions;
SchedXaction* tmpSX;
- gboolean is_ok = TRUE;
+ gboolean is_ok = TRUE;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
schedXactions = gnc_book_get_schedxactions( be->primary_book )->sx_list;
- for( ; schedXactions != NULL && is_ok; schedXactions = schedXactions->next ) {
+ for ( ; schedXactions != NULL && is_ok; schedXactions = schedXactions->next )
+ {
tmpSX = schedXactions->data;
- is_ok = gnc_sql_save_schedxaction( be, QOF_INSTANCE( tmpSX ) );
+ is_ok = gnc_sql_save_schedxaction( be, QOF_INSTANCE( tmpSX ) );
}
- return is_ok;
+ return is_ok;
}
static void
@@ -397,7 +434,8 @@
g_return_if_fail( type != NULL && data_p != NULL && be_p != NULL );
g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
- if( pData->write != NULL ) {
+ if ( pData->write != NULL )
+ {
(void)(pData->write)( be );
}
}
@@ -405,67 +443,74 @@
static void
update_save_progress( GncSqlBackend* be )
{
- if( be->be.percentage != NULL ) {
- double percent_done;
+ if ( be->be.percentage != NULL )
+ {
+ double percent_done;
- be->operations_done++;
- percent_done = be->operations_done * 100.0 / be->obj_total;
- if( percent_done > 100 ) {
- percent_done = 100;
- }
- (be->be.percentage)( NULL, percent_done );
- }
+ be->operations_done++;
+ percent_done = be->operations_done * 100.0 / be->obj_total;
+ if ( percent_done > 100 )
+ {
+ percent_done = 100;
+ }
+ (be->be.percentage)( NULL, percent_done );
+ }
}
void
gnc_sql_sync_all( GncSqlBackend* be, /*@ dependent @*/ QofBook *book )
{
- gboolean is_ok;
+ gboolean is_ok;
- g_return_if_fail( be != NULL );
- g_return_if_fail( book != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( book != NULL );
ENTER( "book=%p, primary=%p", book, be->primary_book );
- (void)reset_version_info( be );
+ (void)reset_version_info( be );
/* Create new tables */
- be->is_pristine_db = TRUE;
+ be->is_pristine_db = TRUE;
qof_object_foreach_backend( GNC_SQL_BACKEND, create_tables_cb, be );
/* Save all contents */
- be->primary_book = book;
- be->obj_total = 0;
+ be->primary_book = book;
+ be->obj_total = 0;
be->obj_total += 1 + gnc_account_n_descendants( gnc_book_get_root_account( book ) );
- be->obj_total += gnc_book_count_transactions( book );
- be->operations_done = 0;
+ be->obj_total += gnc_book_count_transactions( book );
+ be->operations_done = 0;
- (void)gnc_sql_connection_begin_transaction( be->conn );
+ (void)gnc_sql_connection_begin_transaction( be->conn );
- // FIXME: should write the set of commodities that are used
+ // FIXME: should write the set of commodities that are used
//write_commodities( be, book );
- is_ok = gnc_sql_save_book( be, QOF_INSTANCE(book) );
- if( is_ok ) {
- is_ok = write_accounts( be );
- }
- if( is_ok ) {
- is_ok = write_transactions( be );
- }
- if( is_ok ) {
- is_ok = write_template_transactions( be );
- }
- if( is_ok ) {
- is_ok = write_schedXactions( be );
- }
- if( is_ok ) {
- qof_object_foreach_backend( GNC_SQL_BACKEND, write_cb, be );
- }
+ is_ok = gnc_sql_save_book( be, QOF_INSTANCE(book) );
+ if ( is_ok )
+ {
+ is_ok = write_accounts( be );
+ }
+ if ( is_ok )
+ {
+ is_ok = write_transactions( be );
+ }
+ if ( is_ok )
+ {
+ is_ok = write_template_transactions( be );
+ }
+ if ( is_ok )
+ {
+ is_ok = write_schedXactions( be );
+ }
+ if ( is_ok )
+ {
+ qof_object_foreach_backend( GNC_SQL_BACKEND, write_cb, be );
+ }
- (void)gnc_sql_connection_commit_transaction( be->conn );
- be->is_pristine_db = FALSE;
+ (void)gnc_sql_connection_commit_transaction( be->conn );
+ be->is_pristine_db = FALSE;
- // Mark the book as clean
- qof_book_mark_saved( book );
+ // Mark the book as clean
+ qof_book_mark_saved( book );
LEAVE( "book=%p", book );
}
@@ -476,21 +521,21 @@
void
gnc_sql_begin_edit( GncSqlBackend *be, QofInstance *inst )
{
- g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( inst != NULL );
ENTER( " " );
- LEAVE( "" );
+ LEAVE( "" );
}
void
gnc_sql_rollback_edit( GncSqlBackend *be, QofInstance *inst )
{
- g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( inst != NULL );
ENTER( " " );
- LEAVE( "" );
+ LEAVE( "" );
}
static void
@@ -503,10 +548,11 @@
g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
/* If this has already been handled, or is not the correct handler, return */
- if( strcmp( pData->type_name, be_data->inst->e_type ) != 0 ) return;
- if( be_data->is_known ) return;
+ if ( strcmp( pData->type_name, be_data->inst->e_type ) != 0 ) return;
+ if ( be_data->is_known ) return;
- if( pData->commit != NULL ) {
+ if ( pData->commit != NULL )
+ {
be_data->is_ok = (pData->commit)( be_data->be, be_data->inst );
be_data->is_known = TRUE;
}
@@ -519,75 +565,80 @@
gnc_sql_commit_edit( GncSqlBackend *be, QofInstance *inst )
{
sql_backend be_data;
- gboolean is_dirty;
- gboolean is_destroying;
- gboolean is_infant;
+ gboolean is_dirty;
+ gboolean is_destroying;
+ gboolean is_infant;
- g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( inst != NULL );
/* During initial load where objects are being created, don't commit
anything, but do mark the object as clean. */
- if( be->loading ) {
- qof_instance_mark_clean( inst );
- return;
- }
+ if ( be->loading )
+ {
+ qof_instance_mark_clean( inst );
+ return;
+ }
- // The engine has a PriceDB object but it isn't in the database
- if( strcmp( inst->e_type, "PriceDB" ) == 0 ) {
- qof_instance_mark_clean( inst );
- qof_book_mark_saved( be->primary_book );
- return;
- }
+ // The engine has a PriceDB object but it isn't in the database
+ if ( strcmp( inst->e_type, "PriceDB" ) == 0 )
+ {
+ qof_instance_mark_clean( inst );
+ qof_book_mark_saved( be->primary_book );
+ return;
+ }
ENTER( " " );
- is_dirty = qof_instance_get_dirty_flag( inst );
- is_destroying = qof_instance_get_destroying( inst );
- is_infant = qof_instance_get_infant( inst );
+ is_dirty = qof_instance_get_dirty_flag( inst );
+ is_destroying = qof_instance_get_destroying( inst );
+ is_infant = qof_instance_get_infant( inst );
DEBUG( "%s dirty = %d, do_free = %d, infant = %d\n",
- (inst->e_type ? inst->e_type : "(null)"),
- is_dirty, is_destroying, is_infant );
+ (inst->e_type ? inst->e_type : "(null)"),
+ is_dirty, is_destroying, is_infant );
- if( !is_dirty && !is_destroying ) {
- LEAVE( "!dirty OR !destroying" );
- return;
- }
+ if ( !is_dirty && !is_destroying )
+ {
+ LEAVE( "!dirty OR !destroying" );
+ return;
+ }
- (void)gnc_sql_connection_begin_transaction( be->conn );
+ (void)gnc_sql_connection_begin_transaction( be->conn );
be_data.is_known = FALSE;
be_data.be = be;
be_data.inst = inst;
- be_data.is_ok = TRUE;
+ be_data.is_ok = TRUE;
qof_object_foreach_backend( GNC_SQL_BACKEND, commit_cb, &be_data );
- if( !be_data.is_known ) {
+ if ( !be_data.is_known )
+ {
PERR( "gnc_sql_commit_edit(): Unknown object type '%s'\n", inst->e_type );
- (void)gnc_sql_connection_rollback_transaction( be->conn );
+ (void)gnc_sql_connection_rollback_transaction( be->conn );
- // Don't let unknown items still mark the book as being dirty
- qof_instance_mark_clean(inst);
- qof_book_mark_saved( be->primary_book );
- LEAVE( "Rolled back - unknown object type" );
+ // Don't let unknown items still mark the book as being dirty
+ qof_instance_mark_clean(inst);
+ qof_book_mark_saved( be->primary_book );
+ LEAVE( "Rolled back - unknown object type" );
return;
}
- if( !be_data.is_ok ) {
- // Error - roll it back
- (void)gnc_sql_connection_rollback_transaction( be->conn );
+ if ( !be_data.is_ok )
+ {
+ // Error - roll it back
+ (void)gnc_sql_connection_rollback_transaction( be->conn );
- // This *should* leave things marked dirty
- LEAVE( "Rolled back - database error" );
+ // This *should* leave things marked dirty
+ LEAVE( "Rolled back - database error" );
return;
- }
+ }
- (void)gnc_sql_connection_commit_transaction( be->conn );
+ (void)gnc_sql_connection_commit_transaction( be->conn );
qof_instance_mark_clean(inst);
qof_book_mark_saved( be->primary_book );
- LEAVE( "" );
+ LEAVE( "" );
}
/* ---------------------------------------------------------------------- */
@@ -601,102 +652,139 @@
GSList* name;
gchar val[GUID_ENCODING_LENGTH+1];
- g_return_if_fail( pTerm != NULL );
- g_return_if_fail( sql != NULL );
+ g_return_if_fail( pTerm != NULL );
+ g_return_if_fail( sql != NULL );
pParamPath = qof_query_term_get_param_path( pTerm );
pPredData = qof_query_term_get_pred_data( pTerm );
isInverted = qof_query_term_is_inverted( pTerm );
- if( strcmp( pPredData->type_name, QOF_TYPE_GUID ) == 0 ) {
+ if ( strcmp( pPredData->type_name, QOF_TYPE_GUID ) == 0 )
+ {
query_guid_t guid_data = (query_guid_t)pPredData;
- GList* guid_entry;
+ GList* guid_entry;
- for( name = pParamPath; name != NULL; name = name->next ) {
- if( name != pParamPath ) g_string_append( sql, "." );
- g_string_append( sql, name->data );
- }
+ for ( name = pParamPath; name != NULL; name = name->next )
+ {
+ if ( name != pParamPath ) g_string_append( sql, "." );
+ g_string_append( sql, name->data );
+ }
- if( guid_data->options == QOF_GUID_MATCH_ANY ) {
- if( isInverted ) g_string_append( sql, " NOT " );
- g_string_append( sql, " IN (" );
- }
- for( guid_entry = guid_data->guids; guid_entry != NULL; guid_entry = guid_entry->next ) {
- if( guid_entry != guid_data->guids ) g_string_append( sql, "." );
- (void)guid_to_string_buff( guid_entry->data, val );
- g_string_append( sql, "'" );
- g_string_append( sql, val );
- g_string_append( sql, "'" );
- }
- if( guid_data->options == QOF_GUID_MATCH_ANY ) {
- g_string_append( sql, ")" );
- }
+ if ( guid_data->options == QOF_GUID_MATCH_ANY )
+ {
+ if ( isInverted ) g_string_append( sql, " NOT " );
+ g_string_append( sql, " IN (" );
+ }
+ for ( guid_entry = guid_data->guids; guid_entry != NULL; guid_entry = guid_entry->next )
+ {
+ if ( guid_entry != guid_data->guids ) g_string_append( sql, "." );
+ (void)guid_to_string_buff( guid_entry->data, val );
+ g_string_append( sql, "'" );
+ g_string_append( sql, val );
+ g_string_append( sql, "'" );
+ }
+ if ( guid_data->options == QOF_GUID_MATCH_ANY )
+ {
+ g_string_append( sql, ")" );
+ }
}
g_string_append( sql, "(" );
- if( isInverted ) {
+ if ( isInverted )
+ {
g_string_append( sql, "!" );
}
- for( name = pParamPath; name != NULL; name = name->next ) {
- if( name != pParamPath ) g_string_append( sql, "." );
+ for ( name = pParamPath; name != NULL; name = name->next )
+ {
+ if ( name != pParamPath ) g_string_append( sql, "." );
g_string_append( sql, name->data );
}
- if( pPredData->how == QOF_COMPARE_LT ) {
+ if ( pPredData->how == QOF_COMPARE_LT )
+ {
g_string_append( sql, "<" );
- } else if( pPredData->how == QOF_COMPARE_LTE ) {
+ }
+ else if ( pPredData->how == QOF_COMPARE_LTE )
+ {
g_string_append( sql, "<=" );
- } else if( pPredData->how == QOF_COMPARE_EQUAL ) {
+ }
+ else if ( pPredData->how == QOF_COMPARE_EQUAL )
+ {
g_string_append( sql, "=" );
- } else if( pPredData->how == QOF_COMPARE_GT ) {
+ }
+ else if ( pPredData->how == QOF_COMPARE_GT )
+ {
g_string_append( sql, ">" );
- } else if( pPredData->how == QOF_COMPARE_GTE ) {
+ }
+ else if ( pPredData->how == QOF_COMPARE_GTE )
+ {
g_string_append( sql, ">=" );
- } else if( pPredData->how == QOF_COMPARE_NEQ ) {
+ }
+ else if ( pPredData->how == QOF_COMPARE_NEQ )
+ {
g_string_append( sql, "~=" );
- } else {
+ }
+ else
+ {
g_string_append( sql, "??" );
}
- if( strcmp( pPredData->type_name, "string" ) == 0 ) {
+ if ( strcmp( pPredData->type_name, "string" ) == 0 )
+ {
query_string_t pData = (query_string_t)pPredData;
g_string_append( sql, "'" );
g_string_append( sql, pData->matchstring );
g_string_append( sql, "'" );
- } else if( strcmp( pPredData->type_name, "date" ) == 0 ) {
+ }
+ else if ( strcmp( pPredData->type_name, "date" ) == 0 )
+ {
query_date_t pData = (query_date_t)pPredData;
(void)gnc_timespec_to_iso8601_buff( pData->date, val );
g_string_append( sql, "'" );
//g_string_append( sql, val, 4+1+2+1+2 );
g_string_append( sql, "'" );
- } else if( strcmp( pPredData->type_name, "numeric" ) == 0 ) {
+ }
+ else if ( strcmp( pPredData->type_name, "numeric" ) == 0 )
+ {
query_numeric_t pData = (query_numeric_t)pPredData;
-
+
g_string_append( sql, "numeric" );
- } else if( strcmp( pPredData->type_name, QOF_TYPE_GUID ) == 0 ) {
- } else if( strcmp( pPredData->type_name, "gint32" ) == 0 ) {
+ }
+ else if ( strcmp( pPredData->type_name, QOF_TYPE_GUID ) == 0 )
+ {
+ }
+ else if ( strcmp( pPredData->type_name, "gint32" ) == 0 )
+ {
query_int32_t pData = (query_int32_t)pPredData;
sprintf( val, "%d", pData->val );
g_string_append( sql, val );
- } else if( strcmp( pPredData->type_name, "gint64" ) == 0 ) {
+ }
+ else if ( strcmp( pPredData->type_name, "gint64" ) == 0 )
+ {
query_int64_t pData = (query_int64_t)pPredData;
-
+
sprintf( val, "%" G_GINT64_FORMAT, pData->val );
g_string_append( sql, val );
- } else if( strcmp( pPredData->type_name, "double" ) == 0 ) {
+ }
+ else if ( strcmp( pPredData->type_name, "double" ) == 0 )
+ {
query_double_t pData = (query_double_t)pPredData;
sprintf( val, "%f", pData->val );
g_string_append( sql, val );
- } else if( strcmp( pPredData->type_name, "boolean" ) == 0 ) {
+ }
+ else if ( strcmp( pPredData->type_name, "boolean" ) == 0 )
+ {
query_boolean_t pData = (query_boolean_t)pPredData;
sprintf( val, "%d", pData->val );
g_string_append( sql, val );
- } else {
+ }
+ else
+ {
g_assert( FALSE );
}
@@ -712,21 +800,23 @@
g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
- // Is this the right item?
- if( strcmp( type, be_data->pQueryInfo->searchObj ) != 0 ) return;
- if( be_data->is_ok ) return;
+ // Is this the right item?
+ if ( strcmp( type, be_data->pQueryInfo->searchObj ) != 0 ) return;
+ if ( be_data->is_ok ) return;
- if( pData->compile_query != NULL ) {
+ if ( pData->compile_query != NULL )
+ {
be_data->pQueryInfo->pCompiledQuery = (pData->compile_query)(
- be_data->be,
- be_data->pQuery );
+ be_data->be,
+ be_data->pQuery );
be_data->is_ok = TRUE;
}
}
gchar* gnc_sql_compile_query_to_sql( GncSqlBackend* be, QofQuery* query );
-/*@ null @*/ gpointer
+/*@ null @*/
+gpointer
gnc_sql_compile_query( QofBackend* pBEnd, QofQuery* pQuery )
{
GncSqlBackend *be = (GncSqlBackend*)pBEnd;
@@ -734,17 +824,17 @@
sql_backend be_data;
gnc_sql_query_info* pQueryInfo;
- g_return_val_if_fail( pBEnd != NULL, NULL );
- g_return_val_if_fail( pQuery != NULL, NULL );
+ g_return_val_if_fail( pBEnd != NULL, NULL );
+ g_return_val_if_fail( pQuery != NULL, NULL );
- ENTER( " " );
+ ENTER( " " );
//gnc_sql_compile_query_to_sql( be, pQuery );
searchObj = qof_query_get_search_for( pQuery );
pQueryInfo = g_malloc( (gsize)sizeof( gnc_sql_query_info ) );
- g_assert( pQueryInfo != NULL );
- pQueryInfo->pCompiledQuery = NULL;
+ g_assert( pQueryInfo != NULL );
+ pQueryInfo->pCompiledQuery = NULL;
pQueryInfo->searchObj = searchObj;
// Try various objects first
@@ -754,12 +844,13 @@
be_data.pQueryInfo = pQueryInfo;
qof_object_foreach_backend( GNC_SQL_BACKEND, compile_query_cb, &be_data );
- if( be_data.is_ok ) {
- LEAVE( "" );
+ if ( be_data.is_ok )
+ {
+ LEAVE( "" );
return be_data.pQueryInfo;
}
- LEAVE( "" );
+ LEAVE( "" );
return pQueryInfo;
}
@@ -774,35 +865,40 @@
gnc_sql_compile_query_to_sql( GncSqlBackend* be, QofQuery* query )
{
QofIdType searchObj;
- GList* bookList;
- GString* sql;
+ GList* bookList;
+ GString* sql;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( query != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( query != NULL, NULL );
searchObj = qof_query_get_search_for( query );
bookList = qof_query_get_books( query );
/* Convert search object type to table name */
- sql = g_string_new( "" );
- g_string_append( sql, "SELECT * FROM " );
- g_string_append( sql, convert_search_obj( searchObj ) );
- if( !qof_query_has_terms( query ) ) {
+ sql = g_string_new( "" );
+ g_string_append( sql, "SELECT * FROM " );
+ g_string_append( sql, convert_search_obj( searchObj ) );
+ if ( !qof_query_has_terms( query ) )
+ {
g_string_append( sql, ";" );
- } else {
+ }
+ else
+ {
GList* orterms = qof_query_get_terms( query );
GList* orTerm;
g_string_append( sql, " WHERE " );
- for( orTerm = orterms; orTerm != NULL; orTerm = orTerm->next ) {
+ for ( orTerm = orterms; orTerm != NULL; orTerm = orTerm->next )
+ {
GList* andterms = (GList*)orTerm->data;
GList* andTerm;
- if( orTerm != orterms ) g_string_append( sql, " OR " );
+ if ( orTerm != orterms ) g_string_append( sql, " OR " );
g_string_append( sql, "(" );
- for( andTerm = andterms; andTerm != NULL; andTerm = andTerm->next ) {
- if( andTerm != andterms ) g_string_append( sql, " AND " );
+ for ( andTerm = andterms; andTerm != NULL; andTerm = andTerm->next )
+ {
+ if ( andTerm != andterms ) g_string_append( sql, " AND " );
handle_and_term( (QofQueryTerm*)andTerm->data, sql );
}
g_string_append( sql, ")" );
@@ -821,10 +917,11 @@
g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
- if( be_data->is_ok ) return;
- if( strcmp( type, be_data->pQueryInfo->searchObj ) != 0 ) return;
+ if ( be_data->is_ok ) return;
+ if ( strcmp( type, be_data->pQueryInfo->searchObj ) != 0 ) return;
- if( pData->free_query != NULL ) {
+ if ( pData->free_query != NULL )
+ {
(pData->free_query)( be_data->be, be_data->pCompiledQuery );
be_data->is_ok = TRUE;
}
@@ -837,10 +934,10 @@
gnc_sql_query_info* pQueryInfo = (gnc_sql_query_info*)pQuery;
sql_backend be_data;
- g_return_if_fail( pBEnd != NULL );
- g_return_if_fail( pQuery != NULL );
+ g_return_if_fail( pBEnd != NULL );
+ g_return_if_fail( pQuery != NULL );
- ENTER( " " );
+ ENTER( " " );
// Try various objects first
be_data.is_ok = FALSE;
@@ -849,18 +946,20 @@
be_data.pQueryInfo = pQueryInfo;
qof_object_foreach_backend( GNC_SQL_BACKEND, free_query_cb, &be_data );
- if( be_data.is_ok ) {
- LEAVE( "" );
+ if ( be_data.is_ok )
+ {
+ LEAVE( "" );
return;
}
- if( pQueryInfo->pCompiledQuery != NULL ) {
- DEBUG( "%s\n", (gchar*)pQueryInfo->pCompiledQuery );
- g_free( pQueryInfo->pCompiledQuery );
- }
+ if ( pQueryInfo->pCompiledQuery != NULL )
+ {
+ DEBUG( "%s\n", (gchar*)pQueryInfo->pCompiledQuery );
+ g_free( pQueryInfo->pCompiledQuery );
+ }
g_free( pQueryInfo );
- LEAVE( "" );
+ LEAVE( "" );
}
static void
@@ -871,12 +970,13 @@
g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
- if( be_data->is_ok ) return;
+ if ( be_data->is_ok ) return;
- // Is this the right item?
- if( strcmp( type, be_data->pQueryInfo->searchObj ) != 0 ) return;
+ // Is this the right item?
+ if ( strcmp( type, be_data->pQueryInfo->searchObj ) != 0 ) return;
- if( pData->run_query != NULL ) {
+ if ( pData->run_query != NULL )
+ {
(pData->run_query)( be_data->be, be_data->pCompiledQuery );
be_data->is_ok = TRUE;
}
@@ -889,11 +989,11 @@
gnc_sql_query_info* pQueryInfo = (gnc_sql_query_info*)pQuery;
sql_backend be_data;
- g_return_if_fail( pBEnd != NULL );
- g_return_if_fail( pQuery != NULL );
+ g_return_if_fail( pBEnd != NULL );
+ g_return_if_fail( pQuery != NULL );
g_return_if_fail( !be->in_query );
- ENTER( " " );
+ ENTER( " " );
be->loading = TRUE;
be->in_query = TRUE;
@@ -915,12 +1015,12 @@
// return;
// }
- // Mark the book as clean
- qof_instance_mark_clean( QOF_INSTANCE(be->primary_book) );
+ // Mark the book as clean
+ qof_instance_mark_clean( QOF_INSTANCE(be->primary_book) );
// DEBUG( "%s\n", (gchar*)pQueryInfo->pCompiledQuery );
- LEAVE( "" );
+ LEAVE( "" );
}
/* ================================================================= */
@@ -934,7 +1034,7 @@
gnc_sql_init_price_handler();
gnc_sql_init_transaction_handler();
gnc_sql_init_slots_handler();
- gnc_sql_init_recurrence_handler();
+ gnc_sql_init_recurrence_handler();
gnc_sql_init_schedxaction_handler();
gnc_sql_init_lot_handler();
}
@@ -944,27 +1044,42 @@
gint64
gnc_sql_get_integer_value( const GValue* value )
{
- g_return_val_if_fail( value != NULL, 0 );
+ g_return_val_if_fail( value != NULL, 0 );
- if( G_VALUE_HOLDS_INT(value) ) {
- return (gint64)g_value_get_int( value );
- } else if( G_VALUE_HOLDS_UINT(value) ) {
- return (gint64)g_value_get_uint( value );
- } else if( G_VALUE_HOLDS_LONG(value) ) {
- return (gint64)g_value_get_long( value );
- } else if( G_VALUE_HOLDS_ULONG(value) ) {
- return (gint64)g_value_get_ulong( value );
- } else if( G_VALUE_HOLDS_INT64(value) ) {
- return g_value_get_int64( value );
- } else if( G_VALUE_HOLDS_UINT64(value) ) {
- return (gint64)g_value_get_uint64( value );
- } else if( G_VALUE_HOLDS_STRING( value ) ) {
- return g_ascii_strtoll( g_value_get_string( value ), NULL, 10 );
- } else {
- PWARN( "Unknown type: %s", G_VALUE_TYPE_NAME( value ) );
- }
+ if ( G_VALUE_HOLDS_INT(value) )
+ {
+ return (gint64)g_value_get_int( value );
+ }
+ else if ( G_VALUE_HOLDS_UINT(value) )
+ {
+ return (gint64)g_value_get_uint( value );
+ }
+ else if ( G_VALUE_HOLDS_LONG(value) )
+ {
+ return (gint64)g_value_get_long( value );
+ }
+ else if ( G_VALUE_HOLDS_ULONG(value) )
+ {
+ return (gint64)g_value_get_ulong( value );
+ }
+ else if ( G_VALUE_HOLDS_INT64(value) )
+ {
+ return g_value_get_int64( value );
+ }
+ else if ( G_VALUE_HOLDS_UINT64(value) )
+ {
+ return (gint64)g_value_get_uint64( value );
+ }
+ else if ( G_VALUE_HOLDS_STRING( value ) )
+ {
+ return g_ascii_strtoll( g_value_get_string( value ), NULL, 10 );
+ }
+ else
+ {
+ PWARN( "Unknown type: %s", G_VALUE_TYPE_NAME( value ) );
+ }
- return 0;
+ return 0;
}
/* ----------------------------------------------------------------- */
@@ -986,15 +1101,20 @@
{
QofAccessFunc getter;
- g_return_val_if_fail( obj_name != NULL, NULL );
- g_return_val_if_fail( table_row != NULL, NULL );
+ g_return_val_if_fail( obj_name != NULL, NULL );
+ g_return_val_if_fail( table_row != NULL, NULL );
- if( (table_row->flags & COL_AUTOINC) != 0 ) {
- getter = get_autoinc_id;
- } else if( table_row->qof_param_name != NULL ) {
+ if ( (table_row->flags & COL_AUTOINC) != 0 )
+ {
+ getter = get_autoinc_id;
+ }
+ else if ( table_row->qof_param_name != NULL )
+ {
getter = qof_class_get_parameter_getter( obj_name,
- table_row->qof_param_name );
- } else {
+ table_row->qof_param_name );
+ }
+ else
+ {
getter = table_row->getter;
}
@@ -1005,596 +1125,681 @@
void
gnc_sql_add_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList )
{
- (*pList) = g_list_append( (*pList), g_strdup( table_row->col_name ) );
+ (*pList) = g_list_append( (*pList), g_strdup( table_row->col_name ) );
}
/* ----------------------------------------------------------------- */
void
gnc_sql_add_subtable_colnames_to_list( const GncSqlColumnTableEntry* table_row, const GncSqlColumnTableEntry* subtable,
- GList** pList )
+GList** pList )
{
- const GncSqlColumnTableEntry* subtable_row;
- gchar* buf;
+ const GncSqlColumnTableEntry* subtable_row;
+ gchar* buf;
- for( subtable_row = subtable; subtable_row->col_name != NULL; subtable_row++ ) {
- buf = g_strdup_printf( "%s_%s", table_row->col_name, subtable_row->col_name );
- (*pList) = g_list_append( (*pList), buf );
- }
+ for ( subtable_row = subtable; subtable_row->col_name != NULL; subtable_row++ )
+ {
+ buf = g_strdup_printf( "%s_%s", table_row->col_name, subtable_row->col_name );
+ (*pList) = g_list_append( (*pList), buf );
+ }
}
static GncSqlColumnInfo*
create_column_info( const GncSqlColumnTableEntry* table_row, GncSqlBasicColumnType type,
- gint size, gboolean is_unicode )
+gint size, gboolean is_unicode )
{
- GncSqlColumnInfo* info;
+ GncSqlColumnInfo* info;
- info = g_new0( GncSqlColumnInfo, 1 );
- g_assert( info != NULL );
- info->name = g_strdup( table_row->col_name );
- info->type = type;
- info->size = size;
- info->is_primary_key = ((table_row->flags & COL_PKEY) != 0) ? TRUE : FALSE;
- info->null_allowed = ((table_row->flags & COL_NNUL) != 0) ? FALSE : TRUE;
- info->is_unicode = is_unicode;
- info->is_autoinc = ((table_row->flags & COL_AUTOINC) != 0) ? TRUE : FALSE;
+ info = g_new0( GncSqlColumnInfo, 1 );
+ g_assert( info != NULL );
+ info->name = g_strdup( table_row->col_name );
+ info->type = type;
+ info->size = size;
+ info->is_primary_key = ((table_row->flags & COL_PKEY) != 0) ? TRUE : FALSE;
+ info->null_allowed = ((table_row->flags & COL_NNUL) != 0) ? FALSE : TRUE;
+ info->is_unicode = is_unicode;
+ info->is_autoinc = ((table_row->flags & COL_AUTOINC) != 0) ? TRUE : FALSE;
- return info;
+ return info;
}
/* ----------------------------------------------------------------- */
static void
load_string( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+/*@ null @*/ QofSetterFunc setter, gpointer pObject,
+const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
const gchar* s;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- g_return_if_fail( val != NULL );
+ g_return_if_fail( val != NULL );
s = g_value_get_string( val );
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, s, NULL );
- } else {
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)s );
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, s, NULL );
}
+ else
+ {
+ g_return_if_fail( setter != NULL );
+ (*setter)( pObject, (const gpointer)s );
+ }
}
static void
add_string_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+GList** pList )
{
- GncSqlColumnInfo* info;
+ GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- info = create_column_info( table_row, BCT_STRING, table_row->size, TRUE );
+ info = create_column_info( table_row, BCT_STRING, table_row->size, TRUE );
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append( *pList, info );
}
static void
add_gvalue_string_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
QofAccessFunc getter;
gchar* s = NULL;
- GValue* value;
+ GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( obj_name != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
+ value = g_new0( GValue, 1 );
+ g_assert( value != NULL );
memset( value, 0, sizeof( GValue ) );
- if( table_row->gobj_param_name != NULL ) {
- g_object_get( pObject, table_row->gobj_param_name, &s, NULL );
- } else {
- getter = gnc_sql_get_getter( obj_name, table_row );
- if( getter != NULL ) {
- s = (gchar*)(*getter)( pObject, NULL );
- if( s != NULL ) {
- s = g_strdup( s );
- }
- }
- }
- (void)g_value_init( value, G_TYPE_STRING );
- if( s ) {
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_get( pObject, table_row->gobj_param_name, &s, NULL );
+ }
+ else
+ {
+ getter = gnc_sql_get_getter( obj_name, table_row );
+ if ( getter != NULL )
+ {
+ s = (gchar*)(*getter)( pObject, NULL );
+ if ( s != NULL )
+ {
+ s = g_strdup( s );
+ }
+ }
+ }
+ (void)g_value_init( value, G_TYPE_STRING );
+ if ( s )
+ {
g_value_take_string( value, s );
- }
+ }
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append( (*pList), value );
}
static GncSqlColumnTypeHandler string_handler
- = { load_string,
- add_string_col_info_to_list,
- gnc_sql_add_colname_to_list,
- add_gvalue_string_to_slist };
+= {
+ load_string,
+ add_string_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ add_gvalue_string_to_slist
+};
/* ----------------------------------------------------------------- */
typedef gint (*IntAccessFunc)( const gpointer );
typedef void (*IntSetterFunc)( const gpointer, gint );
static void
load_int( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+/*@ null @*/ QofSetterFunc setter, gpointer pObject,
+const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gint int_value;
- IntSetterFunc i_setter;
+ IntSetterFunc i_setter;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if( val == NULL ) {
+ if ( val == NULL )
+ {
int_value = 0;
- } else {
+ }
+ else
+ {
int_value = (gint)gnc_sql_get_integer_value( val );
}
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, int_value, NULL );
- } else {
- g_return_if_fail( setter != NULL );
- i_setter = (IntSetterFunc)setter;
- (*i_setter)( pObject, int_value );
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, int_value, NULL );
}
+ else
+ {
+ g_return_if_fail( setter != NULL );
+ i_setter = (IntSetterFunc)setter;
+ (*i_setter)( pObject, int_value );
+ }
}
static void
add_int_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+GList** pList )
{
- GncSqlColumnInfo* info;
+ GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- info = create_column_info( table_row, BCT_INT, 0, FALSE );
+ info = create_column_info( table_row, BCT_INT, 0, FALSE );
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append( *pList, info );
}
static void
add_gvalue_int_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
gint int_value = 0;
IntAccessFunc i_getter;
- GValue* value;
+ GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( obj_name != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
+ value = g_new0( GValue, 1 );
+ g_assert( value != NULL );
(void)g_value_init( value, G_TYPE_INT );
- if( table_row->gobj_param_name != NULL ) {
- g_object_get_property( pObject, table_row->gobj_param_name, value );
- } else {
- i_getter = (IntAccessFunc)gnc_sql_get_getter( obj_name, table_row );
- if( i_getter != NULL ) {
- int_value = (*i_getter)( pObject );
- }
- g_value_set_int( value, int_value );
- }
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_get_property( pObject, table_row->gobj_param_name, value );
+ }
+ else
+ {
+ i_getter = (IntAccessFunc)gnc_sql_get_getter( obj_name, table_row );
+ if ( i_getter != NULL )
+ {
+ int_value = (*i_getter)( pObject );
+ }
+ g_value_set_int( value, int_value );
+ }
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append( (*pList), value );
}
static GncSqlColumnTypeHandler int_handler
- = { load_int,
- add_int_col_info_to_list,
- gnc_sql_add_colname_to_list,
- add_gvalue_int_to_slist };
+= {
+ load_int,
+ add_int_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ add_gvalue_int_to_slist
+};
/* ----------------------------------------------------------------- */
typedef gboolean (*BooleanAccessFunc)( const gpointer );
typedef void (*BooleanSetterFunc)( const gpointer, gboolean );
static void
load_boolean( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+/*@ null @*/ QofSetterFunc setter, gpointer pObject,
+const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gint int_value;
- BooleanSetterFunc b_setter;
+ BooleanSetterFunc b_setter;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if( val == NULL ) {
+ if ( val == NULL )
+ {
int_value = 0;
- } else {
+ }
+ else
+ {
int_value = (gint)gnc_sql_get_integer_value( val );
}
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, int_value, NULL );
- } else {
- g_return_if_fail( setter != NULL );
- b_setter = (BooleanSetterFunc)setter;
- (*b_setter)( pObject, (int_value != 0) ? TRUE : FALSE );
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, int_value, NULL );
}
+ else
+ {
+ g_return_if_fail( setter != NULL );
+ b_setter = (BooleanSetterFunc)setter;
+ (*b_setter)( pObject, (int_value != 0) ? TRUE : FALSE );
+ }
}
static void
add_boolean_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+GList** pList )
{
- GncSqlColumnInfo* info;
+ GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- info = create_column_info( table_row, BCT_INT, 0, FALSE );
+ info = create_column_info( table_row, BCT_INT, 0, FALSE );
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append( *pList, info );
}
static void
add_gvalue_boolean_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
gint int_value = 0;
BooleanAccessFunc b_getter;
- GValue* value;
+ GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( obj_name != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
value = g_new0( GValue, 1 );
- g_assert( value != NULL );
+ g_assert( value != NULL );
- if( table_row->gobj_param_name != NULL ) {
- g_object_get( pObject, table_row->gobj_param_name, &int_value, NULL );
- } else {
- b_getter = (BooleanAccessFunc)gnc_sql_get_getter( obj_name, table_row );
- if( b_getter != NULL ) {
- int_value = ((*b_getter)( pObject )) ? 1 : 0;
- }
- }
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_get( pObject, table_row->gobj_param_name, &int_value, NULL );
+ }
+ else
+ {
+ b_getter = (BooleanAccessFunc)gnc_sql_get_getter( obj_name, table_row );
+ if ( b_getter != NULL )
+ {
+ int_value = ((*b_getter)( pObject )) ? 1 : 0;
+ }
+ }
(void)g_value_init( value, G_TYPE_INT );
g_value_set_int( value, int_value );
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append( (*pList), value );
}
static GncSqlColumnTypeHandler boolean_handler
- = { load_boolean,
- add_boolean_col_info_to_list,
- gnc_sql_add_colname_to_list,
- add_gvalue_boolean_to_slist };
+= {
+ load_boolean,
+ add_boolean_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ add_gvalue_boolean_to_slist
+};
/* ----------------------------------------------------------------- */
typedef gint64 (*Int64AccessFunc)( const gpointer );
typedef void (*Int64SetterFunc)( const gpointer, gint64 );
static void
load_int64( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+/*@ null @*/ QofSetterFunc setter, gpointer pObject,
+const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gint64 i64_value = 0;
- Int64SetterFunc i64_setter = (Int64SetterFunc)setter;
+ Int64SetterFunc i64_setter = (Int64SetterFunc)setter;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( setter != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( setter != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if( val != NULL ) {
+ if ( val != NULL )
+ {
i64_value = gnc_sql_get_integer_value( val );
}
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, i64_value, NULL );
- } else {
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, i64_value, NULL );
+ }
+ else
+ {
(*i64_setter)( pObject, i64_value );
- }
+ }
}
static void
add_int64_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+GList** pList )
{
- GncSqlColumnInfo* info;
+ GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- info = create_column_info( table_row, BCT_INT64, 0, FALSE );
+ info = create_column_info( table_row, BCT_INT64, 0, FALSE );
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append( *pList, info );
}
static void
add_gvalue_int64_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
gint64 i64_value = 0;
Int64AccessFunc getter;
- GValue* value;
+ GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( obj_name != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
value = g_new0( GValue, 1 );
- g_assert( value != NULL );
- if( table_row->gobj_param_name != NULL ) {
- g_object_get( pObject, table_row->gobj_param_name, &i64_value, NULL );
- } else {
- getter = (Int64AccessFunc)gnc_sql_get_getter( obj_name, table_row );
- if( getter != NULL ) {
- i64_value = (*getter)( pObject );
- }
- }
+ g_assert( value != NULL );
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_get( pObject, table_row->gobj_param_name, &i64_value, NULL );
+ }
+ else
+ {
+ getter = (Int64AccessFunc)gnc_sql_get_getter( obj_name, table_row );
+ if ( getter != NULL )
+ {
+ i64_value = (*getter)( pObject );
+ }
+ }
(void)g_value_init( value, G_TYPE_INT64 );
g_value_set_int64( value, i64_value );
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append( (*pList), value );
}
static GncSqlColumnTypeHandler int64_handler
- = { load_int64,
- add_int64_col_info_to_list,
- gnc_sql_add_colname_to_list,
- add_gvalue_int64_to_slist };
+= {
+ load_int64,
+ add_int64_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ add_gvalue_int64_to_slist
+};
/* ----------------------------------------------------------------- */
static void
load_double( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+/*@ null @*/ QofSetterFunc setter, gpointer pObject,
+const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gdouble d_value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if( val == NULL ) {
+ if ( val == NULL )
+ {
(*setter)( pObject, (gpointer)NULL );
- } else {
- if( G_VALUE_HOLDS(val, G_TYPE_INT) ) {
- d_value = (gdouble)g_value_get_int( val );
- } else if( G_VALUE_HOLDS(val, G_TYPE_FLOAT) ) {
- d_value = g_value_get_float( val );
- } else if (G_VALUE_HOLDS(val, G_TYPE_DOUBLE) ) {
- d_value = g_value_get_double( val );
- } else {
- PWARN( "Unknown float value type: %s\n", g_type_name( G_VALUE_TYPE(val) ) );
- d_value = 0;
- }
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, d_value, NULL );
- } else {
+ }
+ else
+ {
+ if ( G_VALUE_HOLDS(val, G_TYPE_INT) )
+ {
+ d_value = (gdouble)g_value_get_int( val );
+ }
+ else if ( G_VALUE_HOLDS(val, G_TYPE_FLOAT) )
+ {
+ d_value = g_value_get_float( val );
+ }
+ else if (G_VALUE_HOLDS(val, G_TYPE_DOUBLE) )
+ {
+ d_value = g_value_get_double( val );
+ }
+ else
+ {
+ PWARN( "Unknown float value type: %s\n", g_type_name( G_VALUE_TYPE(val) ) );
+ d_value = 0;
+ }
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, d_value, NULL );
+ }
+ else
+ {
(*setter)( pObject, (gpointer)&d_value );
- }
+ }
}
}
static void
add_double_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+GList** pList )
{
- GncSqlColumnInfo* info;
+ GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- info = create_column_info( table_row, BCT_DOUBLE, 0, FALSE );
+ info = create_column_info( table_row, BCT_DOUBLE, 0, FALSE );
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append( *pList, info );
}
static void
add_gvalue_double_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
QofAccessFunc getter;
gdouble* pDouble = NULL;
gdouble d_value;
- GValue* value;
+ GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( obj_name != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
+ value = g_new0( GValue, 1 );
+ g_assert( value != NULL );
getter = gnc_sql_get_getter( obj_name, table_row );
- if( getter != NULL ) {
- pDouble = (*getter)( pObject, NULL );
- }
- if( pDouble != NULL ) {
+ if ( getter != NULL )
+ {
+ pDouble = (*getter)( pObject, NULL );
+ }
+ if ( pDouble != NULL )
+ {
d_value = *pDouble;
(void)g_value_init( value, G_TYPE_DOUBLE );
g_value_set_double( value, d_value );
- } else {
+ }
+ else
+ {
(void)g_value_init( value, G_TYPE_DOUBLE );
- g_value_set_double( value, 0.0 );
- }
+ g_value_set_double( value, 0.0 );
+ }
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append( (*pList), value );
}
static GncSqlColumnTypeHandler double_handler
- = { load_double,
- add_double_col_info_to_list,
- gnc_sql_add_colname_to_list,
- add_gvalue_double_to_slist };
+= {
+ load_double,
+ add_double_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ add_gvalue_double_to_slist
+};
/* ----------------------------------------------------------------- */
static void
load_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+/*@ null @*/ QofSetterFunc setter, gpointer pObject,
+const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GncGUID guid;
const GncGUID* pGuid;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if( val == NULL || g_value_get_string( val ) == NULL ) {
+ if ( val == NULL || g_value_get_string( val ) == NULL )
+ {
pGuid = NULL;
- } else {
+ }
+ else
+ {
(void)string_to_guid( g_value_get_string( val ), &guid );
pGuid = &guid;
}
- if( pGuid != NULL ) {
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, pGuid, NULL );
- } else {
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)pGuid );
- }
+ if ( pGuid != NULL )
+ {
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, pGuid, NULL );
+ }
+ else
+ {
+ g_return_if_fail( setter != NULL );
+ (*setter)( pObject, (const gpointer)pGuid );
+ }
}
}
static void
add_guid_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+GList** pList )
{
- GncSqlColumnInfo* info;
+ GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- info = create_column_info( table_row, BCT_STRING, GUID_ENCODING_LENGTH, FALSE );
+ info = create_column_info( table_row, BCT_STRING, GUID_ENCODING_LENGTH, FALSE );
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append( *pList, info );
}
static void
add_gvalue_guid_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
QofAccessFunc getter;
const GncGUID* guid = NULL;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
- GValue* value;
+ GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( obj_name != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
value = g_new0( GValue, 1 );
- g_assert( value != NULL );
- if( table_row->gobj_param_name != NULL ) {
- g_object_get( pObject, table_row->gobj_param_name, &guid, NULL );
- } else {
- getter = gnc_sql_get_getter( obj_name, table_row );
- if( getter != NULL ) {
- guid = (*getter)( pObject, NULL );
- }
- }
+ g_assert( value != NULL );
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_get( pObject, table_row->gobj_param_name, &guid, NULL );
+ }
+ else
+ {
+ getter = gnc_sql_get_getter( obj_name, table_row );
+ if ( getter != NULL )
+ {
+ guid = (*getter)( pObject, NULL );
+ }
+ }
(void)g_value_init( value, G_TYPE_STRING );
- if( guid != NULL ) {
+ if ( guid != NULL )
+ {
(void)guid_to_string_buff( guid, guid_buf );
g_value_set_string( value, guid_buf );
- }
+ }
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append( (*pList), value );
}
static GncSqlColumnTypeHandler guid_handler
- = { load_guid,
- add_guid_col_info_to_list,
- gnc_sql_add_colname_to_list,
- add_gvalue_guid_to_slist };
+= {
+ load_guid,
+ add_guid_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ add_gvalue_guid_to_slist
+};
/* ----------------------------------------------------------------- */
void
gnc_sql_add_gvalue_objectref_guid_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
QofAccessFunc getter;
const GncGUID* guid = NULL;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
- QofInstance* inst = NULL;
- GValue* value;
+ QofInstance* inst = NULL;
+ GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( obj_name != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
- if( table_row->gobj_param_name != NULL ) {
- g_object_get( pObject, table_row->gobj_param_name, &inst, NULL );
- } else {
- getter = gnc_sql_get_getter( obj_name, table_row );
- if( getter != NULL ) {
- inst = (*getter)( pObject, NULL );
- }
- }
- if( inst != NULL ) {
- guid = qof_instance_get_guid( inst );
- }
+ value = g_new0( GValue, 1 );
+ g_assert( value != NULL );
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_get( pObject, table_row->gobj_param_name, &inst, NULL );
+ }
+ else
+ {
+ getter = gnc_sql_get_getter( obj_name, table_row );
+ if ( getter != NULL )
+ {
+ inst = (*getter)( pObject, NULL );
+ }
+ }
+ if ( inst != NULL )
+ {
+ guid = qof_instance_get_guid( inst );
+ }
(void)g_value_init( value, G_TYPE_STRING );
- if( guid != NULL ) {
+ if ( guid != NULL )
+ {
(void)guid_to_string_buff( guid, guid_buf );
g_value_set_string( value, guid_buf );
- }
+ }
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append( (*pList), value );
}
void
gnc_sql_add_objectref_guid_col_info_to_list( const GncSqlBackend* be,
- const GncSqlColumnTableEntry* table_row,
- GList** pList )
+const GncSqlColumnTableEntry* table_row,
+GList** pList )
{
- add_guid_col_info_to_list( be, table_row, pList );
+ add_guid_col_info_to_list( be, table_row, pList );
}
/* ----------------------------------------------------------------- */
@@ -1607,254 +1812,287 @@
gchar*
gnc_sql_convert_timespec_to_string( const GncSqlBackend* be, Timespec ts )
{
- time_t time;
- struct tm* tm;
- gint year;
- gchar* datebuf;
+ time_t time;
+ struct tm* tm;
+ gint year;
+ gchar* datebuf;
- time = timespecToTime_t( ts );
- tm = gmtime( &time );
+ time = timespecToTime_t( ts );
+ tm = gmtime( &time );
- if( tm->tm_year < 60 ) year = tm->tm_year + 2000;
- else year = tm->tm_year + 1900;
+ if ( tm->tm_year < 60 ) year = tm->tm_year + 2000;
+ else year = tm->tm_year + 1900;
- datebuf = g_strdup_printf( be->timespec_format,
- year, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec );
+ datebuf = g_strdup_printf( be->timespec_format,
+ year, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec );
return datebuf;
}
static void
load_timespec( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+/*@ null @*/ QofSetterFunc setter, gpointer pObject,
+const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
Timespec ts = {0, 0};
- TimespecSetterFunc ts_setter;
+ TimespecSetterFunc ts_setter;
gboolean isOK = FALSE;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
- ts_setter = (TimespecSetterFunc)setter;
+ ts_setter = (TimespecSetterFunc)setter;
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if( val == NULL ) {
+ if ( val == NULL )
+ {
isOK = TRUE;
- } else {
- if( G_VALUE_HOLDS_STRING( val ) ) {
- const gchar* s = g_value_get_string( val );
- if( s != NULL ) {
- gchar* buf;
- buf = g_strdup_printf( "%c%c%c%c-%c%c-%c%c %c%c:%c%c:%c%c",
- s[0], s[1], s[2], s[3],
- s[4], s[5],
- s[6], s[7],
- s[8], s[9],
- s[10], s[11],
- s[12], s[13] );
- ts = gnc_iso8601_to_timespec_gmt( buf );
- g_free( buf );
+ }
+ else
+ {
+ if ( G_VALUE_HOLDS_STRING( val ) )
+ {
+ const gchar* s = g_value_get_string( val );
+ if ( s != NULL )
+ {
+ gchar* buf;
+ buf = g_strdup_printf( "%c%c%c%c-%c%c-%c%c %c%c:%c%c:%c%c",
+ s[0], s[1], s[2], s[3],
+ s[4], s[5],
+ s[6], s[7],
+ s[8], s[9],
+ s[10], s[11],
+ s[12], s[13] );
+ ts = gnc_iso8601_to_timespec_gmt( buf );
+ g_free( buf );
isOK = TRUE;
- }
+ }
- } else {
- PWARN( "Unknown timespec type: %s", G_VALUE_TYPE_NAME( val ) );
}
+ else
+ {
+ PWARN( "Unknown timespec type: %s", G_VALUE_TYPE_NAME( val ) );
+ }
}
- if( isOK ) {
- if (table_row->gobj_param_name != NULL) {
- g_object_set( pObject, table_row->gobj_param_name, &ts, NULL );
- } else {
- (*ts_setter)( pObject, ts );
- }
+ if ( isOK )
+ {
+ if (table_row->gobj_param_name != NULL)
+ {
+ g_object_set( pObject, table_row->gobj_param_name, &ts, NULL );
+ }
+ else
+ {
+ (*ts_setter)( pObject, ts );
+ }
}
}
static void
add_timespec_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+GList** pList )
{
- GncSqlColumnInfo* info;
+ GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- info = create_column_info( table_row, BCT_DATETIME, TIMESPEC_COL_SIZE, FALSE );
+ info = create_column_info( table_row, BCT_DATETIME, TIMESPEC_COL_SIZE, FALSE );
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append( *pList, info );
}
static void
add_gvalue_timespec_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
TimespecAccessFunc ts_getter;
Timespec ts;
- gchar* datebuf;
- GValue* value;
+ gchar* datebuf;
+ GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( obj_name != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- if( table_row->gobj_param_name != NULL ) {
- Timespec* pts;
- g_object_get( pObject, table_row->gobj_param_name, &pts, NULL );
- ts = *pts;
- } else {
+ if ( table_row->gobj_param_name != NULL )
+ {
+ Timespec* pts;
+ g_object_get( pObject, table_row->gobj_param_name, &pts, NULL );
+ ts = *pts;
+ }
+ else
+ {
ts_getter = (TimespecAccessFunc)gnc_sql_get_getter( obj_name, table_row );
- g_return_if_fail( ts_getter != NULL );
+ g_return_if_fail( ts_getter != NULL );
ts = (*ts_getter)( pObject );
- }
+ }
value = g_new0( GValue, 1 );
- g_assert( value != NULL );
+ g_assert( value != NULL );
(void)g_value_init( value, G_TYPE_STRING );
- if( ts.tv_sec != 0 || ts.tv_nsec != 0 ) {
+ if ( ts.tv_sec != 0 || ts.tv_nsec != 0 )
+ {
datebuf = gnc_sql_convert_timespec_to_string( be, ts );
- g_value_take_string( value, datebuf );
+ g_value_take_string( value, datebuf );
}
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append( (*pList), value );
}
static GncSqlColumnTypeHandler timespec_handler
- = { load_timespec,
- add_timespec_col_info_to_list,
- gnc_sql_add_colname_to_list,
- add_gvalue_timespec_to_slist };
+= {
+ load_timespec,
+ add_timespec_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ add_gvalue_timespec_to_slist
+};
/* ----------------------------------------------------------------- */
#define DATE_COL_SIZE 8
static void
load_date( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+/*@ null @*/ QofSetterFunc setter, gpointer pObject,
+const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GDate* date;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if( val != NULL ) {
- if( G_VALUE_HOLDS_STRING( val ) ) {
- // Format of date is YYYYMMDD
- const gchar* s = g_value_get_string( val );
+ if ( val != NULL )
+ {
+ if ( G_VALUE_HOLDS_STRING( val ) )
+ {
+ // Format of date is YYYYMMDD
+ const gchar* s = g_value_get_string( val );
- if( s != NULL ) {
- gchar buf[5];
- GDateDay day;
- guint month;
- GDateYear year;
+ if ( s != NULL )
+ {
+ gchar buf[5];
+ GDateDay day;
+ guint month;
+ GDateYear year;
- strncpy( buf, &s[0], 4 );
- buf[4] = '\0';
- year = (GDateYear)atoi( buf );
- strncpy( buf, &s[4], 2 );
- buf[2] = '\0';
- month = (guint)atoi( buf );
- strncpy( buf, &s[6], 2 );
- day = (GDateDay)atoi( buf );
+ strncpy( buf, &s[0], 4 );
+ buf[4] = '\0';
+ year = (GDateYear)atoi( buf );
+ strncpy( buf, &s[4], 2 );
+ buf[2] = '\0';
+ month = (guint)atoi( buf );
+ strncpy( buf, &s[6], 2 );
+ day = (GDateDay)atoi( buf );
- if( year != 0 || month != 0 || day != (GDateDay)0 ) {
- date = g_date_new_dmy( day, month, year );
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, date, NULL );
- } else {
- (*setter)( pObject, date );
- }
- g_date_free( date );
- }
- }
- } else {
- PWARN( "Unknown date type: %s", G_VALUE_TYPE_NAME( val ) );
+ if ( year != 0 || month != 0 || day != (GDateDay)0 )
+ {
+ date = g_date_new_dmy( day, month, year );
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, date, NULL );
+ }
+ else
+ {
+ (*setter)( pObject, date );
+ }
+ g_date_free( date );
+ }
+ }
}
+ else
+ {
+ PWARN( "Unknown date type: %s", G_VALUE_TYPE_NAME( val ) );
+ }
}
}
static void
add_date_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+GList** pList )
{
- GncSqlColumnInfo* info;
+ GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- info = create_column_info( table_row, BCT_DATE, DATE_COL_SIZE, FALSE );
+ info = create_column_info( table_row, BCT_DATE, DATE_COL_SIZE, FALSE );
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append( *pList, info );
}
static void
add_gvalue_date_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject,
- const GncSqlColumnTableEntry* table_row, GSList** pList )
+const gpointer pObject,
+const GncSqlColumnTableEntry* table_row, GSList** pList )
{
GDate* date = NULL;
QofAccessFunc getter;
- gchar* buf;
- GValue* value;
+ gchar* buf;
+ GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( obj_name != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
value = g_new0( GValue, 1 );
- g_assert( value != NULL );
+ g_assert( value != NULL );
(void)g_value_init( value, G_TYPE_STRING );
- if( table_row->gobj_param_name != NULL ) {
- g_object_get( pObject, table_row->gobj_param_name, &date, NULL );
- } else {
- getter = gnc_sql_get_getter( obj_name, table_row );
- if( getter != NULL ) {
- date = (GDate*)(*getter)( pObject, NULL );
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_get( pObject, table_row->gobj_param_name, &date, NULL );
+ }
+ else
+ {
+ getter = gnc_sql_get_getter( obj_name, table_row );
+ if ( getter != NULL )
+ {
+ date = (GDate*)(*getter)( pObject, NULL );
}
}
- if( g_date_valid( date ) ) {
- buf = g_strdup_printf( "%04d%02d%02d",
- g_date_get_year( date ), g_date_get_month( date ), g_date_get_day( date ) );
- g_value_take_string( value, buf );
- }
+ if ( g_date_valid( date ) )
+ {
+ buf = g_strdup_printf( "%04d%02d%02d",
+ g_date_get_year( date ), g_date_get_month( date ), g_date_get_day( date ) );
+ g_value_take_string( value, buf );
+ }
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append( (*pList), value );
}
static GncSqlColumnTypeHandler date_handler
- = { load_date,
- add_date_col_info_to_list,
- gnc_sql_add_colname_to_list,
- add_gvalue_date_to_slist };
+= {
+ load_date,
+ add_date_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ add_gvalue_date_to_slist
+};
/* ----------------------------------------------------------------- */
typedef gnc_numeric (*NumericGetterFunc)( const gpointer );
typedef void (*NumericSetterFunc)( gpointer, gnc_numeric );
static const GncSqlColumnTableEntry numeric_col_table[] =
{
- /*@ -full_init_block @*/
+ /*@ -full_init_block @*/
{ "num", CT_INT64, 0, COL_NNUL, "guid" },
{ "denom", CT_INT64, 0, COL_NNUL, "guid" },
- { NULL }
- /*@ +full_init_block @*/
+ { NULL }
+ /*@ +full_init_block @*/
};
static void
load_numeric( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gchar* buf;
@@ -1862,117 +2100,135 @@
gnc_numeric n;
gboolean isNull = FALSE;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
buf = g_strdup_printf( "%s_num", table_row->col_name );
val = gnc_sql_row_get_value_at_col_name( row, buf );
g_free( buf );
- if( val == NULL ) {
+ if ( val == NULL )
+ {
isNull = TRUE;
num = 0;
- } else {
+ }
+ else
+ {
num = gnc_sql_get_integer_value( val );
}
buf = g_strdup_printf( "%s_denom", table_row->col_name );
val = gnc_sql_row_get_value_at_col_name( row, buf );
g_free( buf );
- if( val == NULL ) {
+ if ( val == NULL )
+ {
isNull = TRUE;
denom = 1;
- } else {
+ }
+ else
+ {
denom = gnc_sql_get_integer_value( val );
}
n = gnc_numeric_create( num, denom );
- if( !isNull ) {
- if( table_row->gobj_param_name != NULL ) {
+ if ( !isNull )
+ {
+ if ( table_row->gobj_param_name != NULL )
+ {
g_object_set( pObject, table_row->gobj_param_name, &n, NULL );
- } else {
- NumericSetterFunc n_setter = (NumericSetterFunc)setter;
+ }
+ else
+ {
+ NumericSetterFunc n_setter = (NumericSetterFunc)setter;
(*n_setter)( pObject, n );
- }
+ }
}
}
static void
add_numeric_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+ GList** pList )
{
- GncSqlColumnInfo* info;
+ GncSqlColumnInfo* info;
gchar* buf;
- const GncSqlColumnTableEntry* subtable_row;
+ const GncSqlColumnTableEntry* subtable_row;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( table_row != NULL );
+ g_return_if_fail( pList != NULL );
- for( subtable_row = numeric_col_table; subtable_row->col_name != NULL; subtable_row++ ) {
- buf = g_strdup_printf( "%s_%s", table_row->col_name, subtable_row->col_name );
- info = g_new0( GncSqlColumnInfo, 1 );
- g_assert( info != NULL );
- info->name = buf;
- info->type = BCT_INT64;
- info->is_primary_key = ((table_row->flags & COL_PKEY) != 0) ? TRUE : FALSE;
- info->null_allowed = ((table_row->flags & COL_NNUL) != 0) ? FALSE : TRUE;
- info->is_unicode = FALSE;
- *pList = g_list_append( *pList, info );
- }
+ for ( subtable_row = numeric_col_table; subtable_row->col_name != NULL; subtable_row++ )
+ {
+ buf = g_strdup_printf( "%s_%s", table_row->col_name, subtable_row->col_name );
+ info = g_new0( GncSqlColumnInfo, 1 );
+ g_assert( info != NULL );
+ info->name = buf;
+ info->type = BCT_INT64;
+ info->is_primary_key = ((table_row->flags & COL_PKEY) != 0) ? TRUE : FALSE;
+ info->null_allowed = ((table_row->flags & COL_NNUL) != 0) ? FALSE : TRUE;
+ info->is_unicode = FALSE;
+ *pList = g_list_append( *pList, info );
+ }
}
static void
add_numeric_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList )
{
- gnc_sql_add_subtable_colnames_to_list( table_row, numeric_col_table, pList );
+ gnc_sql_add_subtable_colnames_to_list( table_row, numeric_col_table, pList );
}
static void
add_gvalue_numeric_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
NumericGetterFunc getter;
gnc_numeric n;
GValue* num_value;
GValue* denom_value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( obj_name != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
- if( table_row->gobj_param_name != NULL ) {
- gnc_numeric *s;
- g_object_get( pObject, table_row->gobj_param_name, &s, NULL );
- n = *s;
- } else {
- getter = (NumericGetterFunc)gnc_sql_get_getter( obj_name, table_row );
- if( getter != NULL ) {
- n = (*getter)( pObject );
- } else {
- n = gnc_numeric_zero();
- }
- }
+ if ( table_row->gobj_param_name != NULL )
+ {
+ gnc_numeric *s;
+ g_object_get( pObject, table_row->gobj_param_name, &s, NULL );
+ n = *s;
+ }
+ else
+ {
+ getter = (NumericGetterFunc)gnc_sql_get_getter( obj_name, table_row );
+ if ( getter != NULL )
+ {
+ n = (*getter)( pObject );
+ }
+ else
+ {
+ n = gnc_numeric_zero();
+ }
+ }
num_value = g_new0( GValue, 1 );
- g_assert( num_value != NULL );
+ g_assert( num_value != NULL );
(void)g_value_init( num_value, G_TYPE_INT64 );
g_value_set_int64( num_value, gnc_numeric_num( n ) );
denom_value = g_new0( GValue, 1 );
- g_assert( denom_value != NULL );
+ g_assert( denom_value != NULL );
(void)g_value_init( denom_value, G_TYPE_INT64 );
g_value_set_int64( denom_value, gnc_numeric_denom( n ) );
- (*pList) = g_slist_append( (*pList), num_value );
- (*pList) = g_slist_append( (*pList), denom_value );
+ (*pList) = g_slist_append( (*pList), num_value );
+ (*pList) = g_slist_append( (*pList), denom_value );
}
static GncSqlColumnTypeHandler numeric_handler
- = { load_numeric,
- add_numeric_col_info_to_list,
- add_numeric_colname_to_list,
- add_gvalue_numeric_to_slist };
+= { load_numeric,
+ add_numeric_col_info_to_list,
+ add_numeric_colname_to_list,
+ add_gvalue_numeric_to_slist
+ };
/* ================================================================= */
static /*@ null @*//*@ only @*/ GHashTable* g_columnTypeHash = NULL;
@@ -1980,16 +2236,17 @@
void
gnc_sql_register_col_type_handler( const gchar* colType, const GncSqlColumnTypeHandler* handler )
{
- g_return_if_fail( colType != NULL );
- g_return_if_fail( handler != NULL );
+ g_return_if_fail( colType != NULL );
+ g_return_if_fail( handler != NULL );
- if( g_columnTypeHash == NULL ) {
- g_columnTypeHash = g_hash_table_new( g_str_hash, g_str_equal );
- g_assert( g_columnTypeHash != NULL );
- }
+ if ( g_columnTypeHash == NULL )
+ {
+ g_columnTypeHash = g_hash_table_new( g_str_hash, g_str_equal );
+ g_assert( g_columnTypeHash != NULL );
+ }
- DEBUG( "Col type %s registered\n", colType );
- g_hash_table_insert( g_columnTypeHash, (gpointer)colType, (gpointer)handler );
+ DEBUG( "Col type %s registered\n", colType );
+ g_hash_table_insert( g_columnTypeHash, (gpointer)colType, (gpointer)handler );
}
/*@ dependent @*//*@ null @*/ static GncSqlColumnTypeHandler*
@@ -1997,15 +2254,18 @@
{
GncSqlColumnTypeHandler* pHandler;
- g_return_val_if_fail( table_row != NULL, NULL );
- g_return_val_if_fail( table_row->col_type != NULL, NULL );
+ g_return_val_if_fail( table_row != NULL, NULL );
+ g_return_val_if_fail( table_row->col_type != NULL, NULL );
- if( g_columnTypeHash != NULL ) {
- pHandler = g_hash_table_lookup( g_columnTypeHash, table_row->col_type );
- g_assert( pHandler != NULL );
- } else {
- pHandler = NULL;
- }
+ if ( g_columnTypeHash != NULL )
+ {
+ pHandler = g_hash_table_lookup( g_columnTypeHash, table_row->col_type );
+ g_assert( pHandler != NULL );
+ }
+ else
+ {
+ pHandler = NULL;
+ }
return pHandler;
}
@@ -2013,7 +2273,7 @@
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_STRING, &string_handler );
gnc_sql_register_col_type_handler( CT_BOOLEAN, &boolean_handler );
gnc_sql_register_col_type_handler( CT_INT, &int_handler );
gnc_sql_register_col_type_handler( CT_INT64, &int64_handler );
@@ -2024,35 +2284,36 @@
gnc_sql_register_col_type_handler( CT_NUMERIC, &numeric_handler );
}
-void
+void
_retrieve_guid_( gpointer pObject, /*@ null @*/ gpointer pValue )
{
GncGUID* pGuid = (GncGUID*)pObject;
GncGUID* guid = (GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pValue != NULL );
- memcpy( pGuid, guid, sizeof( GncGUID ) );
+ memcpy( pGuid, guid, sizeof( GncGUID ) );
}
// Table to retrieve just the guid
static GncSqlColumnTableEntry guid_table[] =
{
- /*@ -full_init_block @*/
+ /*@ -full_init_block @*/
{ "guid", CT_GUID, 0, 0, NULL, NULL, NULL, _retrieve_guid_ },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
-/*@ null @*/ const GncGUID*
+/*@ null @*/
+const GncGUID*
gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row )
{
- static GncGUID guid;
+ static GncGUID guid;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( row != NULL, NULL );
gnc_sql_load_object( be, row, NULL, &guid, guid_table );
@@ -2062,19 +2323,20 @@
// Table to retrieve just the guid
static GncSqlColumnTableEntry tx_guid_table[] =
{
- /*@ -full_init_block @*/
+ /*@ -full_init_block @*/
{ "tx_guid", CT_GUID, 0, 0, NULL, NULL, NULL, _retrieve_guid_ },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
-/*@ null @*//*@ dependent @*/ const GncGUID*
+/*@ null @*//*@ dependent @*/
+const GncGUID*
gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row )
{
static GncGUID guid;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( row != NULL, NULL );
gnc_sql_load_object( be, row, NULL, &guid, tx_guid_table );
@@ -2083,30 +2345,36 @@
void
gnc_sql_load_object( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table )
+ /*@ null @*/ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table )
{
QofSetterFunc setter;
GncSqlColumnTypeHandler* pHandler;
- const GncSqlColumnTableEntry* table_row;
+ const GncSqlColumnTableEntry* table_row;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table != NULL );
- for( table_row = table; table_row->col_name != NULL; table_row++ ) {
- if( (table_row->flags & COL_AUTOINC) != 0 ) {
- setter = set_autoinc_id;
- } else if( table_row->qof_param_name != NULL ) {
- g_assert( obj_name != NULL );
+ for ( table_row = table; table_row->col_name != NULL; table_row++ )
+ {
+ if ( (table_row->flags & COL_AUTOINC) != 0 )
+ {
+ setter = set_autoinc_id;
+ }
+ else if ( table_row->qof_param_name != NULL )
+ {
+ g_assert( obj_name != NULL );
setter = qof_class_get_parameter_setter( obj_name,
- table_row->qof_param_name );
- } else {
+ table_row->qof_param_name );
+ }
+ else
+ {
setter = table_row->setter;
}
pHandler = get_handler( table_row );
- g_assert( pHandler != NULL );
+ g_assert( pHandler != NULL );
pHandler->load_fn( be, row, setter, pObject, table_row );
}
}
@@ -2115,34 +2383,34 @@
/*@ null @*/ GncSqlStatement*
gnc_sql_create_select_statement( GncSqlBackend* be, const gchar* table_name )
{
- gchar* sql;
- GncSqlStatement* stmt;
+ gchar* sql;
+ GncSqlStatement* stmt;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
+ 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 );
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- g_free( sql );
- return stmt;
+ sql = g_strdup_printf( "SELECT * FROM %s", table_name );
+ stmt = gnc_sql_create_statement_from_sql( be, sql );
+ g_free( sql );
+ return stmt;
}
/*@ null @*/ static GncSqlStatement*
create_single_col_select_statement( GncSqlBackend* be,
- const gchar* table_name,
- const GncSqlColumnTableEntry* table_row )
+ const gchar* table_name,
+ const GncSqlColumnTableEntry* table_row )
{
- gchar* sql;
- GncSqlStatement* stmt;
+ gchar* sql;
+ GncSqlStatement* stmt;
- 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 );
+ 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 );
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- g_free( sql );
- return stmt;
+ sql = g_strdup_printf( "SELECT %s FROM %s", table_row->col_name, table_name );
+ stmt = gnc_sql_create_statement_from_sql( be, sql );
+ g_free( sql );
+ return stmt;
}
/* ================================================================= */
@@ -2152,13 +2420,14 @@
{
GncSqlResult* result;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( stmt != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( stmt != NULL, NULL );
result = gnc_sql_connection_execute_select_statement( be->conn, stmt );
- if( result == NULL ) {
+ if ( result == NULL )
+ {
PERR( "SQL error: %s\n", gnc_sql_statement_to_sql( stmt ) );
- qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
+ qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
}
return result;
@@ -2167,74 +2436,79 @@
/*@ null @*/ GncSqlStatement*
gnc_sql_create_statement_from_sql( GncSqlBackend* be, const gchar* sql )
{
- GncSqlStatement* stmt;
+ GncSqlStatement* stmt;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( sql != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( sql != NULL, NULL );
- stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sql );
- if( stmt == NULL ) {
+ stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sql );
+ if ( stmt == NULL )
+ {
PERR( "SQL error: %s\n", sql );
- qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
+ qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
}
- return stmt;
+ return stmt;
}
/*@ null @*/ GncSqlResult*
gnc_sql_execute_select_sql( GncSqlBackend* be, const gchar* sql )
{
- GncSqlStatement* stmt;
- GncSqlResult* result = NULL;
+ GncSqlStatement* stmt;
+ GncSqlResult* result = NULL;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( sql != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( sql != NULL, NULL );
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- if( stmt == NULL ) {
- return NULL;
+ stmt = gnc_sql_create_statement_from_sql( be, sql );
+ if ( stmt == NULL )
+ {
+ return NULL;
}
- result = gnc_sql_connection_execute_select_statement( be->conn, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result == NULL ) {
+ result = gnc_sql_connection_execute_select_statement( be->conn, stmt );
+ gnc_sql_statement_dispose( stmt );
+ if ( result == NULL )
+ {
PERR( "SQL error: %s\n", sql );
- qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
+ qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
}
- return result;
+ return result;
}
gint
gnc_sql_execute_nonselect_sql( GncSqlBackend* be, const gchar* sql )
{
- GncSqlStatement* stmt;
- gint result;
+ GncSqlStatement* stmt;
+ gint result;
- g_return_val_if_fail( be != NULL, 0 );
- g_return_val_if_fail( sql != NULL, 0 );
+ g_return_val_if_fail( be != NULL, 0 );
+ g_return_val_if_fail( sql != NULL, 0 );
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- if( stmt == NULL ) {
- return -1;
+ stmt = gnc_sql_create_statement_from_sql( be, sql );
+ if ( stmt == NULL )
+ {
+ return -1;
}
- result = gnc_sql_connection_execute_nonselect_statement( be->conn, stmt );
- gnc_sql_statement_dispose( stmt );
- return result;
+ result = gnc_sql_connection_execute_nonselect_statement( be->conn, stmt );
+ gnc_sql_statement_dispose( stmt );
+ return result;
}
static guint
execute_statement_get_count( GncSqlBackend* be, GncSqlStatement* stmt )
{
GncSqlResult* result;
- guint count = 0;
+ guint count = 0;
- g_return_val_if_fail( be != NULL, 0 );
- g_return_val_if_fail( stmt != NULL, 0 );
+ g_return_val_if_fail( be != NULL, 0 );
+ g_return_val_if_fail( stmt != NULL, 0 );
result = gnc_sql_execute_select_statement( be, stmt );
- if( result != NULL ) {
+ if ( result != NULL )
+ {
count = gnc_sql_result_get_num_rows( result );
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose( result );
}
return count;
@@ -2243,191 +2517,227 @@
guint
gnc_sql_append_guid_list_to_sql( GString* sql, GList* list, guint maxCount )
{
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
- gboolean first_guid = TRUE;
- guint count;
+ gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ gboolean first_guid = TRUE;
+ guint count;
- g_return_val_if_fail( sql != NULL, 0 );
+ g_return_val_if_fail( sql != NULL, 0 );
- if( list == NULL ) return 0;
+ if ( list == NULL ) return 0;
- for( count = 0; list != NULL && count < maxCount; list = list->next, count++ ) {
- QofInstance* inst = QOF_INSTANCE(list->data);
- (void)guid_to_string_buff( qof_instance_get_guid( inst ), guid_buf );
+ for ( count = 0; list != NULL && count < maxCount; list = list->next, count++ )
+ {
+ QofInstance* inst = QOF_INSTANCE(list->data);
+ (void)guid_to_string_buff( qof_instance_get_guid( inst ), guid_buf );
- if( !first_guid ) {
- (void)g_string_append( sql, "," );
- }
- (void)g_string_append( sql, "'" );
- (void)g_string_append( sql, guid_buf );
- (void)g_string_append( sql, "'" );
- first_guid = FALSE;
+ if ( !first_guid )
+ {
+ (void)g_string_append( sql, "," );
+ }
+ (void)g_string_append( sql, "'" );
+ (void)g_string_append( sql, guid_buf );
+ (void)g_string_append( sql, "'" );
+ first_guid = FALSE;
}
- return count;
+ return count;
}
/* ================================================================= */
gboolean
gnc_sql_object_is_it_in_db( GncSqlBackend* be, const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table )
+ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table )
{
GncSqlStatement* sqlStmt;
guint count;
GncSqlColumnTypeHandler* pHandler;
- GSList* list = NULL;
+ GSList* list = NULL;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( obj_name != NULL, FALSE );
- g_return_val_if_fail( pObject != NULL, FALSE );
- g_return_val_if_fail( table != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( table_name != NULL, FALSE );
+ g_return_val_if_fail( obj_name != NULL, FALSE );
+ g_return_val_if_fail( pObject != NULL, FALSE );
+ g_return_val_if_fail( table != NULL, FALSE );
/* SELECT * FROM */
sqlStmt = create_single_col_select_statement( be, table_name, table );
- g_assert( sqlStmt != NULL );
+ g_assert( sqlStmt != NULL );
/* WHERE */
pHandler = get_handler( table );
- g_assert( pHandler != NULL );
- pHandler->add_gvalue_to_slist_fn( be, obj_name, pObject, table, &list );
- g_assert( list != NULL );
- gnc_sql_statement_add_where_cond( sqlStmt, obj_name, pObject, &table[0], (GValue*)(list->data) );
+ g_assert( pHandler != NULL );
+ pHandler->add_gvalue_to_slist_fn( be, obj_name, pObject, table, &list );
+ g_assert( list != NULL );
+ gnc_sql_statement_add_where_cond( sqlStmt, obj_name, pObject, &table[0], (GValue*)(list->data) );
count = execute_statement_get_count( be, sqlStmt );
- gnc_sql_statement_dispose( sqlStmt );
- if( count == 0 ) {
+ gnc_sql_statement_dispose( sqlStmt );
+ if ( count == 0 )
+ {
return FALSE;
- } else {
+ }
+ else
+ {
return TRUE;
}
}
gboolean
gnc_sql_do_db_operation( GncSqlBackend* be,
- E_DB_OPERATION op,
- const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table )
+ E_DB_OPERATION op,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table )
{
GncSqlStatement* stmt = NULL;
- gboolean ok = FALSE;
+ gboolean ok = FALSE;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( obj_name != NULL, FALSE );
- g_return_val_if_fail( pObject != NULL, FALSE );
- g_return_val_if_fail( table != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( table_name != NULL, FALSE );
+ g_return_val_if_fail( obj_name != NULL, FALSE );
+ g_return_val_if_fail( pObject != NULL, FALSE );
+ g_return_val_if_fail( table != NULL, FALSE );
- if( op == OP_DB_INSERT ) {
+ if ( op == OP_DB_INSERT )
+ {
stmt = build_insert_statement( be, table_name, obj_name, pObject, table );
- } else if( op == OP_DB_UPDATE ) {
+ }
+ else if ( op == OP_DB_UPDATE )
+ {
stmt = build_update_statement( be, table_name, obj_name, pObject, table );
- } else if( op == OP_DB_DELETE ) {
+ }
+ else if ( op == OP_DB_DELETE )
+ {
stmt = build_delete_statement( be, table_name, obj_name, pObject, table );
- } else {
+ }
+ else
+ {
g_assert( FALSE );
}
- if( stmt != NULL ) {
- gint result;
+ if ( stmt != NULL )
+ {
+ gint result;
- result = gnc_sql_connection_execute_nonselect_statement( be->conn, stmt );
- if( result == -1 ) {
- PERR( "SQL error: %s\n", gnc_sql_statement_to_sql( stmt ) );
- qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
- } else {
- ok = TRUE;
- }
- gnc_sql_statement_dispose( stmt );
+ result = gnc_sql_connection_execute_nonselect_statement( be->conn, stmt );
+ if ( result == -1 )
+ {
+ PERR( "SQL error: %s\n", gnc_sql_statement_to_sql( stmt ) );
+ qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
+ }
+ else
+ {
+ ok = TRUE;
+ }
+ gnc_sql_statement_dispose( stmt );
}
- return ok;
+ return ok;
}
static GSList*
create_gslist_from_values( GncSqlBackend* be,
- QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table )
+ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table )
{
- GSList* list = NULL;
- GncSqlColumnTypeHandler* pHandler;
- const GncSqlColumnTableEntry* table_row;
+ GSList* list = NULL;
+ GncSqlColumnTypeHandler* pHandler;
+ const GncSqlColumnTableEntry* table_row;
- for( table_row = table; table_row->col_name != NULL; table_row++ ) {
- if(( table_row->flags & COL_AUTOINC ) == 0 ) {
- pHandler = get_handler( table_row );
- g_assert( pHandler != NULL );
- pHandler->add_gvalue_to_slist_fn( be, obj_name, pObject, table_row, &list );
- }
+ for ( table_row = table; table_row->col_name != NULL; table_row++ )
+ {
+ if (( table_row->flags & COL_AUTOINC ) == 0 )
+ {
+ pHandler = get_handler( table_row );
+ g_assert( pHandler != NULL );
+ pHandler->add_gvalue_to_slist_fn( be, obj_name, pObject, table_row, &list );
+ }
}
- g_assert( list != NULL );
- return list;
+ g_assert( list != NULL );
+ return list;
}
gchar*
gnc_sql_get_sql_value( const GncSqlConnection* conn, const GValue* value )
{
- if( value != NULL && G_IS_VALUE( value ) ) {
- GType type = G_VALUE_TYPE(value);
+ if ( value != NULL && G_IS_VALUE( value ) )
+ {
+ GType type = G_VALUE_TYPE(value);
- if( G_VALUE_HOLDS_STRING(value) ) {
- if( g_value_get_string( value ) != NULL ) {
- gchar* before_str;
- gchar* after_str;
- before_str = g_value_dup_string( value );
- after_str = gnc_sql_connection_quote_string( conn, before_str );
- g_free( before_str );
- return after_str;
- } else {
- return g_strdup( "NULL" );
- }
- } else if( type == G_TYPE_INT64 ) {
- return g_strdup_printf( "%" G_GINT64_FORMAT, g_value_get_int64( value ) );
+ if ( G_VALUE_HOLDS_STRING(value) )
+ {
+ if ( g_value_get_string( value ) != NULL )
+ {
+ gchar* before_str;
+ gchar* after_str;
+ before_str = g_value_dup_string( value );
+ after_str = gnc_sql_connection_quote_string( conn, before_str );
+ g_free( before_str );
+ return after_str;
+ }
+ else
+ {
+ return g_strdup( "NULL" );
+ }
+ }
+ else if ( type == G_TYPE_INT64 )
+ {
+ return g_strdup_printf( "%" G_GINT64_FORMAT, g_value_get_int64( value ) );
- } else if( type == G_TYPE_INT ) {
- return g_strdup_printf( "%d", g_value_get_int( value ) );
+ }
+ else if ( type == G_TYPE_INT )
+ {
+ return g_strdup_printf( "%d", g_value_get_int( value ) );
- } else if( type == G_TYPE_DOUBLE ) {
- return g_strdup_printf( "%g", g_value_get_double( value ) );
+ }
+ else if ( type == G_TYPE_DOUBLE )
+ {
+ return g_strdup_printf( "%g", g_value_get_double( value ) );
- } else if( g_value_type_transformable( type, G_TYPE_STRING ) ) {
- GValue* string;
- gchar* str;
-
- string = g_new0( GValue, 1 );
- g_assert( string != NULL );
- (void)g_value_init( string, G_TYPE_STRING );
- (void)g_value_transform( value, string );
- str = g_value_dup_string( string );
- g_value_unset( string );
- g_free( string );
- PWARN( "using g_value_transform(), gtype = '%s'\n", g_type_name( type ) );
- return str;
- } else {
- PWARN( "not transformable, gtype = '%s'\n", g_type_name( type ) );
- return g_strdup( "$$$" );
- }
- } else {
- PWARN( "value is NULL or not G_IS_VALUE()\n" );
- return g_strdup( "" );
- }
+ }
+ else if ( g_value_type_transformable( type, G_TYPE_STRING ) )
+ {
+ GValue* string;
+ gchar* str;
+
+ string = g_new0( GValue, 1 );
+ g_assert( string != NULL );
+ (void)g_value_init( string, G_TYPE_STRING );
+ (void)g_value_transform( value, string );
+ str = g_value_dup_string( string );
+ g_value_unset( string );
+ g_free( string );
+ PWARN( "using g_value_transform(), gtype = '%s'\n", g_type_name( type ) );
+ return str;
+ }
+ else
+ {
+ PWARN( "not transformable, gtype = '%s'\n", g_type_name( type ) );
+ return g_strdup( "$$$" );
+ }
+ }
+ else
+ {
+ PWARN( "value is NULL or not G_IS_VALUE()\n" );
+ return g_strdup( "" );
+ }
}
static void
free_gvalue_list( GSList* list )
{
GSList* node;
- GValue* value;
+ GValue* value;
- for( node = list; node != NULL; node = node->next ) {
- value = (GValue*)node->data;
+ for ( node = list; node != NULL; node = node->next )
+ {
+ value = (GValue*)node->data;
- g_value_unset( value );
- g_free( value );
- }
- g_slist_free( list );
+ g_value_unset( value );
+ g_free( value );
+ }
+ g_slist_free( list );
}
/*@ null @*/ static GncSqlStatement*
@@ -2436,67 +2746,73 @@
QofIdTypeConst obj_name, gpointer pObject,
const GncSqlColumnTableEntry* table )
{
- GncSqlStatement* stmt;
- GString* sql;
- GSList* values;
- GSList* node;
- gchar* sqlbuf;
- GList* colnames = NULL;
- GList* colname;
- const GncSqlColumnTableEntry* table_row;
+ GncSqlStatement* stmt;
+ GString* sql;
+ GSList* values;
+ GSList* node;
+ gchar* sqlbuf;
+ GList* colnames = NULL;
+ GList* colname;
+ const GncSqlColumnTableEntry* table_row;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( obj_name != NULL, NULL );
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( table != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( table_name != NULL, NULL );
+ g_return_val_if_fail( obj_name != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( table != NULL, NULL );
- sqlbuf = g_strdup_printf( "INSERT INTO %s(", table_name );
- sql = g_string_new( sqlbuf );
- g_free( sqlbuf );
+ sqlbuf = g_strdup_printf( "INSERT INTO %s(", table_name );
+ sql = g_string_new( sqlbuf );
+ g_free( sqlbuf );
// Get all col names and all values
- for( table_row = table; table_row->col_name != NULL; table_row++ ) {
- if(( table_row->flags & COL_AUTOINC ) == 0 ) {
- GncSqlColumnTypeHandler* pHandler;
+ for ( table_row = table; table_row->col_name != NULL; table_row++ )
+ {
+ if (( table_row->flags & COL_AUTOINC ) == 0 )
+ {
+ GncSqlColumnTypeHandler* pHandler;
- // Add col names to the list
- pHandler = get_handler( table_row );
- g_assert( pHandler != NULL );
- pHandler->add_colname_to_list_fn( table_row, &colnames );
- }
- }
- g_assert( colnames != NULL );
+ // Add col names to the list
+ pHandler = get_handler( table_row );
+ g_assert( pHandler != NULL );
+ pHandler->add_colname_to_list_fn( table_row, &colnames );
+ }
+ }
+ g_assert( colnames != NULL );
- for( colname = colnames; colname != NULL; colname = colname->next ) {
- if( colname != colnames ) {
- g_string_append( sql, "," );
- }
- g_string_append( sql, (gchar*)colname->data );
- g_free( colname->data );
- }
- g_list_free( colnames );
+ for ( colname = colnames; colname != NULL; colname = colname->next )
+ {
+ if ( colname != colnames )
+ {
+ g_string_append( sql, "," );
+ }
+ g_string_append( sql, (gchar*)colname->data );
+ g_free( colname->data );
+ }
+ g_list_free( colnames );
- g_string_append( sql, ") VALUES(" );
- values = create_gslist_from_values( be, obj_name, pObject, table );
- for( node = values; node != NULL; node = node->next ) {
- GValue* value = (GValue*)node->data;
- gchar* value_str;
- if( node != values ) {
- (void)g_string_append( sql, "," );
- }
- value_str = gnc_sql_get_sql_value( be->conn, value );
- (void)g_string_append( sql, value_str );
- g_free( value_str );
- (void)g_value_reset( value );
- }
- free_gvalue_list( values );
- (void)g_string_append( sql, ")" );
+ g_string_append( sql, ") VALUES(" );
+ values = create_gslist_from_values( be, obj_name, pObject, table );
+ for ( node = values; node != NULL; node = node->next )
+ {
+ GValue* value = (GValue*)node->data;
+ gchar* value_str;
+ if ( node != values )
+ {
+ (void)g_string_append( sql, "," );
+ }
+ value_str = gnc_sql_get_sql_value( be->conn, value );
+ (void)g_string_append( sql, value_str );
+ g_free( value_str );
+ (void)g_value_reset( value );
+ }
+ free_gvalue_list( values );
+ (void)g_string_append( sql, ")" );
- stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sql->str );
- (void)g_string_free( sql, TRUE );
+ stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sql->str );
+ (void)g_string_free( sql, TRUE );
- return stmt;
+ return stmt;
}
/*@ null @*/ static GncSqlStatement*
@@ -2505,70 +2821,76 @@
QofIdTypeConst obj_name, gpointer pObject,
const GncSqlColumnTableEntry* table )
{
- GncSqlStatement* stmt;
- GString* sql;
- GSList* values;
- GList* colnames = NULL;
- GSList* value;
- GList* colname;
- gboolean firstCol;
- const GncSqlColumnTableEntry* table_row;
- gchar* sqlbuf;
+ GncSqlStatement* stmt;
+ GString* sql;
+ GSList* values;
+ GList* colnames = NULL;
+ GSList* value;
+ GList* colname;
+ gboolean firstCol;
+ const GncSqlColumnTableEntry* table_row;
+ gchar* sqlbuf;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( obj_name != NULL, NULL );
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( table != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( table_name != NULL, NULL );
+ g_return_val_if_fail( obj_name != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( table != NULL, NULL );
// Get all col names and all values
- for( table_row = table; table_row->col_name != NULL; table_row++ ) {
- if(( table_row->flags & COL_AUTOINC ) == 0 ) {
- GncSqlColumnTypeHandler* pHandler;
+ for ( table_row = table; table_row->col_name != NULL; table_row++ )
+ {
+ if (( table_row->flags & COL_AUTOINC ) == 0 )
+ {
+ GncSqlColumnTypeHandler* pHandler;
- // Add col names to the list
- pHandler = get_handler( table_row );
- g_assert( pHandler != NULL );
- pHandler->add_colname_to_list_fn( table_row, &colnames );
- }
- }
- g_assert( colnames != NULL );
- values = create_gslist_from_values( be, obj_name, pObject, table );
+ // Add col names to the list
+ pHandler = get_handler( table_row );
+ g_assert( pHandler != NULL );
+ pHandler->add_colname_to_list_fn( table_row, &colnames );
+ }
+ }
+ g_assert( colnames != NULL );
+ values = create_gslist_from_values( be, obj_name, pObject, table );
- // Create the SQL statement
- sqlbuf = g_strdup_printf( "UPDATE %s SET ", table_name );
- sql = g_string_new( sqlbuf );
- g_free( sqlbuf );
+ // Create the SQL statement
+ sqlbuf = g_strdup_printf( "UPDATE %s SET ", table_name );
+ sql = g_string_new( sqlbuf );
+ g_free( sqlbuf );
- firstCol = TRUE;
- for( colname = colnames->next, value = values->next;
- colname != NULL && value != NULL;
- colname = colname->next, value = value->next ) {
- gchar* value_str;
- if( !firstCol ) {
- (void)g_string_append( sql, "," );
- }
- (void)g_string_append( sql, (gchar*)colname->data );
- (void)g_string_append( sql, "=" );
- value_str = gnc_sql_get_sql_value( be->conn, (GValue*)(value->data) );
- (void)g_string_append( sql, value_str );
- g_free( value_str );
- firstCol = FALSE;
- }
- for( colname = colnames; colname != NULL; colname = colname->next ) {
- g_free( colname->data );
- }
- g_list_free( colnames );
- if( value != NULL || colname != NULL ) {
- PERR( "Mismatch in number of column names and values" );
- }
+ firstCol = TRUE;
+ for ( colname = colnames->next, value = values->next;
+ colname != NULL && value != NULL;
+ colname = colname->next, value = value->next )
+ {
+ gchar* value_str;
+ if ( !firstCol )
+ {
+ (void)g_string_append( sql, "," );
+ }
+ (void)g_string_append( sql, (gchar*)colname->data );
+ (void)g_string_append( sql, "=" );
+ value_str = gnc_sql_get_sql_value( be->conn, (GValue*)(value->data) );
+ (void)g_string_append( sql, value_str );
+ g_free( value_str );
+ firstCol = FALSE;
+ }
+ for ( colname = colnames; colname != NULL; colname = colname->next )
+ {
+ g_free( colname->data );
+ }
+ g_list_free( colnames );
+ if ( value != NULL || colname != NULL )
+ {
+ PERR( "Mismatch in number of column names and values" );
+ }
- stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sql->str );
- gnc_sql_statement_add_where_cond( stmt, obj_name, pObject, &table[0], (GValue*)(values->data) );
- free_gvalue_list( values );
- (void)g_string_free( sql, TRUE );
+ stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sql->str );
+ gnc_sql_statement_add_where_cond( stmt, obj_name, pObject, &table[0], (GValue*)(values->data) );
+ free_gvalue_list( values );
+ (void)g_string_free( sql, TRUE );
- return stmt;
+ return stmt;
}
/*@ null @*/ static GncSqlStatement*
@@ -2577,181 +2899,193 @@
QofIdTypeConst obj_name, gpointer pObject,
const GncSqlColumnTableEntry* table )
{
- GncSqlStatement* stmt;
+ GncSqlStatement* stmt;
GncSqlColumnTypeHandler* pHandler;
- GSList* list = NULL;
- gchar* sqlbuf;
+ GSList* list = NULL;
+ gchar* sqlbuf;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( obj_name != NULL, NULL );
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( table != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( table_name != NULL, NULL );
+ g_return_val_if_fail( obj_name != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( table != NULL, NULL );
- sqlbuf = g_strdup_printf( "DELETE FROM %s ", table_name );
- stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sqlbuf );
- g_free( sqlbuf );
+ sqlbuf = g_strdup_printf( "DELETE FROM %s ", table_name );
+ stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sqlbuf );
+ g_free( sqlbuf );
/* WHERE */
pHandler = get_handler( table );
- g_assert( pHandler != NULL );
- pHandler->add_gvalue_to_slist_fn( be, obj_name, pObject, table, &list );
- g_assert( list != NULL );
- gnc_sql_statement_add_where_cond( stmt, obj_name, pObject, &table[0], (GValue*)(list->data) );
- free_gvalue_list( list );
+ g_assert( pHandler != NULL );
+ pHandler->add_gvalue_to_slist_fn( be, obj_name, pObject, table, &list );
+ g_assert( list != NULL );
+ gnc_sql_statement_add_where_cond( stmt, obj_name, pObject, &table[0], (GValue*)(list->data) );
+ free_gvalue_list( list );
- return stmt;
+ return stmt;
}
/* ================================================================= */
gboolean
gnc_sql_commit_standard_item( GncSqlBackend* be, QofInstance* inst, const gchar* tableName,
- QofIdTypeConst obj_name, const GncSqlColumnTableEntry* col_table )
+ QofIdTypeConst obj_name, const GncSqlColumnTableEntry* col_table )
{
- const GncGUID* guid;
- gboolean is_infant;
- gint op;
- gboolean is_ok;
+ const GncGUID* guid;
+ gboolean is_infant;
+ gint op;
+ gboolean is_ok;
- is_infant = qof_instance_get_infant( inst );
- if( qof_instance_get_destroying( inst ) ) {
- op = OP_DB_DELETE;
- } else if( be->is_pristine_db || is_infant ) {
- op = OP_DB_INSERT;
- } else {
- op = OP_DB_UPDATE;
- }
+ is_infant = qof_instance_get_infant( inst );
+ if ( qof_instance_get_destroying( inst ) )
+ {
+ op = OP_DB_DELETE;
+ }
+ else if ( be->is_pristine_db || is_infant )
+ {
+ op = OP_DB_INSERT;
+ }
+ else
+ {
+ op = OP_DB_UPDATE;
+ }
is_ok = gnc_sql_do_db_operation( be, op, tableName, obj_name, inst, col_table );
- if( is_ok ) {
- // Now, commit any slots
- guid = qof_instance_get_guid( inst );
- if( !qof_instance_get_destroying(inst) ) {
- is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
- } else {
- is_ok = gnc_sql_slots_delete( be, guid );
- }
- }
+ if ( is_ok )
+ {
+ // Now, commit any slots
+ guid = qof_instance_get_guid( inst );
+ if ( !qof_instance_get_destroying(inst) )
+ {
+ is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
+ }
+ else
+ {
+ is_ok = gnc_sql_slots_delete( be, guid );
+ }
+ }
- return is_ok;
+ return is_ok;
}
/* ================================================================= */
static gboolean
do_create_table( const GncSqlBackend* be, const gchar* table_name,
- const GncSqlColumnTableEntry* col_table )
+ const GncSqlColumnTableEntry* col_table )
{
- GList* col_info_list = NULL;
- gboolean ok = FALSE;
-
- 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 );
-
- for( ; col_table->col_name != NULL; col_table++ ) {
+ GList* col_info_list = NULL;
+ gboolean ok = FALSE;
+
+ 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 );
+
+ for ( ; col_table->col_name != NULL; col_table++ )
+ {
GncSqlColumnTypeHandler* pHandler;
pHandler = get_handler( col_table );
- g_assert( pHandler != NULL );
+ g_assert( pHandler != NULL );
pHandler->add_col_info_to_list_fn( be, col_table, &col_info_list );
}
- g_assert( col_info_list != NULL );
- ok = gnc_sql_connection_create_table( be->conn, table_name, col_info_list );
- return ok;
+ g_assert( col_info_list != NULL );
+ ok = gnc_sql_connection_create_table( be->conn, table_name, col_info_list );
+ return ok;
}
gboolean
gnc_sql_create_table( GncSqlBackend* be, const gchar* table_name,
- gint table_version, const GncSqlColumnTableEntry* col_table )
+ gint table_version, const GncSqlColumnTableEntry* col_table )
{
- gboolean ok;
+ gboolean ok;
- 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( be != NULL, FALSE );
+ g_return_val_if_fail( table_name != NULL, FALSE );
+ g_return_val_if_fail( col_table != NULL, FALSE );
- DEBUG( "Creating %s table\n", table_name );
+ DEBUG( "Creating %s table\n", table_name );
- ok = do_create_table( be, table_name, col_table );
- if( ok ) {
- ok = gnc_sql_set_table_version( be, table_name, table_version );
- }
- return ok;
+ ok = do_create_table( be, table_name, col_table );
+ if ( ok )
+ {
+ ok = gnc_sql_set_table_version( be, table_name, table_version );
+ }
+ return ok;
}
gboolean
gnc_sql_create_temp_table( const GncSqlBackend* be, const gchar* table_name,
- const GncSqlColumnTableEntry* col_table )
+ const GncSqlColumnTableEntry* col_table )
{
- 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( be != NULL, FALSE );
+ g_return_val_if_fail( table_name != NULL, FALSE );
+ g_return_val_if_fail( col_table != NULL, FALSE );
- return do_create_table( be, table_name, col_table );
+ return do_create_table( be, table_name, col_table );
}
gboolean
gnc_sql_create_index( const GncSqlBackend* be, const gchar* index_name,
- const gchar* table_name,
- const GncSqlColumnTableEntry* col_table )
+ const gchar* table_name,
+ const GncSqlColumnTableEntry* col_table )
{
- gboolean ok;
+ gboolean ok;
g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( index_name != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( col_table != NULL, FALSE );
-
- ok = gnc_sql_connection_create_index( be->conn, index_name, table_name,
- col_table );
- return ok;
+ g_return_val_if_fail( index_name != NULL, FALSE );
+ g_return_val_if_fail( table_name != NULL, FALSE );
+ g_return_val_if_fail( col_table != NULL, FALSE );
+
+ ok = gnc_sql_connection_create_index( be->conn, index_name, table_name,
+ col_table );
+ return ok;
}
gint
gnc_sql_get_table_version( const GncSqlBackend* be, const gchar* table_name )
{
- g_return_val_if_fail( be != NULL, 0 );
- g_return_val_if_fail( table_name != NULL, 0 );
+ g_return_val_if_fail( be != NULL, 0 );
+ g_return_val_if_fail( table_name != NULL, 0 );
- /* If the db is pristine because it's being saved, the table does not exist. */
- if( be->is_pristine_db ) {
- return 0;
- }
+ /* If the db is pristine because it's being saved, the table does not exist. */
+ if ( be->is_pristine_db )
+ {
+ return 0;
+ }
- return GPOINTER_TO_INT(g_hash_table_lookup( be->versions, table_name ));
+ return GPOINTER_TO_INT(g_hash_table_lookup( be->versions, table_name ));
}
/* Create a temporary table, copy the data from the old table, delete the
old table, then rename the new one. */
void
gnc_sql_upgrade_table( GncSqlBackend* be, const gchar* table_name,
- const GncSqlColumnTableEntry* col_table )
+ const GncSqlColumnTableEntry* col_table )
{
- gchar* sql;
- gchar* temp_table_name;
+ gchar* sql;
+ gchar* temp_table_name;
g_return_if_fail( be != NULL );
- g_return_if_fail( table_name != NULL );
- g_return_if_fail( col_table != NULL );
+ g_return_if_fail( table_name != NULL );
+ g_return_if_fail( col_table != NULL );
- DEBUG( "Upgrading %s table\n", table_name );
+ DEBUG( "Upgrading %s table\n", table_name );
- temp_table_name = g_strdup_printf( "%s_new", table_name );
+ temp_table_name = g_strdup_printf( "%s_new", table_name );
(void)gnc_sql_create_temp_table( be, temp_table_name, col_table );
- sql = g_strdup_printf( "INSERT INTO %s SELECT * FROM %s",
- temp_table_name, table_name );
- (void)gnc_sql_execute_nonselect_sql( be, sql );
- g_free( sql );
+ sql = g_strdup_printf( "INSERT INTO %s SELECT * FROM %s",
+ temp_table_name, table_name );
+ (void)gnc_sql_execute_nonselect_sql( be, sql );
+ g_free( sql );
- sql = g_strdup_printf( "DROP TABLE %s", table_name );
- (void)gnc_sql_execute_nonselect_sql( be, sql );
- g_free( sql );
+ sql = g_strdup_printf( "DROP TABLE %s", table_name );
+ (void)gnc_sql_execute_nonselect_sql( be, sql );
+ g_free( sql );
- sql = g_strdup_printf( "ALTER TABLE %s RENAME TO %s", temp_table_name, table_name );
- (void)gnc_sql_execute_nonselect_sql( be, sql );
- g_free( sql );
- g_free( temp_table_name );
+ sql = g_strdup_printf( "ALTER TABLE %s RENAME TO %s", temp_table_name, table_name );
+ (void)gnc_sql_execute_nonselect_sql( be, sql );
+ g_free( sql );
+ g_free( temp_table_name );
}
/* ================================================================= */
@@ -2762,11 +3096,11 @@
static GncSqlColumnTableEntry version_table[] =
{
- /*@ -full_init_block @*/
- { TABLE_COL_NAME, CT_STRING, MAX_TABLE_NAME_LEN, COL_PKEY|COL_NNUL },
- { VERSION_COL_NAME, CT_INT, 0, COL_NNUL },
+ /*@ -full_init_block @*/
+ { TABLE_COL_NAME, CT_STRING, MAX_TABLE_NAME_LEN, COL_PKEY | COL_NNUL },
+ { VERSION_COL_NAME, CT_INT, 0, COL_NNUL },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/**
@@ -2778,41 +3112,47 @@
void
gnc_sql_init_version_info( GncSqlBackend* be )
{
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- if( be->versions != NULL ) {
- g_hash_table_destroy( be->versions );
- }
- be->versions = g_hash_table_new_full( g_str_hash, g_str_equal, g_free, NULL );
+ if ( be->versions != NULL )
+ {
+ g_hash_table_destroy( be->versions );
+ }
+ be->versions = g_hash_table_new_full( g_str_hash, g_str_equal, g_free, NULL );
- if( gnc_sql_connection_does_table_exist( be->conn, VERSION_TABLE_NAME ) ) {
- GncSqlResult* result;
- gchar* sql;
+ if ( gnc_sql_connection_does_table_exist( be->conn, VERSION_TABLE_NAME ) )
+ {
+ GncSqlResult* result;
+ gchar* sql;
- sql = g_strdup_printf( "SELECT * FROM %s", VERSION_TABLE_NAME );
- result = gnc_sql_execute_select_sql( be, sql );
- g_free( sql );
- if( result != NULL ) {
- const GValue* name;
- const GValue* version;
- GncSqlRow* row;
+ sql = g_strdup_printf( "SELECT * FROM %s", VERSION_TABLE_NAME );
+ result = gnc_sql_execute_select_sql( be, sql );
+ g_free( sql );
+ if ( result != NULL )
+ {
+ const GValue* name;
+ const GValue* version;
+ GncSqlRow* row;
- row = gnc_sql_result_get_first_row( result );
- while( row != NULL ) {
- name = gnc_sql_row_get_value_at_col_name( row, TABLE_COL_NAME );
- version = gnc_sql_row_get_value_at_col_name( row, VERSION_COL_NAME );
- g_hash_table_insert( be->versions,
- g_strdup( g_value_get_string( name ) ),
- GINT_TO_POINTER((gint)g_value_get_int64( version )) );
- row = gnc_sql_result_get_next_row( result );
- }
- gnc_sql_result_dispose( result );
- }
- } else {
- gboolean ok;
+ row = gnc_sql_result_get_first_row( result );
+ while ( row != NULL )
+ {
+ name = gnc_sql_row_get_value_at_col_name( row, TABLE_COL_NAME );
+ version = gnc_sql_row_get_value_at_col_name( row, VERSION_COL_NAME );
+ g_hash_table_insert( be->versions,
+ g_strdup( g_value_get_string( name ) ),
+ GINT_TO_POINTER((gint)g_value_get_int64( version )) );
+ row = gnc_sql_result_get_next_row( result );
+ }
+ gnc_sql_result_dispose( result );
+ }
+ }
+ else
+ {
+ gboolean ok;
- ok = do_create_table( be, VERSION_TABLE_NAME, version_table );
- }
+ ok = do_create_table( be, VERSION_TABLE_NAME, version_table );
+ }
}
/**
@@ -2825,18 +3165,21 @@
static gboolean
reset_version_info( GncSqlBackend* be )
{
- gboolean ok;
+ gboolean ok;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
- ok = do_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 {
- g_hash_table_remove_all( be->versions );
- }
+ ok = do_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
+ {
+ g_hash_table_remove_all( be->versions );
+ }
- return ok;
+ return ok;
}
/**
@@ -2847,12 +3190,13 @@
void
gnc_sql_finalize_version_info( GncSqlBackend* be )
{
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- if( be->versions != NULL ) {
- g_hash_table_destroy( be->versions );
- be->versions = NULL;
- }
+ if ( be->versions != NULL )
+ {
+ g_hash_table_destroy( be->versions );
+ be->versions = NULL;
+ }
}
/**
@@ -2867,35 +3211,40 @@
gboolean
gnc_sql_set_table_version( GncSqlBackend* be, const gchar* table_name, gint version )
{
- gchar* sql;
- gint cur_version;
- gint status;
+ gchar* sql;
+ gint cur_version;
+ gint status;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( version > 0, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( table_name != NULL, FALSE );
+ g_return_val_if_fail( version > 0, FALSE );
- cur_version = gnc_sql_get_table_version( be, table_name );
- if( cur_version != version ) {
- if( cur_version == 0 ) {
- sql = g_strdup_printf( "INSERT INTO %s VALUES('%s',%d)", VERSION_TABLE_NAME,
- table_name, version );
- } else {
- sql = g_strdup_printf( "UPDATE %s SET %s=%d WHERE %s='%s'", VERSION_TABLE_NAME,
- VERSION_COL_NAME, version,
- TABLE_COL_NAME, table_name );
- }
- status = gnc_sql_execute_nonselect_sql( be, sql );
- if( status == -1 ) {
- PERR( "SQL error: %s\n", sql );
- qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
- }
- g_free( sql );
- }
+ cur_version = gnc_sql_get_table_version( be, table_name );
+ if ( cur_version != version )
+ {
+ if ( cur_version == 0 )
+ {
+ sql = g_strdup_printf( "INSERT INTO %s VALUES('%s',%d)", VERSION_TABLE_NAME,
+ table_name, version );
+ }
+ else
+ {
+ sql = g_strdup_printf( "UPDATE %s SET %s=%d WHERE %s='%s'", VERSION_TABLE_NAME,
+ VERSION_COL_NAME, version,
+ TABLE_COL_NAME, table_name );
+ }
+ status = gnc_sql_execute_nonselect_sql( be, sql );
+ if ( status == -1 )
+ {
+ PERR( "SQL error: %s\n", sql );
+ qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
+ }
+ g_free( sql );
+ }
- g_hash_table_insert( be->versions, g_strdup( table_name ), GINT_TO_POINTER(version) );
+ g_hash_table_insert( be->versions, g_strdup( table_name ), GINT_TO_POINTER(version) );
- return TRUE;
+ return TRUE;
}
/* ========================== END OF FILE ===================== */
Modified: gnucash/trunk/src/backend/sql/gnc-book-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-book-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/gnc-book-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
/** @file gnc-book-sql.c
- * @brief load and save data to SQL
+ * @brief load and save data to SQL
* @author Copyright (c) 2006-2008 Phil Longstaff <plongstaff at rogers.com>
*
* This file implements the top-level QofBackend API for saving/
@@ -57,14 +57,18 @@
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
- { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
- { "root_account_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_root_account_guid, set_root_account_guid },
- { "root_template_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_root_template_guid, set_root_template_guid },
+ /*@ -full_init_block @*/
+ { "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
+ {
+ "root_account_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_root_account_guid, set_root_account_guid
+ },
+ {
+ "root_template_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_root_template_guid, set_root_template_guid
+ },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/* ================================================================= */
@@ -74,23 +78,23 @@
QofBook* book = QOF_BOOK(pObject);
const Account* root;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( QOF_IS_BOOK(pObject), NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( QOF_IS_BOOK(pObject), NULL );
root = gnc_book_get_root_account( book );
return (gpointer)qof_instance_get_guid( QOF_INSTANCE(root) );
}
-static void
+static void
set_root_account_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
{
QofBook* book = QOF_BOOK(pObject);
const Account* root;
GncGUID* guid = (GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( QOF_IS_BOOK(pObject) );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( QOF_IS_BOOK(pObject) );
+ g_return_if_fail( pValue != NULL );
root = gnc_book_get_root_account( book );
qof_instance_set_guid( QOF_INSTANCE(root), guid );
@@ -102,26 +106,27 @@
const QofBook* book = QOF_BOOK(pObject);
const Account* root;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( QOF_IS_BOOK(pObject), NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( QOF_IS_BOOK(pObject), NULL );
root = gnc_book_get_template_root( book );
return (gpointer)qof_instance_get_guid( QOF_INSTANCE(root) );
}
-static void
+static void
set_root_template_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
{
QofBook* book = QOF_BOOK(pObject);
GncGUID* guid = (GncGUID*)pValue;
Account* root;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( QOF_IS_BOOK(pObject) );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( QOF_IS_BOOK(pObject) );
+ g_return_if_fail( pValue != NULL );
root = gnc_book_get_template_root( book );
- if( root == NULL ) {
+ if ( root == NULL )
+ {
root = xaccMallocAccount( book );
xaccAccountBeginEdit( root );
xaccAccountSetType( root, ACCT_TYPE_ROOT );
@@ -136,22 +141,23 @@
load_single_book( GncSqlBackend* be, GncSqlRow* row )
{
const GncGUID* guid;
- QofBook* pBook;
+ QofBook* pBook;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
guid = gnc_sql_load_guid( be, row );
- pBook = be->primary_book;
- if( pBook == NULL ) {
- pBook = qof_book_new();
- }
+ pBook = be->primary_book;
+ if ( pBook == NULL )
+ {
+ pBook = qof_book_new();
+ }
- qof_book_begin_edit( pBook );
+ qof_book_begin_edit( pBook );
gnc_sql_load_object( be, row, GNC_ID_BOOK, pBook, col_table );
gnc_sql_slots_load( be, QOF_INSTANCE(pBook) );
- qof_book_commit_edit( pBook );
+ qof_book_commit_edit( pBook );
qof_instance_mark_clean( QOF_INSTANCE(pBook) );
}
@@ -162,25 +168,30 @@
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
stmt = gnc_sql_create_select_statement( be, BOOK_TABLE );
- if( stmt != NULL ) {
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ if ( stmt != NULL )
+ {
+ result = gnc_sql_execute_select_statement( be, stmt );
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
+ GncSqlRow* row = gnc_sql_result_get_first_row( result );
- // If there are no rows, try committing the book
- if( row == NULL ) {
- (void)gnc_sql_save_book( be, QOF_INSTANCE(be->primary_book) );
- } else {
- // Otherwise, load the 1st book.
- load_single_book( be, row );
- }
+ // If there are no rows, try committing the book
+ if ( row == NULL )
+ {
+ (void)gnc_sql_save_book( be, QOF_INSTANCE(be->primary_book) );
+ }
+ else
+ {
+ // Otherwise, load the 1st book.
+ load_single_book( be, row );
+ }
- gnc_sql_result_dispose( result );
- }
+ gnc_sql_result_dispose( result );
+ }
}
}
@@ -188,12 +199,13 @@
static void
create_book_tables( GncSqlBackend* be )
{
- gint version;
+ gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- version = gnc_sql_get_table_version( be, BOOK_TABLE );
- if( version == 0 ) {
+ version = gnc_sql_get_table_version( be, BOOK_TABLE );
+ if ( version == 0 )
+ {
(void)gnc_sql_create_table( be, BOOK_TABLE, TABLE_VERSION, col_table );
}
}
@@ -202,17 +214,17 @@
gboolean
gnc_sql_save_book( GncSqlBackend* be, QofInstance* inst)
{
- gboolean status;
+ gboolean status;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( QOF_IS_BOOK(inst), FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( inst != NULL, FALSE );
+ g_return_val_if_fail( QOF_IS_BOOK(inst), FALSE );
- status = gnc_sql_commit_standard_item( be, inst, BOOK_TABLE, GNC_ID_BOOK, col_table );
+ status = gnc_sql_commit_standard_item( be, inst, BOOK_TABLE, GNC_ID_BOOK, col_table );
- qof_book_mark_saved( QOF_BOOK(inst) );
+ qof_book_mark_saved( QOF_BOOK(inst) );
- return status;
+ return status;
}
/* ================================================================= */
@@ -226,10 +238,10 @@
gnc_sql_save_book, /* commit */
load_all_books, /* initial_load */
create_book_tables, /* create_tables */
- NULL, /* compile_query */
- NULL, /* run_query */
- NULL, /* free_query */
- NULL /* write */
+ NULL, /* compile_query */
+ NULL, /* run_query */
+ NULL, /* free_query */
+ NULL /* write */
};
(void)qof_object_register_backend( GNC_ID_BOOK, GNC_SQL_BACKEND, &be_data );
Modified: gnucash/trunk/src/backend/sql/gnc-budget-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-budget-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/gnc-budget-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
/** @file gnc-budget-sql.c
- * @brief load and save data to SQL
+ * @brief load and save data to SQL
* @author Copyright (c) 2006-2008 Phil Longstaff <plongstaff at rogers.com>
*
* This file implements the top-level QofBackend API for saving/
@@ -58,13 +58,13 @@
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
- { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ /*@ -full_init_block @*/
+ { "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "name", CT_STRING, BUDGET_MAX_NAME_LEN, COL_NNUL, "name" },
{ "description", CT_STRING, BUDGET_MAX_DESCRIPTION_LEN, 0, "description" },
{ "num_periods", CT_INT, 0, COL_NNUL, "num_periods" },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
static /*@ dependent @*//*@ null @*/ QofInstance* get_budget( gpointer pObj );
@@ -76,26 +76,35 @@
static gnc_numeric get_amount( gpointer pObj );
static void set_amount( gpointer pObj, gnc_numeric value );
-typedef struct {
+typedef struct
+{
GncBudget* budget;
- Account* account;
- guint period_num;
+ Account* account;
+ guint period_num;
} budget_amount_info_t;
static const GncSqlColumnTableEntry budget_amounts_col_table[] =
{
- /*@ -full_init_block @*/
- { "id", CT_INT, 0, COL_NNUL|COL_PKEY|COL_AUTOINC },
- { "budget_guid", CT_BUDGETREF, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_budget, (QofSetterFunc)set_budget },
- { "account_guid", CT_ACCOUNTREF, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_account, (QofSetterFunc)set_account },
- { "period_num", CT_INT, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_period_num, (QofSetterFunc)set_period_num },
- { "amount", CT_NUMERIC, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_amount, (QofSetterFunc)set_amount },
+ /*@ -full_init_block @*/
+ { "id", CT_INT, 0, COL_NNUL | COL_PKEY | COL_AUTOINC },
+ {
+ "budget_guid", CT_BUDGETREF, 0, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_budget, (QofSetterFunc)set_budget
+ },
+ {
+ "account_guid", CT_ACCOUNTREF, 0, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_account, (QofSetterFunc)set_account
+ },
+ {
+ "period_num", CT_INT, 0, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_period_num, (QofSetterFunc)set_period_num
+ },
+ {
+ "amount", CT_NUMERIC, 0, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_amount, (QofSetterFunc)set_amount
+ },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/* ================================================================= */
@@ -104,9 +113,9 @@
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_val_if_fail( pObj != NULL, NULL );
+ g_return_val_if_fail( pObj != NULL, NULL );
- return QOF_INSTANCE(info->budget);
+ return QOF_INSTANCE(info->budget);
}
static void
@@ -119,9 +128,9 @@
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_val_if_fail( pObj != NULL, NULL );
+ g_return_val_if_fail( pObj != NULL, NULL );
- return QOF_INSTANCE(info->account);
+ return QOF_INSTANCE(info->account);
}
static void
@@ -129,11 +138,11 @@
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_if_fail( pObj != NULL );
- g_return_if_fail( val != NULL );
- g_return_if_fail( GNC_IS_ACCOUNT(val) );
+ g_return_if_fail( pObj != NULL );
+ g_return_if_fail( val != NULL );
+ g_return_if_fail( GNC_IS_ACCOUNT(val) );
- info->account = GNC_ACCOUNT(val);
+ info->account = GNC_ACCOUNT(val);
}
static gint
@@ -141,9 +150,9 @@
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_val_if_fail( pObj != NULL, 0 );
+ g_return_val_if_fail( pObj != NULL, 0 );
- return info->period_num;
+ return info->period_num;
}
static void
@@ -151,9 +160,9 @@
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_if_fail( pObj != NULL );
+ g_return_if_fail( pObj != NULL );
- info->period_num = GPOINTER_TO_UINT(val);
+ info->period_num = GPOINTER_TO_UINT(val);
}
static gnc_numeric
@@ -161,9 +170,9 @@
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_val_if_fail( pObj != NULL, gnc_numeric_zero() );
+ g_return_val_if_fail( pObj != NULL, gnc_numeric_zero() );
- return gnc_budget_get_account_period_value( info->budget, info->account, info->period_num );
+ return gnc_budget_get_account_period_value( info->budget, info->account, info->period_num );
}
static void
@@ -171,9 +180,9 @@
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_if_fail( pObj != NULL );
+ g_return_if_fail( pObj != NULL );
- gnc_budget_set_account_period_value( info->budget, info->account, info->period_num, value );
+ gnc_budget_set_account_period_value( info->budget, info->account, info->period_num, value );
}
/*----------------------------------------------------------------*/
@@ -187,33 +196,36 @@
load_budget_amounts( GncSqlBackend* be, GncBudget* budget )
{
gchar guid_buf[GUID_ENCODING_LENGTH+1];
- gchar* sql;
+ gchar* sql;
GncSqlStatement* stmt;
GncSqlResult* result;
g_return_if_fail( be != NULL );
- g_return_if_fail( budget != NULL );
+ g_return_if_fail( budget != NULL );
- (void)guid_to_string_buff( qof_instance_get_guid( QOF_INSTANCE(budget) ), guid_buf );
- sql = g_strdup_printf( "SELECT * FROM %s WHERE budget_guid='%s'", AMOUNTS_TABLE, guid_buf );
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- g_free( sql );
- if( stmt != NULL ) {
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
- budget_amount_info_t info;
+ (void)guid_to_string_buff( qof_instance_get_guid( QOF_INSTANCE(budget) ), guid_buf );
+ sql = g_strdup_printf( "SELECT * FROM %s WHERE budget_guid='%s'", AMOUNTS_TABLE, guid_buf );
+ stmt = gnc_sql_create_statement_from_sql( be, sql );
+ g_free( sql );
+ if ( stmt != NULL )
+ {
+ result = gnc_sql_execute_select_statement( be, stmt );
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
+ GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ budget_amount_info_t info;
- info.budget = budget;
+ info.budget = budget;
- while( row != NULL ) {
- gnc_sql_load_object( be, row, NULL, &info, budget_amounts_col_table );
- row = gnc_sql_result_get_next_row( result );
- }
- gnc_sql_result_dispose( result );
- }
- }
+ while ( row != NULL )
+ {
+ gnc_sql_load_object( be, row, NULL, &info, budget_amounts_col_table );
+ row = gnc_sql_result_get_next_row( result );
+ }
+ gnc_sql_result_dispose( result );
+ }
+ }
}
/**
@@ -226,17 +238,17 @@
delete_budget_amounts( GncSqlBackend* be, GncBudget* budget )
{
gchar guid_buf[GUID_ENCODING_LENGTH+1];
- gchar* sql;
+ gchar* sql;
g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( budget != NULL, FALSE );
+ g_return_val_if_fail( budget != NULL, FALSE );
- (void)guid_to_string_buff( qof_instance_get_guid( QOF_INSTANCE(budget) ), guid_buf );
- sql = g_strdup_printf( "DELETE FROM %s WHERE budget_guid='%s'", AMOUNTS_TABLE, guid_buf );
- (void)gnc_sql_execute_nonselect_sql( be, sql );
- g_free( sql );
+ (void)guid_to_string_buff( qof_instance_get_guid( QOF_INSTANCE(budget) ), guid_buf );
+ sql = g_strdup_printf( "DELETE FROM %s WHERE budget_guid='%s'", AMOUNTS_TABLE, guid_buf );
+ (void)gnc_sql_execute_nonselect_sql( be, sql );
+ g_free( sql );
- return TRUE;
+ return TRUE;
}
/**
@@ -249,66 +261,73 @@
save_budget_amounts( GncSqlBackend* be, GncBudget* budget )
{
GList* descendants;
- /*@ dependent @*/ GList* node;
- budget_amount_info_t info;
- guint num_periods;
- gboolean is_ok = TRUE;;
+ /*@ dependent @*/
+ GList* node;
+ budget_amount_info_t info;
+ guint num_periods;
+ gboolean is_ok = TRUE;;
g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( budget != NULL, FALSE );
+ g_return_val_if_fail( budget != NULL, FALSE );
- // Delete the amounts, then save
- delete_budget_amounts( be, budget );
+ // Delete the amounts, then save
+ delete_budget_amounts( be, budget );
- info.budget = budget;
- num_periods = gnc_budget_get_num_periods( budget );
+ info.budget = budget;
+ num_periods = gnc_budget_get_num_periods( budget );
descendants = gnc_account_get_descendants( gnc_book_get_root_account( be->primary_book ) );
- for( node = descendants; node != NULL && is_ok; node = g_list_next(node) ) {
- guint i;
+ for ( node = descendants; node != NULL && is_ok; node = g_list_next(node) )
+ {
+ guint i;
- info.account = GNC_ACCOUNT(node->data);
- for( i = 0; i < num_periods && is_ok; i++ ) {
- if( gnc_budget_is_account_period_value_set( budget, info.account, i ) ) {
- info.period_num = i;
- is_ok = gnc_sql_do_db_operation( be, OP_DB_INSERT, AMOUNTS_TABLE, "", &info,
- budget_amounts_col_table );
- }
- }
+ info.account = GNC_ACCOUNT(node->data);
+ for ( i = 0; i < num_periods && is_ok; i++ )
+ {
+ if ( gnc_budget_is_account_period_value_set( budget, info.account, i ) )
+ {
+ info.period_num = i;
+ is_ok = gnc_sql_do_db_operation( be, OP_DB_INSERT, AMOUNTS_TABLE, "", &info,
+ budget_amounts_col_table );
+ }
+ }
}
g_list_free( descendants );
- return is_ok;
+ return is_ok;
}
/*----------------------------------------------------------------*/
static /*@ dependent @*//*@ null @*/ GncBudget*
load_single_budget( GncSqlBackend* be, GncSqlRow* row )
{
const GncGUID* guid;
- GncBudget* pBudget = NULL;
- Recurrence* r;
+ GncBudget* pBudget = NULL;
+ Recurrence* r;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( row != NULL, NULL );
guid = gnc_sql_load_guid( be, row );
- if( guid != NULL ) {
- pBudget = gnc_budget_lookup( guid, be->primary_book );
- }
- if( pBudget == NULL ) {
+ if ( guid != NULL )
+ {
+ pBudget = gnc_budget_lookup( guid, be->primary_book );
+ }
+ if ( pBudget == NULL )
+ {
pBudget = gnc_budget_new( be->primary_book );
}
- gnc_budget_begin_edit( pBudget );
+ gnc_budget_begin_edit( pBudget );
gnc_sql_load_object( be, row, GNC_ID_BUDGET, pBudget, col_table );
- load_budget_amounts( be, pBudget );
- r = gnc_sql_recurrence_load( be, gnc_budget_get_guid( pBudget ) );
- if( r != NULL ) {
- gnc_budget_set_recurrence( pBudget, r );
- g_free( r );
- }
- gnc_budget_commit_edit( pBudget );
+ load_budget_amounts( be, pBudget );
+ r = gnc_sql_recurrence_load( be, gnc_budget_get_guid( pBudget ) );
+ if ( r != NULL )
+ {
+ gnc_budget_set_recurrence( pBudget, r );
+ g_free( r );
+ }
+ gnc_budget_commit_edit( pBudget );
- return pBudget;
+ return pBudget;
}
static void
@@ -316,32 +335,37 @@
{
GncSqlStatement* stmt;
GncSqlResult* result;
- GList* list = NULL;
+ GList* list = NULL;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
stmt = gnc_sql_create_select_statement( be, BUDGET_TABLE );
- if( stmt != NULL ) {
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
- GncBudget* b;
+ if ( stmt != NULL )
+ {
+ result = gnc_sql_execute_select_statement( be, stmt );
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
+ GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncBudget* b;
- while( row != NULL ) {
- b = load_single_budget( be, row );
- if( b != NULL ) {
- list = g_list_prepend( list, b );
- }
- row = gnc_sql_result_get_next_row( result );
- }
- gnc_sql_result_dispose( result );
+ while ( row != NULL )
+ {
+ b = load_single_budget( be, row );
+ if ( b != NULL )
+ {
+ list = g_list_prepend( list, b );
+ }
+ row = gnc_sql_result_get_next_row( result );
+ }
+ gnc_sql_result_dispose( result );
- if( list != NULL ) {
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
- }
- }
+ if ( list != NULL )
+ {
+ gnc_sql_slots_load_for_list( be, list );
+ g_list_free( list );
+ }
+ }
}
}
@@ -349,17 +373,19 @@
static void
create_budget_tables( GncSqlBackend* be )
{
- gint version;
+ gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- version = gnc_sql_get_table_version( be, BUDGET_TABLE );
- if( version == 0 ) {
+ version = gnc_sql_get_table_version( be, BUDGET_TABLE );
+ if ( version == 0 )
+ {
(void)gnc_sql_create_table( be, BUDGET_TABLE, TABLE_VERSION, col_table );
}
- version = gnc_sql_get_table_version( be, AMOUNTS_TABLE );
- if( version == 0 ) {
+ version = gnc_sql_get_table_version( be, AMOUNTS_TABLE );
+ if ( version == 0 )
+ {
(void)gnc_sql_create_table( be, AMOUNTS_TABLE, AMOUNTS_TABLE_VERSION, budget_amounts_col_table );
}
}
@@ -370,111 +396,133 @@
{
GncBudget* pBudget = GNC_BUDGET(inst);
const GncGUID* guid;
- gint op;
- gboolean is_infant;
- gboolean is_ok;
+ gint op;
+ gboolean is_infant;
+ gboolean is_ok;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_BUDGET(inst), FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( inst != NULL, FALSE );
+ g_return_val_if_fail( GNC_IS_BUDGET(inst), FALSE );
- is_infant = qof_instance_get_infant( inst );
- if( qof_instance_get_destroying( inst ) ) {
- op = OP_DB_DELETE;
- } else if( be->is_pristine_db || is_infant ) {
- op = OP_DB_INSERT;
- } else {
- op = OP_DB_UPDATE;
- }
+ is_infant = qof_instance_get_infant( inst );
+ if ( qof_instance_get_destroying( inst ) )
+ {
+ op = OP_DB_DELETE;
+ }
+ else if ( be->is_pristine_db || is_infant )
+ {
+ op = OP_DB_INSERT;
+ }
+ else
+ {
+ op = OP_DB_UPDATE;
+ }
is_ok = gnc_sql_do_db_operation( be, op, BUDGET_TABLE, GNC_ID_BUDGET, pBudget, col_table );
// Now, commit any slots and recurrence
- if( is_ok ) {
- guid = qof_instance_get_guid( inst );
- if( !qof_instance_get_destroying(inst) ) {
- is_ok = save_budget_amounts( be, pBudget );
- if( is_ok ) {
- is_ok = gnc_sql_recurrence_save( be, guid, gnc_budget_get_recurrence( pBudget ) );
- }
- if( is_ok ) {
- is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
- }
- } else {
- is_ok = delete_budget_amounts( be, pBudget );
- if( is_ok ) {
- is_ok = gnc_sql_recurrence_delete( be, guid );
- }
- if( is_ok ) {
- (void)gnc_sql_slots_delete( be, guid );
- }
- }
- }
+ if ( is_ok )
+ {
+ guid = qof_instance_get_guid( inst );
+ if ( !qof_instance_get_destroying(inst) )
+ {
+ is_ok = save_budget_amounts( be, pBudget );
+ if ( is_ok )
+ {
+ is_ok = gnc_sql_recurrence_save( be, guid, gnc_budget_get_recurrence( pBudget ) );
+ }
+ if ( is_ok )
+ {
+ is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
+ }
+ }
+ else
+ {
+ is_ok = delete_budget_amounts( be, pBudget );
+ if ( is_ok )
+ {
+ is_ok = gnc_sql_recurrence_delete( be, guid );
+ }
+ if ( is_ok )
+ {
+ (void)gnc_sql_slots_delete( be, guid );
+ }
+ }
+ }
- return is_ok;
+ return is_ok;
}
static void
do_save_budget( QofInstance* inst, gpointer data )
{
- write_objects_t* s = (write_objects_t*)data;
+ write_objects_t* s = (write_objects_t*)data;
- if( s->is_ok ) {
- s->is_ok = save_budget( s->be, inst );
- }
+ if ( s->is_ok )
+ {
+ s->is_ok = save_budget( s->be, inst );
+ }
}
static gboolean
write_budgets( GncSqlBackend* be )
{
- write_objects_t data;
+ write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
- data.be = be;
- data.is_ok = TRUE;
+ data.be = be;
+ data.is_ok = TRUE;
qof_collection_foreach( qof_book_get_collection( be->primary_book, GNC_ID_BUDGET ),
(QofInstanceForeachCB)do_save_budget, &data );
- return data.is_ok;
+ return data.is_ok;
}
/* ================================================================= */
static void
load_budget_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GncGUID guid;
- GncBudget* budget = NULL;
+ GncBudget* budget = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) {
+ if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ {
(void)string_to_guid( g_value_get_string( val ), &guid );
- budget = gnc_budget_lookup( &guid, be->primary_book );
- if( budget != NULL ) {
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, budget, NULL );
- } else {
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)budget );
- }
- } else {
- PWARN( "Budget ref '%s' not found", g_value_get_string( val ) );
- }
- }
+ budget = gnc_budget_lookup( &guid, be->primary_book );
+ if ( budget != NULL )
+ {
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, budget, NULL );
+ }
+ else
+ {
+ g_return_if_fail( setter != NULL );
+ (*setter)( pObject, (const gpointer)budget );
+ }
+ }
+ else
+ {
+ PWARN( "Budget ref '%s' not found", g_value_get_string( val ) );
+ }
+ }
}
static GncSqlColumnTypeHandler budget_guid_handler
- = { load_budget_guid,
- gnc_sql_add_objectref_guid_col_info_to_list,
- gnc_sql_add_colname_to_list,
- gnc_sql_add_gvalue_objectref_guid_to_slist };
+= { load_budget_guid,
+ gnc_sql_add_objectref_guid_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ gnc_sql_add_gvalue_objectref_guid_to_slist
+ };
/* ================================================================= */
void
gnc_sql_init_budget_handler( void )
@@ -486,14 +534,14 @@
save_budget, /* commit */
load_all_budgets, /* initial_load */
create_budget_tables, /* create_tables */
- NULL, /* compile_query */
- NULL, /* run_query */
- NULL, /* free_query */
- write_budgets /* write */
+ NULL, /* compile_query */
+ NULL, /* run_query */
+ NULL, /* free_query */
+ write_budgets /* write */
};
(void)qof_object_register_backend( GNC_ID_BUDGET, GNC_SQL_BACKEND, &be_data );
- gnc_sql_register_col_type_handler( CT_BUDGETREF, &budget_guid_handler );
+ gnc_sql_register_col_type_handler( CT_BUDGETREF, &budget_guid_handler );
}
/* ========================== END OF FILE ===================== */
Modified: gnucash/trunk/src/backend/sql/gnc-commodity-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-commodity-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/gnc-commodity-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
/** @file gnc-commodity-sql.c
- * @brief load and save data to SQL
+ * @brief load and save data to SQL
* @author Copyright (c) 2006-2008 Phil Longstaff <plongstaff at rogers.com>
*
* This file implements the top-level QofBackend API for saving/
@@ -57,22 +57,27 @@
#define COMMODITY_MAX_QUOTESOURCE_LEN 2048
#define COMMODITY_MAX_QUOTE_TZ_LEN 2048
-static const GncSqlColumnTableEntry col_table[] = {
- /*@ -full_init_block @*/
- { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
- { "namespace", CT_STRING, COMMODITY_MAX_NAMESPACE_LEN, COL_NNUL, NULL, NULL,
- (QofAccessFunc)gnc_commodity_get_namespace,
- (QofSetterFunc)gnc_commodity_set_namespace },
+static const GncSqlColumnTableEntry col_table[] =
+{
+ /*@ -full_init_block @*/
+ { "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
+ {
+ "namespace", CT_STRING, COMMODITY_MAX_NAMESPACE_LEN, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)gnc_commodity_get_namespace,
+ (QofSetterFunc)gnc_commodity_set_namespace
+ },
{ "mnemonic", CT_STRING, COMMODITY_MAX_MNEMONIC_LEN, COL_NNUL, "mnemonic" },
{ "fullname", CT_STRING, COMMODITY_MAX_FULLNAME_LEN, 0, "fullname" },
{ "cusip", CT_STRING, COMMODITY_MAX_CUSIP_LEN, 0, "cusip" },
{ "fraction", CT_INT, 0, COL_NNUL, "fraction" },
{ "quote_flag", CT_BOOLEAN, 0, COL_NNUL, "quote_flag" },
- { "quote_source", CT_STRING, COMMODITY_MAX_QUOTESOURCE_LEN, 0, NULL, NULL,
- (QofAccessFunc)get_quote_source_name, set_quote_source_name },
+ {
+ "quote_source", CT_STRING, COMMODITY_MAX_QUOTESOURCE_LEN, 0, NULL, NULL,
+ (QofAccessFunc)get_quote_source_name, set_quote_source_name
+ },
{ "quote_tz", CT_STRING, COMMODITY_MAX_QUOTE_TZ_LEN, 0, "quote-tz" },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/* ================================================================= */
@@ -82,25 +87,25 @@
{
const gnc_commodity* pCommodity;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_COMMODITY(pObject), NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( GNC_IS_COMMODITY(pObject), NULL );
pCommodity = GNC_COMMODITY(pObject);
return (gpointer)gnc_quote_source_get_internal_name(
- gnc_commodity_get_quote_source(pCommodity));
+ gnc_commodity_get_quote_source(pCommodity));
}
-static void
+static void
set_quote_source_name( gpointer pObject, gpointer pValue )
{
gnc_commodity* pCommodity;
const gchar* quote_source_name = (const gchar*)pValue;
gnc_quote_source* quote_source;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( GNC_IS_COMMODITY(pObject) );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( GNC_IS_COMMODITY(pObject) );
- if( pValue == NULL ) return;
+ if ( pValue == NULL ) return;
pCommodity = GNC_COMMODITY(pObject);
quote_source = gnc_quote_source_lookup_by_internal( quote_source_name );
@@ -114,9 +119,9 @@
gnc_commodity* pCommodity;
pCommodity = gnc_commodity_new( pBook, NULL, NULL, NULL, NULL, 100 );
- gnc_commodity_begin_edit( pCommodity );
+ gnc_commodity_begin_edit( pCommodity );
gnc_sql_load_object( be, row, GNC_ID_COMMODITY, pCommodity, col_table );
- gnc_commodity_commit_edit( pCommodity );
+ gnc_commodity_commit_edit( pCommodity );
return pCommodity;
}
@@ -130,44 +135,48 @@
pTable = gnc_commodity_table_get_table( be->primary_book );
stmt = gnc_sql_create_select_statement( be, COMMODITIES_TABLE );
- if( stmt == NULL ) return;
+ if ( stmt == NULL ) return;
result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
gnc_commodity* pCommodity;
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
- gchar* sql;
+ GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ gchar* sql;
- while( row != NULL ) {
+ while ( row != NULL )
+ {
pCommodity = load_single_commodity( be, row );
- if( pCommodity != NULL ) {
+ if ( pCommodity != NULL )
+ {
GncGUID guid;
guid = *qof_instance_get_guid( QOF_INSTANCE(pCommodity) );
pCommodity = gnc_commodity_table_insert( pTable, pCommodity );
qof_instance_set_guid( QOF_INSTANCE(pCommodity), &guid );
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row( result );
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose( result );
- sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", COMMODITIES_TABLE );
- gnc_sql_slots_load_for_sql_subquery( be, sql,
- (BookLookupFn)gnc_commodity_find_commodity_by_guid );
- g_free( sql );
+ sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", COMMODITIES_TABLE );
+ gnc_sql_slots_load_for_sql_subquery( be, sql,
+ (BookLookupFn)gnc_commodity_find_commodity_by_guid );
+ g_free( sql );
}
}
/* ================================================================= */
static void
create_commodities_tables( GncSqlBackend* be )
{
- gint version;
+ gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- version = gnc_sql_get_table_version( be, COMMODITIES_TABLE );
- if( version == 0 ) {
+ version = gnc_sql_get_table_version( be, COMMODITIES_TABLE );
+ if ( version == 0 )
+ {
(void)gnc_sql_create_table( be, COMMODITIES_TABLE, TABLE_VERSION, col_table );
}
}
@@ -176,40 +185,49 @@
static gboolean
do_commit_commodity( GncSqlBackend* be, QofInstance* inst, gboolean force_insert )
{
- const GncGUID* guid;
- gboolean is_infant;
- gint op;
- gboolean is_ok;
+ const GncGUID* guid;
+ gboolean is_infant;
+ gint op;
+ gboolean is_ok;
- is_infant = qof_instance_get_infant( inst );
- if( qof_instance_get_destroying( inst ) ) {
- op = OP_DB_DELETE;
- } else if( be->is_pristine_db || is_infant || force_insert ) {
- op = OP_DB_INSERT;
- } else {
- op = OP_DB_UPDATE;
- }
+ is_infant = qof_instance_get_infant( inst );
+ if ( qof_instance_get_destroying( inst ) )
+ {
+ op = OP_DB_DELETE;
+ }
+ else if ( be->is_pristine_db || is_infant || force_insert )
+ {
+ op = OP_DB_INSERT;
+ }
+ else
+ {
+ op = OP_DB_UPDATE;
+ }
is_ok = gnc_sql_do_db_operation( be, op, COMMODITIES_TABLE, GNC_ID_COMMODITY, inst, col_table );
- if( is_ok ) {
- // Now, commit any slots
- guid = qof_instance_get_guid( inst );
- if( !qof_instance_get_destroying(inst) ) {
- is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
- } else {
- is_ok = gnc_sql_slots_delete( be, guid );
- }
- }
+ if ( is_ok )
+ {
+ // Now, commit any slots
+ guid = qof_instance_get_guid( inst );
+ if ( !qof_instance_get_destroying(inst) )
+ {
+ is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
+ }
+ else
+ {
+ is_ok = gnc_sql_slots_delete( be, guid );
+ }
+ }
- return is_ok;
+ return is_ok;
}
static gboolean
commit_commodity( GncSqlBackend* be, QofInstance* inst )
{
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_COMMODITY(inst), FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( inst != NULL, FALSE );
+ g_return_val_if_fail( GNC_IS_COMMODITY(inst), FALSE );
return do_commit_commodity( be, inst, FALSE );
}
@@ -217,65 +235,74 @@
static gboolean
is_commodity_in_db( GncSqlBackend* be, gnc_commodity* pCommodity )
{
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( pCommodity != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( pCommodity != NULL, FALSE );
return gnc_sql_object_is_it_in_db( be, COMMODITIES_TABLE, GNC_ID_COMMODITY,
- pCommodity, col_table );
+ pCommodity, col_table );
}
gboolean
gnc_sql_save_commodity( GncSqlBackend* be, gnc_commodity* pCommodity )
{
- gboolean is_ok = TRUE;
+ gboolean is_ok = TRUE;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( pCommodity != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( pCommodity != NULL, FALSE );
- if( !is_commodity_in_db( be, pCommodity ) ) {
+ if ( !is_commodity_in_db( be, pCommodity ) )
+ {
is_ok = do_commit_commodity( be, QOF_INSTANCE(pCommodity), TRUE );
}
- return is_ok;
+ return is_ok;
}
/* ----------------------------------------------------------------- */
static void
load_commodity_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GncGUID guid;
- gnc_commodity* commodity = NULL;
+ gnc_commodity* commodity = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) {
- (void)string_to_guid( g_value_get_string( val ), &guid );
- commodity = gnc_commodity_find_commodity_by_guid( &guid, be->primary_book );
- if( commodity != NULL ) {
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, commodity, NULL );
- } else if( setter != NULL ) {
- (*setter)( pObject, (const gpointer)commodity );
- }
- } else {
- PWARN( "Commodity ref '%s' not found", g_value_get_string( val ) );
- }
- }
+ val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
+ if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ {
+ (void)string_to_guid( g_value_get_string( val ), &guid );
+ commodity = gnc_commodity_find_commodity_by_guid( &guid, be->primary_book );
+ if ( commodity != NULL )
+ {
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, commodity, NULL );
+ }
+ else if ( setter != NULL )
+ {
+ (*setter)( pObject, (const gpointer)commodity );
+ }
+ }
+ else
+ {
+ PWARN( "Commodity ref '%s' not found", g_value_get_string( val ) );
+ }
+ }
}
static GncSqlColumnTypeHandler commodity_guid_handler
- = { load_commodity_guid,
- gnc_sql_add_objectref_guid_col_info_to_list,
- gnc_sql_add_colname_to_list,
- gnc_sql_add_gvalue_objectref_guid_to_slist };
+= { load_commodity_guid,
+ gnc_sql_add_objectref_guid_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ gnc_sql_add_gvalue_objectref_guid_to_slist
+ };
/* ================================================================= */
void
gnc_sql_init_commodity_handler( void )
@@ -287,14 +314,14 @@
commit_commodity, /* commit */
load_all_commodities, /* initial_load */
create_commodities_tables, /* create_tables */
- NULL, /* compile_query */
- NULL, /* run_query */
- NULL, /* free_query */
- NULL /* write */
+ NULL, /* compile_query */
+ NULL, /* run_query */
+ NULL, /* free_query */
+ NULL /* write */
};
(void)qof_object_register_backend( GNC_ID_COMMODITY, GNC_SQL_BACKEND, &be_data );
- gnc_sql_register_col_type_handler( CT_COMMODITYREF, &commodity_guid_handler );
+ gnc_sql_register_col_type_handler( CT_COMMODITYREF, &commodity_guid_handler );
}
/* ========================== END OF FILE ===================== */
Modified: gnucash/trunk/src/backend/sql/gnc-lots-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-lots-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/gnc-lots-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
/** @file gnc-lots-sql.c
- * @brief load and save data to SQL
+ * @brief load and save data to SQL
* @author Copyright (c) 2006-2008 Phil Longstaff <plongstaff at rogers.com>
*
* This file implements the top-level QofBackend API for saving/
@@ -53,13 +53,15 @@
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
- { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
- { "account_guid", CT_ACCOUNTREF, 0, 0, NULL, NULL,
- (QofAccessFunc)get_lot_account, set_lot_account },
+ /*@ -full_init_block @*/
+ { "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
+ {
+ "account_guid", CT_ACCOUNTREF, 0, 0, NULL, NULL,
+ (QofAccessFunc)get_lot_account, set_lot_account
+ },
{ "is_closed", CT_BOOLEAN, 0, COL_NNUL, "is-closed" },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/* ================================================================= */
@@ -69,45 +71,46 @@
const GNCLot* lot;
Account* pAccount;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_LOT(pObject), NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( GNC_IS_LOT(pObject), NULL );
lot = GNC_LOT(pObject);
pAccount = gnc_lot_get_account( lot );
return pAccount;
}
-static void
+static void
set_lot_account( gpointer pObject, /*@ null @*/ gpointer pValue )
{
GNCLot* lot;
Account* pAccount;
- g_return_if_fail( pObject != NULL && GNC_IS_LOT(pObject) );
- g_return_if_fail( pValue == NULL || GNC_IS_ACCOUNT(pValue) );
+ g_return_if_fail( pObject != NULL && GNC_IS_LOT(pObject) );
+ g_return_if_fail( pValue == NULL || GNC_IS_ACCOUNT(pValue) );
lot = GNC_LOT(pObject);
pAccount = GNC_ACCOUNT(pValue);
- if( pAccount != NULL ) {
- xaccAccountInsertLot( pAccount, lot );
- }
+ if ( pAccount != NULL )
+ {
+ xaccAccountInsertLot( pAccount, lot );
+ }
}
static /*@ dependent @*//*@ null @*/ GNCLot*
load_single_lot( GncSqlBackend* be, GncSqlRow* row )
{
- GNCLot* lot;
+ GNCLot* lot;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( row != NULL, NULL );
lot = gnc_lot_new( be->primary_book );
- gnc_lot_begin_edit( lot );
+ gnc_lot_begin_edit( lot );
gnc_sql_load_object( be, row, GNC_ID_LOT, lot, col_table );
- gnc_lot_commit_edit( lot );
+ gnc_lot_commit_edit( lot );
- return lot;
+ return lot;
}
static void
@@ -116,51 +119,57 @@
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- if( stmt != NULL ) {
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
- GNCLot* lot;
- gchar* sql;
+ if ( stmt != NULL )
+ {
+ result = gnc_sql_execute_select_statement( be, stmt );
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
+ GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GNCLot* lot;
+ gchar* sql;
- while( row != NULL ) {
- lot = load_single_lot( be, row );
- row = gnc_sql_result_get_next_row( result );
- }
- gnc_sql_result_dispose( result );
+ while ( row != NULL )
+ {
+ lot = load_single_lot( be, row );
+ row = gnc_sql_result_get_next_row( result );
+ }
+ gnc_sql_result_dispose( result );
- sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", TABLE_NAME );
- gnc_sql_slots_load_for_sql_subquery( be, sql, (BookLookupFn)gnc_lot_lookup );
- g_free( sql );
- }
- }
+ sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", TABLE_NAME );
+ gnc_sql_slots_load_for_sql_subquery( be, sql, (BookLookupFn)gnc_lot_lookup );
+ g_free( sql );
+ }
+ }
}
/* ================================================================= */
static void
create_lots_tables( GncSqlBackend* be )
{
- gint version;
+ gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if( version == 0 ) {
- /* The table doesn't exist, so create it */
+ version = gnc_sql_get_table_version( be, TABLE_NAME );
+ if ( version == 0 )
+ {
+ /* The table doesn't exist, so create it */
(void)gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
- } else if( version == 1 ) {
- /* Version 1 -> 2 removes the 'NOT NULL' constraint on the account_guid
- field.
+ }
+ else if ( version == 1 )
+ {
+ /* Version 1 -> 2 removes the 'NOT NULL' constraint on the account_guid
+ field.
- Create a temporary table, copy the data from the old table, delete the
- old table, then rename the new one. */
+ Create a temporary table, copy the data from the old table, delete the
+ old table, then rename the new one. */
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
- (void)gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
+ gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
+ (void)gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
}
}
@@ -169,9 +178,9 @@
static gboolean
commit_lot( GncSqlBackend* be, QofInstance* inst )
{
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_LOT(inst), FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( inst != NULL, FALSE );
+ g_return_val_if_fail( GNC_IS_LOT(inst), FALSE );
return gnc_sql_commit_standard_item( be, inst, TABLE_NAME, GNC_ID_LOT, col_table );
}
@@ -179,64 +188,73 @@
static void
do_save_lot( QofInstance* inst, gpointer data )
{
- write_objects_t* s = (write_objects_t*)data;
+ write_objects_t* s = (write_objects_t*)data;
- if( s->is_ok ) {
- s->is_ok = commit_lot( s->be, inst );
- }
+ if ( s->is_ok )
+ {
+ s->is_ok = commit_lot( s->be, inst );
+ }
}
static gboolean
write_lots( GncSqlBackend* be )
{
- write_objects_t data;
+ write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
- data.be = be;
- data.is_ok = TRUE;
+ data.be = be;
+ data.is_ok = TRUE;
qof_collection_foreach( qof_book_get_collection( be->primary_book, GNC_ID_LOT ),
(QofInstanceForeachCB)do_save_lot, &data );
- return data.is_ok;
+ return data.is_ok;
}
/* ================================================================= */
static void
load_lot_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GncGUID guid;
- GNCLot* lot;
+ GNCLot* lot;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) {
- (void)string_to_guid( g_value_get_string( val ), &guid );
- lot = gnc_lot_lookup( &guid, be->primary_book );
- if( lot != NULL ) {
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, lot, NULL );
- } else {
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)lot );
- }
- } else {
- PWARN( "Lot ref '%s' not found", g_value_get_string( val ) );
- }
- }
+ if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ {
+ (void)string_to_guid( g_value_get_string( val ), &guid );
+ lot = gnc_lot_lookup( &guid, be->primary_book );
+ if ( lot != NULL )
+ {
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, lot, NULL );
+ }
+ else
+ {
+ g_return_if_fail( setter != NULL );
+ (*setter)( pObject, (const gpointer)lot );
+ }
+ }
+ else
+ {
+ PWARN( "Lot ref '%s' not found", g_value_get_string( val ) );
+ }
+ }
}
static GncSqlColumnTypeHandler lot_guid_handler
- = { load_lot_guid,
- gnc_sql_add_objectref_guid_col_info_to_list,
- gnc_sql_add_colname_to_list,
- gnc_sql_add_gvalue_objectref_guid_to_slist };
+= { load_lot_guid,
+ gnc_sql_add_objectref_guid_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ gnc_sql_add_gvalue_objectref_guid_to_slist
+ };
/* ================================================================= */
void
gnc_sql_init_lot_handler( void )
@@ -248,13 +266,13 @@
commit_lot, /* commit */
load_all_lots, /* initial_load */
create_lots_tables, /* create tables */
- NULL, NULL, NULL,
- write_lots /* save all */
+ NULL, NULL, NULL,
+ write_lots /* save all */
};
(void)qof_object_register_backend( GNC_ID_LOT, GNC_SQL_BACKEND, &be_data );
- gnc_sql_register_col_type_handler( CT_LOTREF, &lot_guid_handler );
+ gnc_sql_register_col_type_handler( CT_LOTREF, &lot_guid_handler );
}
/* ========================== END OF FILE ===================== */
Modified: gnucash/trunk/src/backend/sql/gnc-price-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-price-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/gnc-price-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
/** @file gnc-price-sql.c
- * @brief load and save data to SQL
+ * @brief load and save data to SQL
* @author Copyright (c) 2006-2009 Phil Longstaff <plongstaff at rogers.com>
*
* This file implements the top-level QofBackend API for saving/
@@ -53,8 +53,8 @@
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
- { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ /*@ -full_init_block @*/
+ { "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "commodity_guid", CT_COMMODITYREF, 0, COL_NNUL, "commodity" },
{ "currency_guid", CT_COMMODITYREF, 0, COL_NNUL, "currency" },
{ "date", CT_TIMESPEC, 0, COL_NNUL, "date" },
@@ -62,7 +62,7 @@
{ "type", CT_STRING, PRICE_MAX_TYPE_LEN, 0, "type" },
{ "value", CT_NUMERIC, 0, COL_NNUL, "value" },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/* ================================================================= */
@@ -70,16 +70,16 @@
static /*@ null @*//*@ dependent @*/ GNCPrice*
load_single_price( GncSqlBackend* be, GncSqlRow* row )
{
- GNCPrice* pPrice;
+ GNCPrice* pPrice;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( row != NULL, NULL );
pPrice = gnc_price_create( be->primary_book );
- gnc_price_begin_edit( pPrice );
+ gnc_price_begin_edit( pPrice );
gnc_sql_load_object( be, row, GNC_ID_PRICE, pPrice, col_table );
- gnc_price_commit_edit( pPrice );
+ gnc_price_commit_edit( pPrice );
return pPrice;
}
@@ -92,36 +92,40 @@
QofBook* pBook;
GNCPriceDB* pPriceDB;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
pBook = be->primary_book;
pPriceDB = gnc_book_get_pricedb( pBook );
stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- if( stmt != NULL ) {
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
- GNCPrice* pPrice;
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
- gchar* sql;
+ if ( stmt != NULL )
+ {
+ result = gnc_sql_execute_select_statement( be, stmt );
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
+ GNCPrice* pPrice;
+ GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ gchar* sql;
- gnc_pricedb_set_bulk_update( pPriceDB, TRUE );
- while( row != NULL ) {
- pPrice = load_single_price( be, row );
+ gnc_pricedb_set_bulk_update( pPriceDB, TRUE );
+ while ( row != NULL )
+ {
+ pPrice = load_single_price( be, row );
- if( pPrice != NULL ) {
- (void)gnc_pricedb_add_price( pPriceDB, pPrice );
- gnc_price_unref( pPrice );
- }
- row = gnc_sql_result_get_next_row( result );
- }
- gnc_sql_result_dispose( result );
- gnc_pricedb_set_bulk_update( pPriceDB, FALSE );
+ if ( pPrice != NULL )
+ {
+ (void)gnc_pricedb_add_price( pPriceDB, pPrice );
+ gnc_price_unref( pPrice );
+ }
+ row = gnc_sql_result_get_next_row( result );
+ }
+ gnc_sql_result_dispose( result );
+ gnc_pricedb_set_bulk_update( pPriceDB, FALSE );
- sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", TABLE_NAME );
- gnc_sql_slots_load_for_sql_subquery( be, sql, (BookLookupFn)gnc_price_lookup );
- g_free( sql );
- }
+ sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", TABLE_NAME );
+ gnc_sql_slots_load_for_sql_subquery( be, sql, (BookLookupFn)gnc_price_lookup );
+ g_free( sql );
+ }
}
}
@@ -129,18 +133,21 @@
static void
create_prices_tables( GncSqlBackend* be )
{
- gint version;
+ gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if( version == 0 ) {
+ version = gnc_sql_get_table_version( be, TABLE_NAME );
+ if ( version == 0 )
+ {
(void)gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
- } else if( version == 1 ) {
- /* Upgrade 64 bit int handling */
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
- (void)gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
}
+ else if ( version == 1 )
+ {
+ /* Upgrade 64 bit int handling */
+ gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
+ (void)gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
+ }
}
/* ================================================================= */
@@ -149,34 +156,41 @@
save_price( GncSqlBackend* be, QofInstance* inst )
{
GNCPrice* pPrice = GNC_PRICE(inst);
- gint op;
- gboolean is_infant;
- gboolean is_ok = TRUE;
+ gint op;
+ gboolean is_infant;
+ gboolean is_ok = TRUE;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_PRICE(inst), FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( inst != NULL, FALSE );
+ g_return_val_if_fail( GNC_IS_PRICE(inst), FALSE );
- is_infant = qof_instance_get_infant( inst );
- if( qof_instance_get_destroying( inst ) ) {
- op = OP_DB_DELETE;
- } else if( be->is_pristine_db || is_infant ) {
- op = OP_DB_INSERT;
- } else {
- op = OP_DB_UPDATE;
- }
+ is_infant = qof_instance_get_infant( inst );
+ if ( qof_instance_get_destroying( inst ) )
+ {
+ op = OP_DB_DELETE;
+ }
+ else if ( be->is_pristine_db || is_infant )
+ {
+ op = OP_DB_INSERT;
+ }
+ else
+ {
+ op = OP_DB_UPDATE;
+ }
- if( op != OP_DB_DELETE ) {
- /* Ensure commodity and currency are in the db */
- (void)gnc_sql_save_commodity( be, gnc_price_get_commodity( pPrice ) );
- is_ok = gnc_sql_save_commodity( be, gnc_price_get_currency( pPrice ) );
- }
+ if ( op != OP_DB_DELETE )
+ {
+ /* Ensure commodity and currency are in the db */
+ (void)gnc_sql_save_commodity( be, gnc_price_get_commodity( pPrice ) );
+ is_ok = gnc_sql_save_commodity( be, gnc_price_get_currency( pPrice ) );
+ }
- if( is_ok ) {
- is_ok = gnc_sql_do_db_operation( be, op, TABLE_NAME, GNC_ID_PRICE, pPrice, col_table );
- }
+ if ( is_ok )
+ {
+ is_ok = gnc_sql_do_db_operation( be, op, TABLE_NAME, GNC_ID_PRICE, pPrice, col_table );
+ }
- return is_ok;
+ return is_ok;
}
static gboolean
@@ -184,12 +198,13 @@
{
write_objects_t* s = (write_objects_t*)data;
- g_return_val_if_fail( p != NULL, FALSE );
- g_return_val_if_fail( data != NULL, FALSE );
+ g_return_val_if_fail( p != NULL, FALSE );
+ g_return_val_if_fail( data != NULL, FALSE );
- if( s->is_ok ) {
- s->is_ok = save_price( s->be, QOF_INSTANCE(p) );
- }
+ if ( s->is_ok )
+ {
+ s->is_ok = save_price( s->be, QOF_INSTANCE(p) );
+ }
return s->is_ok;
}
@@ -198,14 +213,14 @@
write_prices( GncSqlBackend* be )
{
GNCPriceDB* priceDB;
- write_objects_t data;
+ write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
priceDB = gnc_book_get_pricedb( be->primary_book );
- data.be = be;
- data.is_ok = TRUE;
+ data.be = be;
+ data.is_ok = TRUE;
return gnc_pricedb_foreach_price( priceDB, write_price, &data, TRUE );
}
@@ -220,8 +235,8 @@
save_price, /* commit */
load_all_prices, /* initial_load */
create_prices_tables, /* create tables */
- NULL, NULL, NULL,
- write_prices /* write */
+ NULL, NULL, NULL,
+ write_prices /* write */
};
(void)qof_object_register_backend( GNC_ID_PRICE, GNC_SQL_BACKEND, &be_data );
Modified: gnucash/trunk/src/backend/sql/gnc-recurrence-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-recurrence-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/gnc-recurrence-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
/** @file gnc-recurrence-sql.c
- * @brief load and save data to SQL
+ * @brief load and save data to SQL
* @author Copyright (c) 2006-2008 Phil Longstaff <plongstaff at rogers.com>
*
* This file implements the top-level QofBackend API for saving/
@@ -49,10 +49,13 @@
#define BUDGET_MAX_RECURRENCE_PERIOD_TYPE_LEN 2048
-typedef struct {
+typedef struct
+{
/*@ dependent @*/ GncSqlBackend* be;
- /*@ dependent @*/ const GncGUID* guid;
- /*@ dependent @*/ Recurrence* pRecurrence;
+ /*@ dependent @*/
+ const GncGUID* guid;
+ /*@ dependent @*/
+ Recurrence* pRecurrence;
} recurrence_info_t;
static /*@ null @*/ gpointer get_obj_guid( gpointer pObject );
@@ -66,29 +69,39 @@
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
- { "id", CT_INT, 0, COL_PKEY|COL_NNUL|COL_AUTOINC },
- { "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid },
- { "recurrence_mult", CT_INT, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_recurrence_mult, (QofSetterFunc)set_recurrence_mult },
- { "recurrence_period_type", CT_STRING, BUDGET_MAX_RECURRENCE_PERIOD_TYPE_LEN, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_recurrence_period_type, set_recurrence_period_type },
- { "recurrence_period_start", CT_GDATE, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_recurrence_period_start, set_recurrence_period_start },
+ /*@ -full_init_block @*/
+ { "id", CT_INT, 0, COL_PKEY | COL_NNUL | COL_AUTOINC },
+ {
+ "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid
+ },
+ {
+ "recurrence_mult", CT_INT, 0, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_recurrence_mult, (QofSetterFunc)set_recurrence_mult
+ },
+ {
+ "recurrence_period_type", CT_STRING, BUDGET_MAX_RECURRENCE_PERIOD_TYPE_LEN, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_recurrence_period_type, set_recurrence_period_type
+ },
+ {
+ "recurrence_period_start", CT_GDATE, 0, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_recurrence_period_start, set_recurrence_period_start
+ },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/* Special column table because we need to be able to access the table by
a column other than the primary key */
static const GncSqlColumnTableEntry guid_col_table[] =
{
- /*@ -full_init_block @*/
- { "obj_guid", CT_GUID, 0, 0, NULL, NULL,
- (QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid },
+ /*@ -full_init_block @*/
+ {
+ "obj_guid", CT_GUID, 0, 0, NULL, NULL,
+ (QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid
+ },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/* ================================================================= */
@@ -98,7 +111,7 @@
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
return (gpointer)pInfo->guid;
}
@@ -113,11 +126,11 @@
get_recurrence_mult( gpointer pObject )
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
-
- g_return_val_if_fail( pObject != NULL, 0 );
- g_return_val_if_fail( pInfo->pRecurrence != NULL, 0 );
- return (gint)pInfo->pRecurrence->mult;
+ g_return_val_if_fail( pObject != NULL, 0 );
+ g_return_val_if_fail( pInfo->pRecurrence != NULL, 0 );
+
+ return (gint)pInfo->pRecurrence->mult;
}
static void
@@ -125,8 +138,8 @@
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pInfo->pRecurrence != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pInfo->pRecurrence != NULL );
pInfo->pRecurrence->mult = (guint16)value;
}
@@ -136,11 +149,11 @@
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( pInfo->pRecurrence != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( pInfo->pRecurrence != NULL, NULL );
return (gpointer)recurrencePeriodTypeToString(
- recurrenceGetPeriodType( pInfo->pRecurrence ) );
+ recurrenceGetPeriodType( pInfo->pRecurrence ) );
}
static void
@@ -148,9 +161,9 @@
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pInfo->pRecurrence != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pInfo->pRecurrence != NULL );
+ g_return_if_fail( pValue != NULL );
pInfo->pRecurrence->ptype = recurrencePeriodTypeFromString( (gchar*)pValue );
}
@@ -161,8 +174,8 @@
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
static GDate date;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( pInfo->pRecurrence != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( pInfo->pRecurrence != NULL, NULL );
date = recurrenceGetDate( pInfo->pRecurrence );
return (gpointer)&date;
@@ -174,9 +187,9 @@
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
GDate* date = (GDate*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pInfo->pRecurrence != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pInfo->pRecurrence != NULL );
+ g_return_if_fail( pValue != NULL );
pInfo->pRecurrence->start = *date;
}
@@ -188,37 +201,38 @@
{
recurrence_info_t recurrence_info;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( guid != NULL, FALSE );
- g_return_val_if_fail( r != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( guid != NULL, FALSE );
+ g_return_val_if_fail( r != NULL, FALSE );
- (void)gnc_sql_recurrence_delete( be, guid );
+ (void)gnc_sql_recurrence_delete( be, guid );
recurrence_info.be = be;
recurrence_info.guid = guid;
- recurrence_info.pRecurrence = (Recurrence*)r;
+ recurrence_info.pRecurrence = (Recurrence*)r;
return gnc_sql_do_db_operation( be, OP_DB_INSERT, TABLE_NAME,
- TABLE_NAME, &recurrence_info, col_table );
+ TABLE_NAME, &recurrence_info, col_table );
}
void
gnc_sql_recurrence_save_list( GncSqlBackend* be, const GncGUID* guid, GList* schedule )
{
recurrence_info_t recurrence_info;
- GList* l;
+ GList* l;
- g_return_if_fail( be != NULL );
- g_return_if_fail( guid != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( guid != NULL );
- (void)gnc_sql_recurrence_delete( be, guid );
+ (void)gnc_sql_recurrence_delete( be, guid );
recurrence_info.be = be;
recurrence_info.guid = guid;
- for( l = schedule; l != NULL; l = g_list_next( l ) ) {
- recurrence_info.pRecurrence = (Recurrence*)l->data;
- (void)gnc_sql_do_db_operation( be, OP_DB_INSERT, TABLE_NAME,
- TABLE_NAME, &recurrence_info, col_table );
- }
+ for ( l = schedule; l != NULL; l = g_list_next( l ) )
+ {
+ recurrence_info.pRecurrence = (Recurrence*)l->data;
+ (void)gnc_sql_do_db_operation( be, OP_DB_INSERT, TABLE_NAME,
+ TABLE_NAME, &recurrence_info, col_table );
+ }
}
gboolean
@@ -226,13 +240,13 @@
{
recurrence_info_t recurrence_info;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( guid != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( guid != NULL, FALSE );
recurrence_info.be = be;
recurrence_info.guid = guid;
return gnc_sql_do_db_operation( be, OP_DB_DELETE, TABLE_NAME,
- TABLE_NAME, &recurrence_info, guid_col_table );
+ TABLE_NAME, &recurrence_info, guid_col_table );
}
static void
@@ -240,12 +254,12 @@
{
recurrence_info_t recurrence_info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( r != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( r != NULL );
recurrence_info.be = be;
- recurrence_info.pRecurrence = r;
+ recurrence_info.pRecurrence = r;
gnc_sql_load_object( be, row, TABLE_NAME, &recurrence_info, col_table );
}
@@ -256,85 +270,93 @@
gchar* buf;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
GncSqlStatement* stmt;
- GncSqlResult* result;
+ GncSqlResult* result;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( guid != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( guid != NULL, NULL );
(void)guid_to_string_buff( guid, guid_buf );
- buf = g_strdup_printf( "SELECT * FROM %s WHERE obj_guid='%s'", TABLE_NAME, guid_buf );
- stmt = gnc_sql_connection_create_statement_from_sql( be->conn, buf );
- g_free( buf );
+ buf = g_strdup_printf( "SELECT * FROM %s WHERE obj_guid='%s'", TABLE_NAME, guid_buf );
+ stmt = gnc_sql_connection_create_statement_from_sql( be->conn, buf );
+ g_free( buf );
result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- return result;
+ gnc_sql_statement_dispose( stmt );
+ return result;
}
/*@ null @*/ Recurrence*
gnc_sql_recurrence_load( GncSqlBackend* be, const GncGUID* guid )
{
- GncSqlResult* result;
- Recurrence* r = NULL;
+ GncSqlResult* result;
+ Recurrence* r = NULL;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( guid != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( guid != NULL, NULL );
- result = gnc_sql_set_recurrences_from_db( be, guid );
- if( result != NULL ) {
+ result = gnc_sql_set_recurrences_from_db( be, guid );
+ if ( result != NULL )
+ {
guint numRows = gnc_sql_result_get_num_rows( result );
- if( numRows > 0 ) {
- if( numRows > 1 ) {
- g_warning( "More than 1 recurrence found: first one used" );
- }
- r = g_new0( Recurrence, 1 );
- g_assert( r != NULL );
- load_recurrence( be, gnc_sql_result_get_first_row( result ), r );
- } else {
- g_warning( "No recurrences found" );
- }
- gnc_sql_result_dispose( result );
+ if ( numRows > 0 )
+ {
+ if ( numRows > 1 )
+ {
+ g_warning( "More than 1 recurrence found: first one used" );
+ }
+ r = g_new0( Recurrence, 1 );
+ g_assert( r != NULL );
+ load_recurrence( be, gnc_sql_result_get_first_row( result ), r );
+ }
+ else
+ {
+ g_warning( "No recurrences found" );
+ }
+ gnc_sql_result_dispose( result );
}
- return r;
+ return r;
}
/*@ null @*/ GList*
gnc_sql_recurrence_load_list( GncSqlBackend* be, const GncGUID* guid )
{
- GncSqlResult* result;
- GList* list = NULL;
+ GncSqlResult* result;
+ GList* list = NULL;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( guid != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( guid != NULL, NULL );
- result = gnc_sql_set_recurrences_from_db( be, guid );
- if( result != NULL ) {
+ result = gnc_sql_set_recurrences_from_db( be, guid );
+ if ( result != NULL )
+ {
GncSqlRow* row = gnc_sql_result_get_first_row( result );
- while( row != NULL ) {
- Recurrence* pRecurrence = g_new0( Recurrence, 1 );
- g_assert( pRecurrence != NULL );
- load_recurrence( be, row, pRecurrence );
- list = g_list_append( list, pRecurrence );
- row = gnc_sql_result_get_next_row( result );
- }
- gnc_sql_result_dispose( result );
+ while ( row != NULL )
+ {
+ Recurrence* pRecurrence = g_new0( Recurrence, 1 );
+ g_assert( pRecurrence != NULL );
+ load_recurrence( be, row, pRecurrence );
+ list = g_list_append( list, pRecurrence );
+ row = gnc_sql_result_get_next_row( result );
+ }
+ gnc_sql_result_dispose( result );
}
- return list;
+ return list;
}
/* ================================================================= */
static void
create_recurrence_tables( GncSqlBackend* be )
{
- gint version;
+ gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if( version == 0 ) {
+ version = gnc_sql_get_table_version( be, TABLE_NAME );
+ if ( version == 0 )
+ {
(void)gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
}
}
@@ -350,10 +372,10 @@
NULL, /* commit - cannot occur */
NULL, /* initial_load - cannot occur */
create_recurrence_tables, /* create_tables */
- NULL, /* compile_query */
- NULL, /* run_query */
- NULL, /* free_query */
- NULL /* write */
+ NULL, /* compile_query */
+ NULL, /* run_query */
+ NULL, /* free_query */
+ NULL /* write */
};
(void)qof_object_register_backend( TABLE_NAME, GNC_SQL_BACKEND, &be_data );
Modified: gnucash/trunk/src/backend/sql/gnc-schedxaction-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-schedxaction-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/gnc-schedxaction-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
/** @file gnc-schedxaction-sql.c
- * @brief load and save data to SQL
+ * @brief load and save data to SQL
* @author Copyright (c) 2006-2008 Phil Longstaff <plongstaff at rogers.com>
*
* This file implements the top-level QofBackend API for saving/
@@ -57,10 +57,10 @@
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
- { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ /*@ -full_init_block @*/
+ { "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "name", CT_STRING, SX_MAX_NAME_LEN, 0, "name" },
- { "enabled", CT_BOOLEAN, 0, COL_NNUL, "enabled" },
+ { "enabled", CT_BOOLEAN, 0, COL_NNUL, "enabled" },
{ "start_date", CT_GDATE, 0, 0, "start-date" },
{ "end_date", CT_GDATE, 0, 0, "end-date" },
{ "last_occur", CT_GDATE, 0, 0, "last-occurance-date" },
@@ -70,10 +70,10 @@
{ "auto_notify", CT_BOOLEAN, 0, COL_NNUL, "auto-create-notify" },
{ "adv_creation", CT_INT, 0, COL_NNUL, "advance-creation-days" },
{ "adv_notify", CT_INT, 0, COL_NNUL, "advance-reminder-days" },
- { "instance_count", CT_INT, 0, COL_NNUL, "instance-count" },
+ { "instance_count", CT_INT, 0, COL_NNUL, "instance-count" },
{ "template_act_guid", CT_ACCOUNTREF, 0, COL_NNUL, "template-account" },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/* ================================================================= */
@@ -81,23 +81,23 @@
load_single_sx( GncSqlBackend* be, GncSqlRow* row )
{
const GncGUID* guid;
- SchedXaction* pSx;
- GList* schedule;
- GDate start_date;
+ SchedXaction* pSx;
+ GList* schedule;
+ GDate start_date;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( row != NULL, NULL );
guid = gnc_sql_load_guid( be, row );
- g_assert( guid != NULL );
+ g_assert( guid != NULL );
pSx = xaccSchedXactionMalloc( be->primary_book );
- gnc_sx_begin_edit( pSx );
+ gnc_sx_begin_edit( pSx );
gnc_sql_load_object( be, row, GNC_SX_ID, pSx, col_table );
- schedule = gnc_sql_recurrence_load_list( be, guid );
- gnc_sx_set_schedule( pSx, schedule );
- gnc_sx_commit_edit( pSx );
- gnc_sql_transaction_load_tx_for_account( be, pSx->template_acct );
+ schedule = gnc_sql_recurrence_load_list( be, guid );
+ gnc_sx_set_schedule( pSx, schedule );
+ gnc_sx_commit_edit( pSx );
+ gnc_sql_transaction_load_tx_for_account( be, pSx->template_acct );
g_object_get(pSx, "start-date", &start_date, NULL);
@@ -110,35 +110,39 @@
GncSqlStatement* stmt = NULL;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
stmt = gnc_sql_create_select_statement( be, SCHEDXACTION_TABLE );
- if( stmt == NULL ) return;
+ if ( stmt == NULL ) return;
result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
- GncSqlRow* row;
- SchedXactions *sxes;
- GList* list = NULL;
- sxes = gnc_book_get_schedxactions( be->primary_book );
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
+ GncSqlRow* row;
+ SchedXactions *sxes;
+ GList* list = NULL;
+ sxes = gnc_book_get_schedxactions( be->primary_book );
- row = gnc_sql_result_get_first_row( result );
- while( row != NULL ) {
+ row = gnc_sql_result_get_first_row( result );
+ while ( row != NULL )
+ {
SchedXaction* sx;
-
- sx = load_single_sx( be, row );
- if( sx != NULL ) {
- gnc_sxes_add_sx( sxes, sx );
- list = g_list_prepend( list, sx );
- }
- row = gnc_sql_result_get_next_row( result );
+
+ sx = load_single_sx( be, row );
+ if ( sx != NULL )
+ {
+ gnc_sxes_add_sx( sxes, sx );
+ list = g_list_prepend( list, sx );
+ }
+ row = gnc_sql_result_get_next_row( result );
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose( result );
- if( list != NULL ) {
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
- }
+ if ( list != NULL )
+ {
+ gnc_sql_slots_load_for_list( be, list );
+ g_list_free( list );
+ }
}
}
@@ -146,12 +150,13 @@
static void
create_sx_tables( GncSqlBackend* be )
{
- gint version;
+ gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- version = gnc_sql_get_table_version( be, SCHEDXACTION_TABLE );
- if( version == 0 ) {
+ version = gnc_sql_get_table_version( be, SCHEDXACTION_TABLE );
+ if ( version == 0 )
+ {
(void)gnc_sql_create_table( be, SCHEDXACTION_TABLE, TABLE_VERSION, col_table );
}
}
@@ -162,42 +167,54 @@
{
SchedXaction* pSx;
const GncGUID* guid;
- gint op;
- gboolean is_infant;
- gboolean is_ok;
+ gint op;
+ gboolean is_infant;
+ gboolean is_ok;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_SX(inst), FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( inst != NULL, FALSE );
+ g_return_val_if_fail( GNC_IS_SX(inst), FALSE );
pSx = GNC_SX(inst);
- is_infant = qof_instance_get_infant( inst );
- if( qof_instance_get_destroying( inst ) ) {
- op = OP_DB_DELETE;
- } else if( be->is_pristine_db || is_infant ) {
- op = OP_DB_INSERT;
- } else {
- op = OP_DB_UPDATE;
- }
+ is_infant = qof_instance_get_infant( inst );
+ if ( qof_instance_get_destroying( inst ) )
+ {
+ op = OP_DB_DELETE;
+ }
+ else if ( be->is_pristine_db || is_infant )
+ {
+ op = OP_DB_INSERT;
+ }
+ else
+ {
+ op = OP_DB_UPDATE;
+ }
is_ok = gnc_sql_do_db_operation( be, op, SCHEDXACTION_TABLE, GNC_SX_ID, pSx, col_table );
guid = qof_instance_get_guid( inst );
- if( op == OP_DB_INSERT || op == OP_DB_UPDATE ) {
- gnc_sql_recurrence_save_list( be, guid, gnc_sx_get_schedule( pSx ) );
- } else {
- gnc_sql_recurrence_delete( be, guid );
- }
+ if ( op == OP_DB_INSERT || op == OP_DB_UPDATE )
+ {
+ gnc_sql_recurrence_save_list( be, guid, gnc_sx_get_schedule( pSx ) );
+ }
+ else
+ {
+ gnc_sql_recurrence_delete( be, guid );
+ }
- if( is_ok ) {
- // Now, commit any slots
- if( op == OP_DB_INSERT || op == OP_DB_UPDATE ) {
- is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
- } else {
- is_ok = gnc_sql_slots_delete( be, guid );
- }
- }
+ if ( is_ok )
+ {
+ // Now, commit any slots
+ if ( op == OP_DB_INSERT || op == OP_DB_UPDATE )
+ {
+ is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
+ }
+ else
+ {
+ is_ok = gnc_sql_slots_delete( be, guid );
+ }
+ }
- return is_ok;
+ return is_ok;
}
/* ================================================================= */
@@ -211,10 +228,10 @@
gnc_sql_save_schedxaction, /* commit */
load_all_sxes, /* initial_load */
create_sx_tables, /* create_tables */
- NULL, /* compile_query */
- NULL, /* run_query */
- NULL, /* free_query */
- NULL /* write */
+ NULL, /* compile_query */
+ NULL, /* run_query */
+ NULL, /* free_query */
+ NULL /* write */
};
(void)qof_object_register_backend( GNC_ID_SCHEDXACTION, GNC_SQL_BACKEND, &be_data );
Modified: gnucash/trunk/src/backend/sql/gnc-slots-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-slots-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/gnc-slots-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
/** @file gnc-slots-sql.c
- * @brief load and save data to SQL
+ * @brief load and save data to SQL
* @author Copyright (c) 2006-2008 Phil Longstaff <plongstaff at rogers.com>
*
* This file implements the top-level QofBackend API for saving/
@@ -46,13 +46,17 @@
#define TABLE_NAME "slots"
#define TABLE_VERSION 2
-typedef struct {
+typedef struct
+{
/*@ dependent @*/ GncSqlBackend* be;
- /*@ dependent @*/ const GncGUID* guid;
- gboolean is_ok;
- /*@ dependent @*/ KvpFrame* pKvpFrame;
+ /*@ dependent @*/
+ const GncGUID* guid;
+ gboolean is_ok;
+ /*@ dependent @*/
+ KvpFrame* pKvpFrame;
KvpValueType value_type;
- /*@ dependent @*/ KvpValue* pKvpValue;
+ /*@ dependent @*/
+ KvpValue* pKvpValue;
GString* path;
} slot_info_t;
@@ -80,38 +84,56 @@
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
- { "id", CT_INT, 0, COL_PKEY|COL_NNUL|COL_AUTOINC },
- { "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid },
- { "name", CT_STRING, SLOT_MAX_PATHNAME_LEN, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_path, set_path },
- { "slot_type", CT_INT, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_slot_type, set_slot_type, },
- { "int64_val", CT_INT64, 0, 0, NULL, NULL,
- (QofAccessFunc)get_int64_val, (QofSetterFunc)set_int64_val },
- { "string_val", CT_STRING, SLOT_MAX_PATHNAME_LEN, 0, NULL, NULL,
- (QofAccessFunc)get_string_val, set_string_val },
- { "double_val", CT_DOUBLE, 0, 0, NULL, NULL,
- (QofAccessFunc)get_double_val, set_double_val },
- { "timespec_val", CT_TIMESPEC, 0, 0, NULL, NULL,
- (QofAccessFunc)get_timespec_val, (QofSetterFunc)set_timespec_val },
- { "guid_val", CT_GUID, 0, 0, NULL, NULL,
- (QofAccessFunc)get_guid_val, set_guid_val },
- { "numeric_val", CT_NUMERIC, 0, 0, NULL, NULL,
- (QofAccessFunc)get_numeric_val, (QofSetterFunc)set_numeric_val },
+ /*@ -full_init_block @*/
+ { "id", CT_INT, 0, COL_PKEY | COL_NNUL | COL_AUTOINC },
+ {
+ "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid
+ },
+ {
+ "name", CT_STRING, SLOT_MAX_PATHNAME_LEN, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_path, set_path
+ },
+ {
+ "slot_type", CT_INT, 0, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_slot_type, set_slot_type,
+ },
+ {
+ "int64_val", CT_INT64, 0, 0, NULL, NULL,
+ (QofAccessFunc)get_int64_val, (QofSetterFunc)set_int64_val
+ },
+ {
+ "string_val", CT_STRING, SLOT_MAX_PATHNAME_LEN, 0, NULL, NULL,
+ (QofAccessFunc)get_string_val, set_string_val
+ },
+ {
+ "double_val", CT_DOUBLE, 0, 0, NULL, NULL,
+ (QofAccessFunc)get_double_val, set_double_val
+ },
+ {
+ "timespec_val", CT_TIMESPEC, 0, 0, NULL, NULL,
+ (QofAccessFunc)get_timespec_val, (QofSetterFunc)set_timespec_val
+ },
+ {
+ "guid_val", CT_GUID, 0, 0, NULL, NULL,
+ (QofAccessFunc)get_guid_val, set_guid_val
+ },
+ {
+ "numeric_val", CT_NUMERIC, 0, 0, NULL, NULL,
+ (QofAccessFunc)get_numeric_val, (QofSetterFunc)set_numeric_val
+ },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/* Special column table because we need to be able to access the table by
a column other than the primary key */
static const GncSqlColumnTableEntry obj_guid_col_table[] =
{
- /*@ -full_init_block @*/
+ /*@ -full_init_block @*/
{ "obj_guid", CT_GUID, 0, 0, NULL, NULL, (QofAccessFunc)get_obj_guid, _retrieve_guid_ },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/* ================================================================= */
@@ -121,7 +143,7 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
return (gpointer)pInfo->guid;
}
@@ -137,7 +159,7 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
return (gpointer)pInfo->path->str;
}
@@ -147,12 +169,13 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pValue != NULL );
- if( pInfo->path != NULL ) {
- (void)g_string_free( pInfo->path, TRUE );
- }
+ if ( pInfo->path != NULL )
+ {
+ (void)g_string_free( pInfo->path, TRUE );
+ }
pInfo->path = g_string_new( (gchar*)pValue );
}
@@ -161,7 +184,7 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
return (gpointer)kvp_value_get_type( pInfo->pKvpValue );
}
@@ -171,8 +194,8 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pValue != NULL );
pInfo->value_type = (KvpValueType)pValue;
}
@@ -182,11 +205,14 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, 0 );
+ g_return_val_if_fail( pObject != NULL, 0 );
- if( kvp_value_get_type( pInfo->pKvpValue ) == KVP_TYPE_GINT64 ) {
+ if ( kvp_value_get_type( pInfo->pKvpValue ) == KVP_TYPE_GINT64 )
+ {
return kvp_value_get_gint64( pInfo->pKvpValue );
- } else {
+ }
+ else
+ {
return 0;
}
}
@@ -196,9 +222,10 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pObject != NULL );
- if( pInfo->value_type == KVP_TYPE_GINT64 ) {
+ if ( pInfo->value_type == KVP_TYPE_GINT64 )
+ {
kvp_frame_set_gint64( pInfo->pKvpFrame, pInfo->path->str, value );
}
}
@@ -208,11 +235,14 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
- if( kvp_value_get_type( pInfo->pKvpValue ) == KVP_TYPE_STRING ) {
+ if ( kvp_value_get_type( pInfo->pKvpValue ) == KVP_TYPE_STRING )
+ {
return (gpointer)kvp_value_get_string( pInfo->pKvpValue );
- } else {
+ }
+ else
+ {
return NULL;
}
}
@@ -222,9 +252,10 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pObject != NULL );
- if( pInfo->value_type == KVP_TYPE_STRING && pValue != NULL ) {
+ if ( pInfo->value_type == KVP_TYPE_STRING && pValue != NULL )
+ {
kvp_frame_set_string( pInfo->pKvpFrame, pInfo->path->str, (const gchar*)pValue );
}
}
@@ -235,12 +266,15 @@
slot_info_t* pInfo = (slot_info_t*)pObject;
static double d_val;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
- if( kvp_value_get_type( pInfo->pKvpValue ) == KVP_TYPE_DOUBLE ) {
+ if ( kvp_value_get_type( pInfo->pKvpValue ) == KVP_TYPE_DOUBLE )
+ {
d_val = kvp_value_get_double( pInfo->pKvpValue );
return (gpointer)&d_val;
- } else {
+ }
+ else
+ {
return NULL;
}
}
@@ -250,9 +284,10 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pObject != NULL );
- if( pInfo->value_type == KVP_TYPE_DOUBLE && pValue != NULL ) {
+ if ( pInfo->value_type == KVP_TYPE_DOUBLE && pValue != NULL )
+ {
kvp_frame_set_double( pInfo->pKvpFrame, pInfo->path->str, *(double*)pValue );
}
}
@@ -262,7 +297,7 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, gnc_dmy2timespec( 1, 1, 1970 ) );
+ g_return_val_if_fail( pObject != NULL, gnc_dmy2timespec( 1, 1, 1970 ) );
//if( kvp_value_get_type( pInfo->pKvpValue ) == KVP_TYPE_TIMESPEC ) {
return kvp_value_get_timespec( pInfo->pKvpValue );
@@ -273,9 +308,10 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pObject != NULL );
- if( pInfo->value_type == KVP_TYPE_TIMESPEC ) {
+ if ( pInfo->value_type == KVP_TYPE_TIMESPEC )
+ {
kvp_frame_set_timespec( pInfo->pKvpFrame, pInfo->path->str, ts );
}
}
@@ -285,11 +321,14 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
- if( kvp_value_get_type( pInfo->pKvpValue ) == KVP_TYPE_GUID ) {
+ if ( kvp_value_get_type( pInfo->pKvpValue ) == KVP_TYPE_GUID )
+ {
return (gpointer)kvp_value_get_guid( pInfo->pKvpValue );
- } else {
+ }
+ else
+ {
return NULL;
}
}
@@ -299,9 +338,10 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pObject != NULL );
- if( pInfo->value_type == KVP_TYPE_GUID && pValue != NULL ) {
+ if ( pInfo->value_type == KVP_TYPE_GUID && pValue != NULL )
+ {
kvp_frame_set_guid( pInfo->pKvpFrame, pInfo->path->str, (GncGUID*)pValue );
}
}
@@ -311,11 +351,14 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, gnc_numeric_zero() );
+ g_return_val_if_fail( pObject != NULL, gnc_numeric_zero() );
- if( kvp_value_get_type( pInfo->pKvpValue ) == KVP_TYPE_NUMERIC ) {
+ if ( kvp_value_get_type( pInfo->pKvpValue ) == KVP_TYPE_NUMERIC )
+ {
return kvp_value_get_numeric( pInfo->pKvpValue );
- } else {
+ }
+ else
+ {
return gnc_numeric_zero();
}
}
@@ -325,9 +368,10 @@
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pObject != NULL );
- if( pInfo->value_type == KVP_TYPE_NUMERIC ) {
+ if ( pInfo->value_type == KVP_TYPE_NUMERIC )
+ {
kvp_frame_set_numeric( pInfo->pKvpFrame, pInfo->path->str, value );
}
}
@@ -338,30 +382,35 @@
slot_info_t* pSlot_info = (slot_info_t*)data;
gsize curlen;
- g_return_if_fail( key != NULL );
- g_return_if_fail( value != NULL );
- g_return_if_fail( data != NULL );
+ g_return_if_fail( key != NULL );
+ g_return_if_fail( value != NULL );
+ g_return_if_fail( data != NULL );
- // Ignore if we've already run into a failure
- if( !pSlot_info->is_ok ) {
- return;
- }
+ // Ignore if we've already run into a failure
+ if ( !pSlot_info->is_ok )
+ {
+ return;
+ }
curlen = pSlot_info->path->len;
pSlot_info->pKvpValue = value;
- if( curlen != 0 ) {
+ if ( curlen != 0 )
+ {
(void)g_string_append( pSlot_info->path, "/" );
}
(void)g_string_append( pSlot_info->path, key );
- if( kvp_value_get_type( value ) == KVP_TYPE_FRAME ) {
+ if ( kvp_value_get_type( value ) == KVP_TYPE_FRAME )
+ {
KvpFrame* pKvpFrame = kvp_value_get_frame( value );
kvp_frame_for_each_slot( pKvpFrame, save_slot, pSlot_info );
- } else {
+ }
+ else
+ {
pSlot_info->is_ok = gnc_sql_do_db_operation( pSlot_info->be,
- OP_DB_INSERT, TABLE_NAME,
- TABLE_NAME, pSlot_info,
- col_table );
+ OP_DB_INSERT, TABLE_NAME,
+ TABLE_NAME, pSlot_info,
+ col_table );
}
(void)g_string_truncate( pSlot_info->path, curlen );
@@ -372,23 +421,24 @@
{
slot_info_t slot_info;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( guid != NULL, FALSE );
- g_return_val_if_fail( pFrame != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( guid != NULL, FALSE );
+ g_return_val_if_fail( pFrame != NULL, FALSE );
// If this is not saving into a new db, clear out the old saved slots first
- if( !be->is_pristine_db && !is_infant ) {
- (void)gnc_sql_slots_delete( be, guid );
- }
+ if ( !be->is_pristine_db && !is_infant )
+ {
+ (void)gnc_sql_slots_delete( be, guid );
+ }
slot_info.be = be;
slot_info.guid = guid;
slot_info.path = g_string_new( "" );
- slot_info.is_ok = TRUE;
+ slot_info.is_ok = TRUE;
kvp_frame_for_each_slot( pFrame, save_slot, &slot_info );
(void)g_string_free( slot_info.path, TRUE );
- return slot_info.is_ok;
+ return slot_info.is_ok;
}
gboolean
@@ -396,16 +446,16 @@
{
slot_info_t slot_info;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( guid != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( guid != NULL, FALSE );
slot_info.be = be;
slot_info.guid = guid;
- slot_info.is_ok = TRUE;
+ slot_info.is_ok = TRUE;
slot_info.is_ok = gnc_sql_do_db_operation( be, OP_DB_DELETE, TABLE_NAME,
- TABLE_NAME, &slot_info, obj_guid_col_table );
+ TABLE_NAME, &slot_info, obj_guid_col_table );
- return slot_info.is_ok;
+ return slot_info.is_ok;
}
static void
@@ -413,9 +463,9 @@
{
slot_info_t slot_info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pFrame != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pFrame != NULL );
slot_info.be = be;
slot_info.pKvpFrame = pFrame;
@@ -423,7 +473,8 @@
gnc_sql_load_object( be, row, TABLE_NAME, &slot_info, col_table );
- if( slot_info.path != NULL ) {
+ if ( slot_info.path != NULL )
+ {
(void)g_string_free( slot_info.path, TRUE );
}
}
@@ -435,32 +486,35 @@
GncSqlResult* result;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
GncSqlStatement* stmt;
- const GncGUID* guid;
- KvpFrame* pFrame;
+ const GncGUID* guid;
+ KvpFrame* pFrame;
- g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( inst != NULL );
- guid = qof_instance_get_guid( inst );
- pFrame = qof_instance_get_slots( inst );
+ guid = qof_instance_get_guid( inst );
+ pFrame = qof_instance_get_slots( inst );
(void)guid_to_string_buff( guid, guid_buf );
- buf = g_strdup_printf( "SELECT * FROM %s WHERE obj_guid='%s'", TABLE_NAME, guid_buf );
- stmt = gnc_sql_create_statement_from_sql( be, buf );
- g_free( buf );
- if( stmt != NULL ) {
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ buf = g_strdup_printf( "SELECT * FROM %s WHERE obj_guid='%s'", TABLE_NAME, guid_buf );
+ stmt = gnc_sql_create_statement_from_sql( be, buf );
+ g_free( buf );
+ if ( stmt != NULL )
+ {
+ result = gnc_sql_execute_select_statement( be, stmt );
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
+ GncSqlRow* row = gnc_sql_result_get_first_row( result );
- while( row != NULL ) {
- load_slot( be, row, pFrame );
- row = gnc_sql_result_get_next_row( result );
- }
- gnc_sql_result_dispose( result );
- }
- }
+ while ( row != NULL )
+ {
+ load_slot( be, row, pFrame );
+ row = gnc_sql_result_get_next_row( result );
+ }
+ gnc_sql_result_dispose( result );
+ }
+ }
}
static /*@ dependent @*//*@ null @*/ const GncGUID*
@@ -468,8 +522,8 @@
{
static GncGUID guid;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( row != NULL, NULL );
gnc_sql_load_object( be, row, NULL, &guid, obj_guid_col_table );
@@ -480,16 +534,16 @@
load_slot_for_list_item( GncSqlBackend* be, GncSqlRow* row, QofCollection* coll )
{
slot_info_t slot_info;
- const GncGUID* guid;
- QofInstance* inst;
+ const GncGUID* guid;
+ QofInstance* inst;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( coll != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( coll != NULL );
- guid = load_obj_guid( be, row );
- g_assert( guid != NULL );
- inst = qof_collection_lookup_entity( coll, guid );
+ guid = load_obj_guid( be, row );
+ g_assert( guid != NULL );
+ inst = qof_collection_lookup_entity( coll, guid );
slot_info.be = be;
slot_info.pKvpFrame = qof_instance_get_slots( inst );
@@ -497,7 +551,8 @@
gnc_sql_load_object( be, row, TABLE_NAME, &slot_info, col_table );
- if( slot_info.path != NULL ) {
+ if ( slot_info.path != NULL )
+ {
(void)g_string_free( slot_info.path, TRUE );
}
}
@@ -505,52 +560,59 @@
void
gnc_sql_slots_load_for_list( GncSqlBackend* be, GList* list )
{
- QofCollection* coll;
- GncSqlStatement* stmt;
- GString* sql;
- GncSqlResult* result;
- gboolean single_item;
+ QofCollection* coll;
+ GncSqlStatement* stmt;
+ GString* sql;
+ GncSqlResult* result;
+ gboolean single_item;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- // Ignore empty list
- if( list == NULL ) return;
+ // Ignore empty list
+ if ( list == NULL ) return;
- coll = qof_instance_get_collection( QOF_INSTANCE(list->data) );
+ coll = qof_instance_get_collection( QOF_INSTANCE(list->data) );
- // Create the query for all slots for all items on the list
- sql = g_string_sized_new( 40+(GUID_ENCODING_LENGTH+3)*g_list_length( list ) );
- g_string_append_printf( sql, "SELECT * FROM %s WHERE %s ", TABLE_NAME, obj_guid_col_table[0].col_name );
- if( g_list_length( list ) != 1 ) {
- (void)g_string_append( sql, "IN (" );
- single_item = FALSE;
- } else {
- (void)g_string_append( sql, "= " );
- single_item = TRUE;
- }
- (void)gnc_sql_append_guid_list_to_sql( sql, list, G_MAXUINT );
- if( !single_item ) {
- (void)g_string_append( sql, ")" );
- }
+ // Create the query for all slots for all items on the list
+ sql = g_string_sized_new( 40 + (GUID_ENCODING_LENGTH + 3) * g_list_length( list ) );
+ g_string_append_printf( sql, "SELECT * FROM %s WHERE %s ", TABLE_NAME, obj_guid_col_table[0].col_name );
+ if ( g_list_length( list ) != 1 )
+ {
+ (void)g_string_append( sql, "IN (" );
+ single_item = FALSE;
+ }
+ else
+ {
+ (void)g_string_append( sql, "= " );
+ single_item = TRUE;
+ }
+ (void)gnc_sql_append_guid_list_to_sql( sql, list, G_MAXUINT );
+ if ( !single_item )
+ {
+ (void)g_string_append( sql, ")" );
+ }
- // Execute the query and load the slots
- stmt = gnc_sql_create_statement_from_sql( be, sql->str );
- if( stmt == NULL ) {
- PERR( "stmt == NULL, SQL = '%s'\n", sql->str );
- (void)g_string_free( sql, TRUE );
- return;
- }
- (void)g_string_free( sql, TRUE );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
+ // Execute the query and load the slots
+ stmt = gnc_sql_create_statement_from_sql( be, sql->str );
+ if ( stmt == NULL )
+ {
+ PERR( "stmt == NULL, SQL = '%s'\n", sql->str );
+ (void)g_string_free( sql, TRUE );
+ return;
+ }
+ (void)g_string_free( sql, TRUE );
+ result = gnc_sql_execute_select_statement( be, stmt );
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
GncSqlRow* row = gnc_sql_result_get_first_row( result );
- while( row != NULL ) {
+ while ( row != NULL )
+ {
load_slot_for_list_item( be, row, coll );
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row( result );
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose( result );
}
}
@@ -558,17 +620,17 @@
load_slot_for_book_object( GncSqlBackend* be, GncSqlRow* row, BookLookupFn lookup_fn )
{
slot_info_t slot_info;
- const GncGUID* guid;
- QofInstance* inst;
+ const GncGUID* guid;
+ QofInstance* inst;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( lookup_fn != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( lookup_fn != NULL );
- guid = load_obj_guid( be, row );
- g_return_if_fail( guid != NULL );
- inst = lookup_fn( guid, be->primary_book );
- g_return_if_fail( inst != NULL );
+ guid = load_obj_guid( be, row );
+ g_return_if_fail( guid != NULL );
+ inst = lookup_fn( guid, be->primary_book );
+ g_return_if_fail( inst != NULL );
slot_info.be = be;
slot_info.pKvpFrame = qof_instance_get_slots( inst );
@@ -576,7 +638,8 @@
gnc_sql_load_object( be, row, TABLE_NAME, &slot_info, col_table );
- if( slot_info.path != NULL ) {
+ if ( slot_info.path != NULL )
+ {
(void)g_string_free( slot_info.path, TRUE );
}
}
@@ -591,39 +654,42 @@
* @param lookup_fn Lookup function
*/
void gnc_sql_slots_load_for_sql_subquery( GncSqlBackend* be, const gchar* subquery,
- BookLookupFn lookup_fn )
+ BookLookupFn lookup_fn )
{
- gchar* sql;
- GncSqlStatement* stmt;
- GncSqlResult* result;
+ gchar* sql;
+ GncSqlStatement* stmt;
+ GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- // Ignore empty subquery
- if( subquery == NULL ) return;
+ // Ignore empty subquery
+ if ( subquery == NULL ) return;
- sql = g_strdup_printf( "SELECT * FROM %s WHERE %s IN (%s)",
- TABLE_NAME, obj_guid_col_table[0].col_name,
- subquery );
+ sql = g_strdup_printf( "SELECT * FROM %s WHERE %s IN (%s)",
+ TABLE_NAME, obj_guid_col_table[0].col_name,
+ subquery );
- // Execute the query and load the slots
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- if( stmt == NULL ) {
- PERR( "stmt == NULL, SQL = '%s'\n", sql );
- g_free( sql );
- return;
- }
- g_free( sql );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
+ // Execute the query and load the slots
+ stmt = gnc_sql_create_statement_from_sql( be, sql );
+ if ( stmt == NULL )
+ {
+ PERR( "stmt == NULL, SQL = '%s'\n", sql );
+ g_free( sql );
+ return;
+ }
+ g_free( sql );
+ result = gnc_sql_execute_select_statement( be, stmt );
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
GncSqlRow* row = gnc_sql_result_get_first_row( result );
- while( row != NULL ) {
+ while ( row != NULL )
+ {
load_slot_for_book_object( be, row, lookup_fn );
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row( result );
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose( result );
}
}
@@ -631,28 +697,33 @@
static void
create_slots_tables( GncSqlBackend* be )
{
- gint version;
- gboolean ok;
+ gint version;
+ gboolean ok;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if( version == 0 ) {
- (void)gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ version = gnc_sql_get_table_version( be, TABLE_NAME );
+ if ( version == 0 )
+ {
+ (void)gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
- ok = gnc_sql_create_index( be, "slots_guid_index", TABLE_NAME, obj_guid_col_table );
- if( !ok ) {
- PERR( "Unable to create index\n" );
- }
- } else if( version == 1 ) {
- /* Upgrade 64-bit int values to proper definition */
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
- ok = gnc_sql_create_index( be, "slots_guid_index", TABLE_NAME, obj_guid_col_table );
- if( !ok ) {
- PERR( "Unable to create index\n" );
- }
- (void)gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
- }
+ ok = gnc_sql_create_index( be, "slots_guid_index", TABLE_NAME, obj_guid_col_table );
+ if ( !ok )
+ {
+ PERR( "Unable to create index\n" );
+ }
+ }
+ else if ( version == 1 )
+ {
+ /* Upgrade 64-bit int values to proper definition */
+ gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
+ ok = gnc_sql_create_index( be, "slots_guid_index", TABLE_NAME, obj_guid_col_table );
+ if ( !ok )
+ {
+ PERR( "Unable to create index\n" );
+ }
+ (void)gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
+ }
}
/* ================================================================= */
@@ -666,10 +737,10 @@
NULL, /* commit - cannot occur */
NULL, /* initial_load - cannot occur */
create_slots_tables, /* create_tables */
- NULL, /* compile_query */
- NULL, /* run_query */
- NULL, /* free_query */
- NULL /* write */
+ NULL, /* compile_query */
+ NULL, /* run_query */
+ NULL, /* free_query */
+ NULL /* write */
};
(void)qof_object_register_backend( TABLE_NAME, GNC_SQL_BACKEND, &be_data );
Modified: gnucash/trunk/src/backend/sql/gnc-transaction-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-transaction-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/backend/sql/gnc-transaction-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
/** @file gnc-transaction-sql.c
- * @brief load and save data to SQL
+ * @brief load and save data to SQL
* @author Copyright (c) 2006-2008 Phil Longstaff <plongstaff at rogers.com>
*
* This file implements the top-level QofBackend API for saving/
@@ -63,10 +63,12 @@
#define SPLIT_TABLE "splits"
#define SPLIT_TABLE_VERSION 4
-typedef struct {
+typedef struct
+{
/*@ dependent @*/ GncSqlBackend* be;
- /*@ dependent @*/ const GncGUID* guid;
- gboolean is_ok;
+ /*@ dependent @*/
+ const GncGUID* guid;
+ gboolean is_ok;
} split_info_t;
#define TX_MAX_NUM_LEN 2048
@@ -74,15 +76,15 @@
static const GncSqlColumnTableEntry tx_col_table[] =
{
- /*@ -full_init_block @*/
- { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ /*@ -full_init_block @*/
+ { "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "currency_guid", CT_COMMODITYREF, 0, COL_NNUL, "currency" },
{ "num", CT_STRING, TX_MAX_NUM_LEN, COL_NNUL, "num" },
{ "post_date", CT_TIMESPEC, 0, 0, "post-date" },
{ "enter_date", CT_TIMESPEC, 0, 0, "enter-date" },
{ "description", CT_STRING, TX_MAX_DESCRIPTION_LEN, 0, "description" },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
static /*@ dependent @*//*@ null @*/ gpointer get_split_reconcile_state( gpointer pObject );
@@ -95,45 +97,49 @@
static const GncSqlColumnTableEntry split_col_table[] =
{
- /*@ -full_init_block @*/
- { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ /*@ -full_init_block @*/
+ { "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "tx_guid", CT_TXREF, 0, COL_NNUL, "transaction" },
{ "account_guid", CT_ACCOUNTREF, 0, COL_NNUL, "account" },
{ "memo", CT_STRING, SPLIT_MAX_MEMO_LEN, COL_NNUL, "memo" },
{ "action", CT_STRING, SPLIT_MAX_ACTION_LEN, COL_NNUL, "action" },
- { "reconcile_state", CT_STRING, 1, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_split_reconcile_state, set_split_reconcile_state },
+ {
+ "reconcile_state", CT_STRING, 1, COL_NNUL, NULL, NULL,
+ (QofAccessFunc)get_split_reconcile_state, set_split_reconcile_state
+ },
{ "reconcile_date", CT_TIMESPEC, 0, 0, "reconcile-date" },
{ "value", CT_NUMERIC, 0, COL_NNUL, "value" },
{ "quantity", CT_NUMERIC, 0, COL_NNUL, "amount" },
- { "lot_guid", CT_LOTREF, 0, 0, NULL, NULL,
- (QofAccessFunc)xaccSplitGetLot, set_split_lot },
+ {
+ "lot_guid", CT_LOTREF, 0, 0, NULL, NULL,
+ (QofAccessFunc)xaccSplitGetLot, set_split_lot
+ },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
static const GncSqlColumnTableEntry post_date_col_table[] =
{
- /*@ -full_init_block @*/
+ /*@ -full_init_block @*/
{ "post_date", CT_TIMESPEC, 0, 0, "post-date" },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
static const GncSqlColumnTableEntry account_guid_col_table[] =
{
- /*@ -full_init_block @*/
+ /*@ -full_init_block @*/
{ "account_guid", CT_ACCOUNTREF, 0, COL_NNUL, "account" },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
static const GncSqlColumnTableEntry tx_guid_col_table[] =
{
- /*@ -full_init_block @*/
+ /*@ -full_init_block @*/
{ "tx_guid", CT_GUID, 0, 0, "guid" },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
/* ================================================================= */
@@ -143,31 +149,31 @@
{
static gchar c[2];
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_SPLIT(pObject), NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( GNC_IS_SPLIT(pObject), NULL );
c[0] = xaccSplitGetReconcile( GNC_SPLIT(pObject) );
c[1] = '\0';
return (gpointer)c;
}
-static void
+static void
set_split_reconcile_state( gpointer pObject, /*@ null @*/ gpointer pValue )
{
const gchar* s = (const gchar*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( GNC_IS_SPLIT(pObject) );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( GNC_IS_SPLIT(pObject) );
+ g_return_if_fail( pValue != NULL );
xaccSplitSetReconcile( GNC_SPLIT(pObject), s[0] );
}
-static void
+static void
set_split_reconcile_date( gpointer pObject, Timespec ts )
{
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( GNC_IS_SPLIT(pObject) );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( GNC_IS_SPLIT(pObject) );
xaccSplitSetDateReconciledTS( GNC_SPLIT(pObject), &ts );
}
@@ -175,19 +181,19 @@
static void
set_split_lot( gpointer pObject, /*@ null @*/ gpointer pLot )
{
- GNCLot* lot;
- Split* split;
+ GNCLot* lot;
+ Split* split;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( GNC_IS_SPLIT(pObject) );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( GNC_IS_SPLIT(pObject) );
- if( pLot == NULL ) return;
+ if ( pLot == NULL ) return;
- g_return_if_fail( GNC_IS_LOT(pLot) );
+ g_return_if_fail( GNC_IS_LOT(pLot) );
- split = GNC_SPLIT(pObject);
- lot = GNC_LOT(pLot);
- gnc_lot_add_split( lot, split );
+ split = GNC_SPLIT(pObject);
+ lot = GNC_LOT(pLot);
+ gnc_lot_add_split( lot, split );
}
static /*@ null @*/ Split*
@@ -195,69 +201,75 @@
{
const GncGUID* guid;
GncGUID split_guid;
- Split* pSplit;
+ Split* pSplit;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( row != NULL, NULL );
guid = gnc_sql_load_guid( be, row );
- if( guid == NULL ) return NULL;
+ if ( guid == NULL ) return NULL;
split_guid = *guid;
pSplit = xaccSplitLookup( &split_guid, be->primary_book );
- if( pSplit == NULL ) {
+ if ( pSplit == NULL )
+ {
pSplit = xaccMallocSplit( be->primary_book );
}
/* If the split is dirty, don't overwrite it */
- if( !qof_instance_is_dirty( QOF_INSTANCE(pSplit) ) ) {
- gnc_sql_load_object( be, row, GNC_ID_SPLIT, pSplit, split_col_table );
- }
+ if ( !qof_instance_is_dirty( QOF_INSTANCE(pSplit) ) )
+ {
+ gnc_sql_load_object( be, row, GNC_ID_SPLIT, pSplit, split_col_table );
+ }
/*# -ifempty */g_assert( pSplit == xaccSplitLookup( &split_guid, be->primary_book ) );
- return pSplit;
+ return pSplit;
}
static void
load_splits_for_tx_list( GncSqlBackend* be, GList* list )
{
- GString* sql;
- GncSqlResult* result;
+ GString* sql;
+ GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- if( list == NULL ) return;
+ if ( list == NULL ) return;
- sql = g_string_sized_new( 40+(GUID_ENCODING_LENGTH+3)*g_list_length( list ) );
- g_string_append_printf( sql, "SELECT * FROM %s WHERE %s IN (", SPLIT_TABLE, tx_guid_col_table[0].col_name );
- (void)gnc_sql_append_guid_list_to_sql( sql, list, G_MAXUINT );
- (void)g_string_append( sql, ")" );
+ sql = g_string_sized_new( 40 + (GUID_ENCODING_LENGTH + 3) * g_list_length( list ) );
+ g_string_append_printf( sql, "SELECT * FROM %s WHERE %s IN (", SPLIT_TABLE, tx_guid_col_table[0].col_name );
+ (void)gnc_sql_append_guid_list_to_sql( sql, list, G_MAXUINT );
+ (void)g_string_append( sql, ")" );
- // Execute the query and load the splits
- result = gnc_sql_execute_select_sql( be, sql->str );
- if( result != NULL ) {
- GList* split_list = NULL;
- GncSqlRow* row;
+ // Execute the query and load the splits
+ result = gnc_sql_execute_select_sql( be, sql->str );
+ if ( result != NULL )
+ {
+ GList* split_list = NULL;
+ GncSqlRow* row;
- row = gnc_sql_result_get_first_row( result );
- while( row != NULL ) {
- Split* s;
+ row = gnc_sql_result_get_first_row( result );
+ while ( row != NULL )
+ {
+ Split* s;
s = load_single_split( be, row );
- if( s != NULL ) {
- split_list = g_list_prepend( split_list, s );
- }
- row = gnc_sql_result_get_next_row( result );
+ if ( s != NULL )
+ {
+ split_list = g_list_prepend( split_list, s );
+ }
+ row = gnc_sql_result_get_next_row( result );
}
- if( split_list != NULL ) {
- gnc_sql_slots_load_for_list( be, split_list );
- g_list_free( split_list );
- }
+ if ( split_list != NULL )
+ {
+ gnc_sql_slots_load_for_list( be, split_list );
+ g_list_free( split_list );
+ }
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose( result );
}
- (void)g_string_free( sql, TRUE );
+ (void)g_string_free( sql, TRUE );
}
static /*@ null @*/ Transaction*
@@ -265,19 +277,20 @@
{
const GncGUID* guid;
GncGUID tx_guid;
- Transaction* pTx;
+ Transaction* pTx;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( row != NULL, NULL );
guid = gnc_sql_load_guid( be, row );
- if( guid == NULL ) return NULL;
+ if ( guid == NULL ) return NULL;
tx_guid = *guid;
- // Don't overwrite the transaction if it's already been loaded (and possibly modified).
+ // Don't overwrite the transaction if it's already been loaded (and possibly modified).
pTx = xaccTransLookup( &tx_guid, be->primary_book );
- if( pTx != NULL ) {
- return NULL;
+ if ( pTx != NULL )
+ {
+ return NULL;
}
pTx = xaccMallocTransaction( be->primary_book );
@@ -286,7 +299,7 @@
g_assert( pTx == xaccTransLookup( &tx_guid, be->primary_book ) );
- return pTx;
+ return pTx;
}
/**
@@ -295,14 +308,15 @@
* so that the end balances (which are calculated and correct on initial load)
* are unchanged.
*/
-typedef struct {
- /*@ dependent @*/ Account* acc;
- gnc_numeric start_bal;
- gnc_numeric end_bal;
- gnc_numeric start_cleared_bal;
- gnc_numeric end_cleared_bal;
- gnc_numeric start_reconciled_bal;
- gnc_numeric end_reconciled_bal;
+typedef struct
+{
+ /*@ dependent @*/ Account* acc;
+ gnc_numeric start_bal;
+ gnc_numeric end_bal;
+ gnc_numeric start_cleared_bal;
+ gnc_numeric end_cleared_bal;
+ gnc_numeric start_reconciled_bal;
+ gnc_numeric end_reconciled_bal;
} full_acct_balances_t;
/**
@@ -314,41 +328,41 @@
static void
save_account_balances( Account* acc, gpointer pData )
{
- GSList** pBal_list = (GSList**)pData;
- full_acct_balances_t* newbal;
- gnc_numeric* pstart;
- gnc_numeric* pend;
- gnc_numeric* pstart_c;
- gnc_numeric* pend_c;
- gnc_numeric* pstart_r;
- gnc_numeric* pend_r;
+ GSList** pBal_list = (GSList**)pData;
+ full_acct_balances_t* newbal;
+ gnc_numeric* pstart;
+ gnc_numeric* pend;
+ gnc_numeric* pstart_c;
+ gnc_numeric* pend_c;
+ gnc_numeric* pstart_r;
+ gnc_numeric* pend_r;
- newbal = g_malloc( (gsize)sizeof( full_acct_balances_t ) );
- g_assert( newbal != NULL );
+ newbal = g_malloc( (gsize)sizeof( full_acct_balances_t ) );
+ g_assert( newbal != NULL );
- newbal->acc = acc;
- g_object_get( acc,
- "start-balance", &pstart,
- "end-balance", &pend,
- "start-cleared-balance", &pstart_c,
- "end-cleared-balance", &pend_c,
- "start-reconciled-balance", &pstart_r,
- "end-reconciled-balance", &pend_r,
- NULL );
- newbal->start_bal = *pstart;
- newbal->end_bal = *pend;
- newbal->start_cleared_bal = *pstart_c;
- newbal->end_cleared_bal = *pend_c;
- newbal->start_reconciled_bal = *pstart_r;
- newbal->end_reconciled_bal = *pend_r;
- *pBal_list = g_slist_append( *pBal_list, newbal );
+ newbal->acc = acc;
+ g_object_get( acc,
+ "start-balance", &pstart,
+ "end-balance", &pend,
+ "start-cleared-balance", &pstart_c,
+ "end-cleared-balance", &pend_c,
+ "start-reconciled-balance", &pstart_r,
+ "end-reconciled-balance", &pend_r,
+ NULL );
+ newbal->start_bal = *pstart;
+ newbal->end_bal = *pend;
+ newbal->start_cleared_bal = *pstart_c;
+ newbal->end_cleared_bal = *pend_c;
+ newbal->start_reconciled_bal = *pstart_r;
+ newbal->end_reconciled_bal = *pend_r;
+ *pBal_list = g_slist_append( *pBal_list, newbal );
- g_free( pstart );
- g_free( pend );
- g_free( pstart_c );
- g_free( pend_c );
- g_free( pstart_r );
- g_free( pend_r );
+ g_free( pstart );
+ g_free( pend );
+ g_free( pstart_c );
+ g_free( pend_c );
+ g_free( pstart_r );
+ g_free( pend_r );
}
/**
@@ -363,105 +377,115 @@
{
GncSqlResult* result;
- g_return_if_fail( be != NULL );
- g_return_if_fail( stmt != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( stmt != NULL );
result = gnc_sql_execute_select_statement( be, stmt );
- if( result != NULL ) {
- GList* tx_list = NULL;
- GList* node;
- GncSqlRow* row;
- Transaction* tx;
- GSList* bal_list = NULL;
- GSList* nextbal;
- Account* root = gnc_book_get_root_account( be->primary_book );
+ if ( result != NULL )
+ {
+ GList* tx_list = NULL;
+ GList* node;
+ GncSqlRow* row;
+ Transaction* tx;
+ GSList* bal_list = NULL;
+ GSList* nextbal;
+ Account* root = gnc_book_get_root_account( be->primary_book );
#if LOAD_TRANSACTIONS_AS_NEEDED
- qof_event_suspend();
- xaccAccountBeginEdit( root );
+ qof_event_suspend();
+ xaccAccountBeginEdit( root );
- // Save the start/ending balances (balance, cleared and reconciled) for
- // every account.
- gnc_account_foreach_descendant( gnc_book_get_root_account( be->primary_book ),
- save_account_balances,
- &bal_list );
+ // Save the start/ending balances (balance, cleared and reconciled) for
+ // every account.
+ gnc_account_foreach_descendant( gnc_book_get_root_account( be->primary_book ),
+ save_account_balances,
+ &bal_list );
#endif
- // Load the transactions
- row = gnc_sql_result_get_first_row( result );
- while( row != NULL ) {
+ // Load the transactions
+ row = gnc_sql_result_get_first_row( result );
+ while ( row != NULL )
+ {
tx = load_single_tx( be, row );
- if( tx != NULL ) {
- tx_list = g_list_prepend( tx_list, tx );
- }
- row = gnc_sql_result_get_next_row( result );
+ if ( tx != NULL )
+ {
+ tx_list = g_list_prepend( tx_list, tx );
+ }
+ row = gnc_sql_result_get_next_row( result );
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose( result );
- // Load all splits and slots for the transactions
- if( tx_list != NULL ) {
- gnc_sql_slots_load_for_list( be, tx_list );
- load_splits_for_tx_list( be, tx_list );
- }
+ // Load all splits and slots for the transactions
+ if ( tx_list != NULL )
+ {
+ gnc_sql_slots_load_for_list( be, tx_list );
+ load_splits_for_tx_list( be, tx_list );
+ }
- // Commit all of the transactions
- for( node = tx_list; node != NULL; node = node->next ) {
- Transaction* pTx = GNC_TRANSACTION(node->data);
- xaccTransCommitEdit( pTx );
- }
- g_list_free( tx_list );
+ // Commit all of the transactions
+ for ( node = tx_list; node != NULL; node = node->next )
+ {
+ Transaction* pTx = GNC_TRANSACTION(node->data);
+ xaccTransCommitEdit( pTx );
+ }
+ g_list_free( tx_list );
#if LOAD_TRANSACTIONS_AS_NEEDED
- // Update the account balances based on the loaded splits. If the end
- // balance has changed, update the start balance so that the end
- // balance is the same as it was before the splits were loaded.
- // Repeat for cleared and reconciled balances.
- for( nextbal = bal_list; nextbal != NULL; nextbal = nextbal->next ) {
- full_acct_balances_t* balns = (full_acct_balances_t*)nextbal->data;
- gnc_numeric* pnew_end_bal;
- gnc_numeric* pnew_end_c_bal;
- gnc_numeric* pnew_end_r_bal;
- gnc_numeric adj;
+ // Update the account balances based on the loaded splits. If the end
+ // balance has changed, update the start balance so that the end
+ // balance is the same as it was before the splits were loaded.
+ // Repeat for cleared and reconciled balances.
+ for ( nextbal = bal_list; nextbal != NULL; nextbal = nextbal->next )
+ {
+ full_acct_balances_t* balns = (full_acct_balances_t*)nextbal->data;
+ gnc_numeric* pnew_end_bal;
+ gnc_numeric* pnew_end_c_bal;
+ gnc_numeric* pnew_end_r_bal;
+ gnc_numeric adj;
- g_object_get( balns->acc,
- "end-balance", &pnew_end_bal,
- "end-cleared-balance", &pnew_end_c_bal,
- "end-reconciled-balance", &pnew_end_r_bal,
- NULL );
+ g_object_get( balns->acc,
+ "end-balance", &pnew_end_bal,
+ "end-cleared-balance", &pnew_end_c_bal,
+ "end-reconciled-balance", &pnew_end_r_bal,
+ NULL );
- if( !gnc_numeric_eq( *pnew_end_bal, balns->end_bal ) ) {
- adj = gnc_numeric_sub( balns->end_bal, *pnew_end_bal,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- balns->start_bal = gnc_numeric_add( balns->start_bal, adj,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- g_object_set( balns->acc, "start-balance", &balns->start_bal, NULL );
- }
- if( !gnc_numeric_eq( *pnew_end_c_bal, balns->end_cleared_bal ) ) {
- adj = gnc_numeric_sub( balns->end_cleared_bal, *pnew_end_c_bal,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- balns->start_cleared_bal = gnc_numeric_add( balns->start_cleared_bal, adj,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- g_object_set( balns->acc, "start-cleared-balance", &balns->start_cleared_bal, NULL );
- }
- if( !gnc_numeric_eq( *pnew_end_r_bal, balns->end_reconciled_bal ) ) {
- adj = gnc_numeric_sub( balns->end_reconciled_bal, *pnew_end_r_bal,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- balns->start_reconciled_bal = gnc_numeric_add( balns->start_reconciled_bal, adj,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- g_object_set( balns->acc, "start-reconciled-balance", &balns->start_reconciled_bal, NULL );
- }
- xaccAccountRecomputeBalance( balns->acc );
- g_free( pnew_end_bal );
- g_free( pnew_end_c_bal );
- g_free( pnew_end_r_bal );
- g_free( balns );
- }
- if( bal_list != NULL ) {
- g_slist_free( bal_list );
- }
+ if ( !gnc_numeric_eq( *pnew_end_bal, balns->end_bal ) )
+ {
+ adj = gnc_numeric_sub( balns->end_bal, *pnew_end_bal,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ balns->start_bal = gnc_numeric_add( balns->start_bal, adj,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ g_object_set( balns->acc, "start-balance", &balns->start_bal, NULL );
+ }
+ if ( !gnc_numeric_eq( *pnew_end_c_bal, balns->end_cleared_bal ) )
+ {
+ adj = gnc_numeric_sub( balns->end_cleared_bal, *pnew_end_c_bal,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ balns->start_cleared_bal = gnc_numeric_add( balns->start_cleared_bal, adj,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ g_object_set( balns->acc, "start-cleared-balance", &balns->start_cleared_bal, NULL );
+ }
+ if ( !gnc_numeric_eq( *pnew_end_r_bal, balns->end_reconciled_bal ) )
+ {
+ adj = gnc_numeric_sub( balns->end_reconciled_bal, *pnew_end_r_bal,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ balns->start_reconciled_bal = gnc_numeric_add( balns->start_reconciled_bal, adj,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ g_object_set( balns->acc, "start-reconciled-balance", &balns->start_reconciled_bal, NULL );
+ }
+ xaccAccountRecomputeBalance( balns->acc );
+ g_free( pnew_end_bal );
+ g_free( pnew_end_c_bal );
+ g_free( pnew_end_r_bal );
+ g_free( balns );
+ }
+ if ( bal_list != NULL )
+ {
+ g_slist_free( bal_list );
+ }
- xaccAccountCommitEdit( root );
- qof_event_resume();
+ xaccAccountCommitEdit( root );
+ qof_event_resume();
#endif
}
}
@@ -475,53 +499,64 @@
static void
create_transaction_tables( GncSqlBackend* be )
{
- gint version;
- gboolean ok;
+ gint version;
+ gboolean ok;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- version = gnc_sql_get_table_version( be, TRANSACTION_TABLE );
- if( version == 0 ) {
+ version = gnc_sql_get_table_version( be, TRANSACTION_TABLE );
+ if ( version == 0 )
+ {
(void)gnc_sql_create_table( be, TRANSACTION_TABLE, TX_TABLE_VERSION, tx_col_table );
- ok = gnc_sql_create_index( be, "tx_post_date_index", TRANSACTION_TABLE, post_date_col_table );
- if( !ok ) {
- PERR( "Unable to create index\n" );
- }
- } else if( version < TX_TABLE_VERSION ) {
- /* Upgrade:
- 1->2: 64 bit int handling
- 2->3: allow dates to be NULL
- */
- gnc_sql_upgrade_table( be, TRANSACTION_TABLE, tx_col_table );
- (void)gnc_sql_set_table_version( be, TRANSACTION_TABLE, TX_TABLE_VERSION );
+ ok = gnc_sql_create_index( be, "tx_post_date_index", TRANSACTION_TABLE, post_date_col_table );
+ if ( !ok )
+ {
+ PERR( "Unable to create index\n" );
+ }
}
+ else if ( version < TX_TABLE_VERSION )
+ {
+ /* Upgrade:
+ 1->2: 64 bit int handling
+ 2->3: allow dates to be NULL
+ */
+ gnc_sql_upgrade_table( be, TRANSACTION_TABLE, tx_col_table );
+ (void)gnc_sql_set_table_version( be, TRANSACTION_TABLE, TX_TABLE_VERSION );
+ }
- version = gnc_sql_get_table_version( be, SPLIT_TABLE );
- if( version == 0 ) {
+ version = gnc_sql_get_table_version( be, SPLIT_TABLE );
+ if ( version == 0 )
+ {
(void)gnc_sql_create_table( be, SPLIT_TABLE, SPLIT_TABLE_VERSION, split_col_table );
- ok = gnc_sql_create_index( be, "splits_tx_guid_index", SPLIT_TABLE, tx_guid_col_table );
- if( !ok ) {
- PERR( "Unable to create index\n" );
- }
- ok = gnc_sql_create_index( be, "splits_account_guid_index", SPLIT_TABLE, account_guid_col_table );
- if( !ok ) {
- PERR( "Unable to create index\n" );
- }
- } else if( version < SPLIT_TABLE_VERSION ) {
+ ok = gnc_sql_create_index( be, "splits_tx_guid_index", SPLIT_TABLE, tx_guid_col_table );
+ if ( !ok )
+ {
+ PERR( "Unable to create index\n" );
+ }
+ ok = gnc_sql_create_index( be, "splits_account_guid_index", SPLIT_TABLE, account_guid_col_table );
+ if ( !ok )
+ {
+ PERR( "Unable to create index\n" );
+ }
+ }
+ else if ( version < SPLIT_TABLE_VERSION )
+ {
- /* Upgrade:
- 1->2: 64 bit int handling
- 3->4: Split reconcile date can be NULL */
- gnc_sql_upgrade_table( be, SPLIT_TABLE, split_col_table );
- ok = gnc_sql_create_index( be, "splits_tx_guid_index", SPLIT_TABLE, tx_guid_col_table );
- if( !ok ) {
- PERR( "Unable to create index\n" );
- }
- ok = gnc_sql_create_index( be, "splits_account_guid_index", SPLIT_TABLE, account_guid_col_table );
- if( !ok ) {
- PERR( "Unable to create index\n" );
- }
- (void)gnc_sql_set_table_version( be, SPLIT_TABLE, SPLIT_TABLE_VERSION );
+ /* Upgrade:
+ 1->2: 64 bit int handling
+ 3->4: Split reconcile date can be NULL */
+ gnc_sql_upgrade_table( be, SPLIT_TABLE, split_col_table );
+ ok = gnc_sql_create_index( be, "splits_tx_guid_index", SPLIT_TABLE, tx_guid_col_table );
+ if ( !ok )
+ {
+ PERR( "Unable to create index\n" );
+ }
+ ok = gnc_sql_create_index( be, "splits_account_guid_index", SPLIT_TABLE, account_guid_col_table );
+ if ( !ok )
+ {
+ PERR( "Unable to create index\n" );
+ }
+ (void)gnc_sql_set_table_version( be, SPLIT_TABLE, SPLIT_TABLE_VERSION );
}
}
/* ================================================================= */
@@ -537,14 +572,15 @@
split_info_t* split_info = (split_info_t*)user_data;
Split* pSplit = GNC_SPLIT(data);
- g_return_if_fail( data != NULL );
- g_return_if_fail( GNC_IS_SPLIT(data) );
- g_return_if_fail( user_data != NULL );
+ g_return_if_fail( data != NULL );
+ g_return_if_fail( GNC_IS_SPLIT(data) );
+ g_return_if_fail( user_data != NULL );
- if( split_info->is_ok ) {
- split_info->is_ok = gnc_sql_slots_delete( split_info->be,
- qof_instance_get_guid( QOF_INSTANCE(pSplit) ) );
- }
+ if ( split_info->is_ok )
+ {
+ split_info->is_ok = gnc_sql_slots_delete( split_info->be,
+ qof_instance_get_guid( QOF_INSTANCE(pSplit) ) );
+ }
}
/**
@@ -559,19 +595,20 @@
{
split_info_t split_info;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( pTx != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( pTx != NULL, FALSE );
- if( !gnc_sql_do_db_operation( be, OP_DB_DELETE, SPLIT_TABLE,
- SPLIT_TABLE, pTx, tx_guid_col_table ) ) {
- return FALSE;
- }
+ if ( !gnc_sql_do_db_operation( be, OP_DB_DELETE, SPLIT_TABLE,
+ SPLIT_TABLE, pTx, tx_guid_col_table ) )
+ {
+ return FALSE;
+ }
split_info.be = be;
- split_info.is_ok = TRUE;
+ split_info.is_ok = TRUE;
g_list_foreach( xaccTransGetSplitList( pTx ), delete_split_slots_cb, &split_info );
- return split_info.is_ok;
+ return split_info.is_ok;
}
/**
@@ -584,30 +621,36 @@
static gboolean
commit_split( GncSqlBackend* be, QofInstance* inst )
{
- gint op;
- gboolean is_infant;
- gboolean is_ok;
+ gint op;
+ gboolean is_infant;
+ gboolean is_ok;
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( inst != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
- is_infant = qof_instance_get_infant( inst );
- if( qof_instance_get_destroying( inst ) ) {
- op = OP_DB_DELETE;
- } else if( be->is_pristine_db || is_infant ) {
- op = OP_DB_INSERT;
- } else {
- op = OP_DB_UPDATE;
- }
+ is_infant = qof_instance_get_infant( inst );
+ if ( qof_instance_get_destroying( inst ) )
+ {
+ op = OP_DB_DELETE;
+ }
+ else if ( be->is_pristine_db || is_infant )
+ {
+ op = OP_DB_INSERT;
+ }
+ else
+ {
+ op = OP_DB_UPDATE;
+ }
is_ok = gnc_sql_do_db_operation( be, op, SPLIT_TABLE, GNC_ID_SPLIT, inst, split_col_table );
- if( is_ok ) {
- is_ok = gnc_sql_slots_save( be,
- qof_instance_get_guid( inst ),
- is_infant,
- qof_instance_get_slots( inst ) );
- }
+ if ( is_ok )
+ {
+ is_ok = gnc_sql_slots_save( be,
+ qof_instance_get_guid( inst ),
+ is_infant,
+ qof_instance_get_slots( inst ) );
+ }
- return is_ok;
+ return is_ok;
}
static void
@@ -616,13 +659,14 @@
split_info_t* split_info = (split_info_t*)user_data;
Split* pSplit = GNC_SPLIT(data);
- g_return_if_fail( data != NULL );
- g_return_if_fail( GNC_IS_SPLIT(data) );
- g_return_if_fail( user_data != NULL );
+ g_return_if_fail( data != NULL );
+ g_return_if_fail( GNC_IS_SPLIT(data) );
+ g_return_if_fail( user_data != NULL );
- if( split_info->is_ok ) {
- split_info->is_ok = commit_split( split_info->be, QOF_INSTANCE(pSplit) );
- }
+ if ( split_info->is_ok )
+ {
+ split_info->is_ok = commit_split( split_info->be, QOF_INSTANCE(pSplit) );
+ }
}
static gboolean
@@ -630,86 +674,99 @@
{
split_info_t split_info;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( tx_guid != NULL, FALSE );
- g_return_val_if_fail( pSplitList != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( tx_guid != NULL, FALSE );
+ g_return_val_if_fail( pSplitList != NULL, FALSE );
split_info.be = be;
split_info.guid = tx_guid;
- split_info.is_ok = TRUE;
+ split_info.is_ok = TRUE;
g_list_foreach( pSplitList, save_split_cb, &split_info );
- return split_info.is_ok;
+ return split_info.is_ok;
}
static gboolean
save_transaction( GncSqlBackend* be, Transaction* pTx, gboolean do_save_splits )
{
const GncGUID* guid;
- gint op;
- gboolean is_infant;
- QofInstance* inst;
- gboolean is_ok = TRUE;
+ gint op;
+ gboolean is_infant;
+ QofInstance* inst;
+ gboolean is_ok = TRUE;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( pTx != NULL, FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( pTx != NULL, FALSE );
- inst = QOF_INSTANCE(pTx);
- is_infant = qof_instance_get_infant( inst );
- if( qof_instance_get_destroying( inst ) ) {
- op = OP_DB_DELETE;
- } else if( be->is_pristine_db || is_infant ) {
- op = OP_DB_INSERT;
- } else {
- op = OP_DB_UPDATE;
- }
+ inst = QOF_INSTANCE(pTx);
+ is_infant = qof_instance_get_infant( inst );
+ if ( qof_instance_get_destroying( inst ) )
+ {
+ op = OP_DB_DELETE;
+ }
+ else if ( be->is_pristine_db || is_infant )
+ {
+ op = OP_DB_INSERT;
+ }
+ else
+ {
+ op = OP_DB_UPDATE;
+ }
- if( op != OP_DB_DELETE ) {
- // Ensure the commodity is in the db
- is_ok = gnc_sql_save_commodity( be, xaccTransGetCurrency( pTx ) );
- }
+ if ( op != OP_DB_DELETE )
+ {
+ // Ensure the commodity is in the db
+ is_ok = gnc_sql_save_commodity( be, xaccTransGetCurrency( pTx ) );
+ }
- if( is_ok ) {
- is_ok = gnc_sql_do_db_operation( be, op, TRANSACTION_TABLE, GNC_ID_TRANS, pTx, tx_col_table );
- }
+ if ( is_ok )
+ {
+ is_ok = gnc_sql_do_db_operation( be, op, TRANSACTION_TABLE, GNC_ID_TRANS, pTx, tx_col_table );
+ }
- if( is_ok ) {
- // Commit slots and splits
- guid = qof_instance_get_guid( inst );
- if( !qof_instance_get_destroying(inst) ) {
- is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
- if( is_ok && do_save_splits ) {
- is_ok = save_splits( be, guid, xaccTransGetSplitList( pTx ) );
- }
- } else {
- is_ok = gnc_sql_slots_delete( be, guid );
- if( is_ok ) {
- is_ok = delete_splits( be, pTx );
- }
- }
- }
+ if ( is_ok )
+ {
+ // Commit slots and splits
+ guid = qof_instance_get_guid( inst );
+ if ( !qof_instance_get_destroying(inst) )
+ {
+ is_ok = gnc_sql_slots_save( be, guid, is_infant, qof_instance_get_slots( inst ) );
+ if ( is_ok && do_save_splits )
+ {
+ is_ok = save_splits( be, guid, xaccTransGetSplitList( pTx ) );
+ }
+ }
+ else
+ {
+ is_ok = gnc_sql_slots_delete( be, guid );
+ if ( is_ok )
+ {
+ is_ok = delete_splits( be, pTx );
+ }
+ }
+ }
- return is_ok;
+ return is_ok;
}
gboolean
gnc_sql_save_transaction( GncSqlBackend* be, QofInstance* inst )
{
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_TRANS(inst), FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( inst != NULL, FALSE );
+ g_return_val_if_fail( GNC_IS_TRANS(inst), FALSE );
- return save_transaction( be, GNC_TRANS(inst), /* do_save_splits */TRUE );
+ return save_transaction( be, GNC_TRANS(inst), /* do_save_splits */TRUE );
}
static gboolean
commit_transaction( GncSqlBackend* be, QofInstance* inst )
{
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_TRANS(inst), FALSE );
+ g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail( inst != NULL, FALSE );
+ g_return_val_if_fail( GNC_IS_TRANS(inst), FALSE );
- return save_transaction( be, GNC_TRANS(inst), /* do_save_splits */FALSE );
+ return save_transaction( be, GNC_TRANS(inst), /* do_save_splits */FALSE );
}
/* ================================================================= */
@@ -723,7 +780,7 @@
QofQueryPredData* pPredData;
GSList* pParamPath;
- g_return_val_if_fail( pQuery != NULL, NULL );
+ g_return_val_if_fail( pQuery != NULL, NULL );
pOrTerms = qof_query_get_terms( pQuery );
pAndTerms = (GList*)pOrTerms->data;
@@ -733,10 +790,13 @@
pPredData = qof_query_term_get_pred_data( pTerm );
pParamPath = qof_query_term_get_param_path( pTerm );
- if( strcmp( pPredData->type_name, "guid" ) == 0 ) {
+ if ( strcmp( pPredData->type_name, "guid" ) == 0 )
+ {
query_guid_t pData = (query_guid_t)pPredData;
return pData->guids->data;
- } else {
+ }
+ else
+ {
return NULL;
}
}
@@ -749,25 +809,26 @@
*/
void gnc_sql_transaction_load_tx_for_account( GncSqlBackend* be, Account* account )
{
- const GncGUID* guid;
+ const GncGUID* guid;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
- gchar* query_sql;
+ gchar* query_sql;
GncSqlStatement* stmt;
- g_return_if_fail( be != NULL );
- g_return_if_fail( account != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( account != NULL );
- guid = qof_instance_get_guid( QOF_INSTANCE(account) );
+ guid = qof_instance_get_guid( QOF_INSTANCE(account) );
(void)guid_to_string_buff( guid, guid_buf );
- query_sql = g_strdup_printf(
- "SELECT DISTINCT t.* FROM %s AS t, %s AS s WHERE s.tx_guid=t.guid AND s.account_guid ='%s'",
- TRANSACTION_TABLE, SPLIT_TABLE, guid_buf );
- stmt = gnc_sql_create_statement_from_sql( be, query_sql );
- g_free( query_sql );
- if( stmt != NULL ) {
- query_transactions( be, stmt );
- gnc_sql_statement_dispose( stmt );
- }
+ query_sql = g_strdup_printf(
+ "SELECT DISTINCT t.* FROM %s AS t, %s AS s WHERE s.tx_guid=t.guid AND s.account_guid ='%s'",
+ TRANSACTION_TABLE, SPLIT_TABLE, guid_buf );
+ stmt = gnc_sql_create_statement_from_sql( be, query_sql );
+ g_free( query_sql );
+ if ( stmt != NULL )
+ {
+ query_transactions( be, stmt );
+ gnc_sql_statement_dispose( stmt );
+ }
}
/**
@@ -778,43 +839,57 @@
*/
void gnc_sql_transaction_load_all_tx( GncSqlBackend* be )
{
- gchar* query_sql;
+ gchar* query_sql;
GncSqlStatement* stmt;
- g_return_if_fail( be != NULL );
+ g_return_if_fail( be != NULL );
- query_sql = g_strdup_printf( "SELECT * FROM %s", TRANSACTION_TABLE );
- stmt = gnc_sql_create_statement_from_sql( be, query_sql );
- g_free( query_sql );
- if( stmt != NULL ) {
- query_transactions( be, stmt );
- gnc_sql_statement_dispose( stmt );
- }
+ query_sql = g_strdup_printf( "SELECT * FROM %s", TRANSACTION_TABLE );
+ stmt = gnc_sql_create_statement_from_sql( be, query_sql );
+ g_free( query_sql );
+ if ( stmt != NULL )
+ {
+ query_transactions( be, stmt );
+ gnc_sql_statement_dispose( stmt );
+ }
}
static void
convert_query_comparison_to_sql( QofQueryPredData* pPredData, gboolean isInverted, GString* sql )
{
- if( pPredData->how == QOF_COMPARE_LT
- || ( isInverted && pPredData->how == QOF_COMPARE_GTE ) ) {
+ if ( pPredData->how == QOF_COMPARE_LT
+ || ( isInverted && pPredData->how == QOF_COMPARE_GTE ) )
+ {
g_string_append( sql, "<" );
- } else if( pPredData->how == QOF_COMPARE_LTE
- || ( isInverted && pPredData->how == QOF_COMPARE_GT ) ) {
+ }
+ else if ( pPredData->how == QOF_COMPARE_LTE
+ || ( isInverted && pPredData->how == QOF_COMPARE_GT ) )
+ {
g_string_append( sql, "<=" );
- } else if( pPredData->how == QOF_COMPARE_EQUAL
- || ( isInverted && pPredData->how == QOF_COMPARE_NEQ ) ) {
+ }
+ else if ( pPredData->how == QOF_COMPARE_EQUAL
+ || ( isInverted && pPredData->how == QOF_COMPARE_NEQ ) )
+ {
g_string_append( sql, "=" );
- } else if( pPredData->how == QOF_COMPARE_GT
- || ( isInverted && pPredData->how == QOF_COMPARE_LTE ) ) {
+ }
+ else if ( pPredData->how == QOF_COMPARE_GT
+ || ( isInverted && pPredData->how == QOF_COMPARE_LTE ) )
+ {
g_string_append( sql, ">" );
- } else if( pPredData->how == QOF_COMPARE_GTE
- || ( isInverted && pPredData->how == QOF_COMPARE_LT ) ) {
+ }
+ else if ( pPredData->how == QOF_COMPARE_GTE
+ || ( isInverted && pPredData->how == QOF_COMPARE_LT ) )
+ {
g_string_append( sql, ">=" );
- } else if( pPredData->how == QOF_COMPARE_NEQ
- || ( isInverted && pPredData->how == QOF_COMPARE_EQUAL ) ) {
+ }
+ else if ( pPredData->how == QOF_COMPARE_NEQ
+ || ( isInverted && pPredData->how == QOF_COMPARE_EQUAL ) )
+ {
g_string_append( sql, "~=" );
- } else {
- PERR( "Unknown comparison type\n" );
+ }
+ else
+ {
+ PERR( "Unknown comparison type\n" );
g_string_append( sql, "??" );
}
}
@@ -827,86 +902,101 @@
gboolean isInverted;
GSList* name;
- g_return_if_fail( pTerm != NULL );
- g_return_if_fail( sql != NULL );
+ g_return_if_fail( pTerm != NULL );
+ g_return_if_fail( sql != NULL );
pParamPath = qof_query_term_get_param_path( pTerm );
pPredData = qof_query_term_get_pred_data( pTerm );
isInverted = qof_query_term_is_inverted( pTerm );
- if( safe_strcmp( pPredData->type_name, QOF_TYPE_GUID ) == 0 ) {
+ if ( safe_strcmp( pPredData->type_name, QOF_TYPE_GUID ) == 0 )
+ {
query_guid_t guid_data = (query_guid_t)pPredData;
- GList* guid_entry;
+ GList* guid_entry;
g_string_append( sql, "(" );
g_string_append( sql, fieldName );
- switch( guid_data->options ) {
- case QOF_GUID_MATCH_ANY:
- if( isInverted ) g_string_append( sql, " NOT IN (" );
- else g_string_append( sql, " IN (" );
- break;
+ switch ( guid_data->options )
+ {
+ case QOF_GUID_MATCH_ANY:
+ if ( isInverted ) g_string_append( sql, " NOT IN (" );
+ else g_string_append( sql, " IN (" );
+ break;
- case QOF_GUID_MATCH_NONE:
- if( isInverted ) g_string_append( sql, " IN (" );
- else g_string_append( sql, " NOT IN (" );
- break;
+ case QOF_GUID_MATCH_NONE:
+ if ( isInverted ) g_string_append( sql, " IN (" );
+ else g_string_append( sql, " NOT IN (" );
+ break;
- default:
- PERR( "Unexpected GncGUID match type: %d\n", guid_data->options );
- }
+ default:
+ PERR( "Unexpected GncGUID match type: %d\n", guid_data->options );
+ }
- for( guid_entry = guid_data->guids; guid_entry != NULL; guid_entry = guid_entry->next ) {
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ for ( guid_entry = guid_data->guids; guid_entry != NULL; guid_entry = guid_entry->next )
+ {
+ gchar guid_buf[GUID_ENCODING_LENGTH+1];
- if( guid_entry != guid_data->guids ) g_string_append( sql, "," );
- (void)guid_to_string_buff( guid_entry->data, guid_buf );
- g_string_append_printf( sql, "'%s'", guid_buf );
- }
- g_string_append( sql, "))" );
+ if ( guid_entry != guid_data->guids ) g_string_append( sql, "," );
+ (void)guid_to_string_buff( guid_entry->data, guid_buf );
+ g_string_append_printf( sql, "'%s'", guid_buf );
+ }
+ g_string_append( sql, "))" );
- } else if( safe_strcmp( pPredData->type_name, QOF_TYPE_CHAR ) == 0 ) {
- query_char_t char_data = (query_char_t)pPredData;
- int i;
-
- if( isInverted ) {
- g_string_append( sql, "NOT(" );
- }
- if( char_data->options == QOF_CHAR_MATCH_NONE ) {
- g_string_append( sql, "NOT " );
- }
- g_string_append( sql, "(" );
- for( i = 0; char_data->char_list[i] != '\0'; i++ ) {
- if( i != 0 ) {
- g_string_append( sql, " OR " );
- }
- g_string_append( sql, fieldName );
- g_string_append( sql, " = '" );
- g_string_append_c( sql, char_data->char_list[i] );
- g_string_append( sql, "'" );
- }
- g_string_append( sql, ") " );
- if( isInverted ) {
- g_string_append( sql, ") " );
- }
+ }
+ else if ( safe_strcmp( pPredData->type_name, QOF_TYPE_CHAR ) == 0 )
+ {
+ query_char_t char_data = (query_char_t)pPredData;
+ int i;
- } else if( safe_strcmp( pPredData->type_name, QOF_TYPE_STRING ) == 0 ) {
+ if ( isInverted )
+ {
+ g_string_append( sql, "NOT(" );
+ }
+ if ( char_data->options == QOF_CHAR_MATCH_NONE )
+ {
+ g_string_append( sql, "NOT " );
+ }
+ g_string_append( sql, "(" );
+ for ( i = 0; char_data->char_list[i] != '\0'; i++ )
+ {
+ if ( i != 0 )
+ {
+ g_string_append( sql, " OR " );
+ }
+ g_string_append( sql, fieldName );
+ g_string_append( sql, " = '" );
+ g_string_append_c( sql, char_data->char_list[i] );
+ g_string_append( sql, "'" );
+ }
+ g_string_append( sql, ") " );
+ if ( isInverted )
+ {
+ g_string_append( sql, ") " );
+ }
+
+ }
+ else if ( safe_strcmp( pPredData->type_name, QOF_TYPE_STRING ) == 0 )
+ {
query_string_t string_data = (query_string_t)pPredData;
- sqlEscape* escape = sqlEscape_new();
+ sqlEscape* escape = sqlEscape_new();
- if( isInverted ) {
- g_string_append( sql, "NOT(" );
- }
- if( pPredData->how == QOF_COMPARE_NEQ ) {
- g_string_append( sql, "NOT(" );
- }
- g_string_append( sql, fieldName );
- if( string_data->is_regex || string_data->options == QOF_STRING_MATCH_CASEINSENSITIVE ) {
- PWARN( "String is_regex || option = QOF_STRING_MATCH_INSENSITIVE\n" );
- }
+ if ( isInverted )
+ {
+ g_string_append( sql, "NOT(" );
+ }
+ if ( pPredData->how == QOF_COMPARE_NEQ )
+ {
+ g_string_append( sql, "NOT(" );
+ }
+ g_string_append( sql, fieldName );
+ if ( string_data->is_regex || string_data->options == QOF_STRING_MATCH_CASEINSENSITIVE )
+ {
+ PWARN( "String is_regex || option = QOF_STRING_MATCH_INSENSITIVE\n" );
+ }
// g_string_append( sql, " ~" );
// } else {
- g_string_append( sql, " =" );
+ g_string_append( sql, " =" );
// }
// if( string_data->options == QOF_STRING_MATCH_CASEINSENSITIVE ) {
// g_string_append( sql, "*" );
@@ -914,63 +1004,81 @@
g_string_append( sql, "'" );
g_string_append( sql, sqlEscapeString( escape, string_data->matchstring ) );
g_string_append( sql, "'" );
- if( pPredData->how == QOF_COMPARE_NEQ ) {
- g_string_append( sql, ")" );
- }
- if( isInverted ) {
- g_string_append( sql, ")" );
- }
- sqlEscape_destroy( escape );
+ if ( pPredData->how == QOF_COMPARE_NEQ )
+ {
+ g_string_append( sql, ")" );
+ }
+ if ( isInverted )
+ {
+ g_string_append( sql, ")" );
+ }
+ sqlEscape_destroy( escape );
- } else {
- g_string_append( sql, "(" );
- g_string_append( sql, fieldName );
- convert_query_comparison_to_sql( pPredData, isInverted, sql );
+ }
+ else
+ {
+ g_string_append( sql, "(" );
+ g_string_append( sql, fieldName );
+ convert_query_comparison_to_sql( pPredData, isInverted, sql );
- if( strcmp( pPredData->type_name, QOF_TYPE_NUMERIC ) == 0 ) {
- query_numeric_t pData = (query_numeric_t)pPredData;
- double d = gnc_numeric_to_double( pData->amount );
-
- g_string_append_printf( sql, "%f", d );
+ if ( strcmp( pPredData->type_name, QOF_TYPE_NUMERIC ) == 0 )
+ {
+ query_numeric_t pData = (query_numeric_t)pPredData;
+ double d = gnc_numeric_to_double( pData->amount );
- } else if( safe_strcmp( pPredData->type_name, QOF_TYPE_DATE ) == 0 ) {
- query_date_t date_data = (query_date_t)pPredData;
- gchar* datebuf;
+ g_string_append_printf( sql, "%f", d );
- datebuf = gnc_sql_convert_timespec_to_string( be, date_data->date );
- g_string_append_printf( sql, "'%s'", datebuf );
+ }
+ else if ( safe_strcmp( pPredData->type_name, QOF_TYPE_DATE ) == 0 )
+ {
+ query_date_t date_data = (query_date_t)pPredData;
+ gchar* datebuf;
- } else if( strcmp( pPredData->type_name, QOF_TYPE_INT32 ) == 0 ) {
- query_int32_t pData = (query_int32_t)pPredData;
+ datebuf = gnc_sql_convert_timespec_to_string( be, date_data->date );
+ g_string_append_printf( sql, "'%s'", datebuf );
- g_string_append_printf( sql, "%d", pData->val );
+ }
+ else if ( strcmp( pPredData->type_name, QOF_TYPE_INT32 ) == 0 )
+ {
+ query_int32_t pData = (query_int32_t)pPredData;
- } else if( strcmp( pPredData->type_name, QOF_TYPE_INT64 ) == 0 ) {
- query_int64_t pData = (query_int64_t)pPredData;
-
- g_string_append_printf( sql, "%" G_GINT64_FORMAT, pData->val );
+ g_string_append_printf( sql, "%d", pData->val );
- } else if( strcmp( pPredData->type_name, QOF_TYPE_DOUBLE ) == 0 ) {
- query_double_t pData = (query_double_t)pPredData;
+ }
+ else if ( strcmp( pPredData->type_name, QOF_TYPE_INT64 ) == 0 )
+ {
+ query_int64_t pData = (query_int64_t)pPredData;
- g_string_append_printf( sql, "%f", pData->val );
+ g_string_append_printf( sql, "%" G_GINT64_FORMAT, pData->val );
- } else if( strcmp( pPredData->type_name, QOF_TYPE_BOOLEAN ) == 0 ) {
- query_boolean_t pData = (query_boolean_t)pPredData;
+ }
+ else if ( strcmp( pPredData->type_name, QOF_TYPE_DOUBLE ) == 0 )
+ {
+ query_double_t pData = (query_double_t)pPredData;
- g_string_append_printf( sql, "%d", pData->val );
+ g_string_append_printf( sql, "%f", pData->val );
- } else {
- PERR( "Unknown query predicate type: %s\n", pPredData->type_name );
- }
+ }
+ else if ( strcmp( pPredData->type_name, QOF_TYPE_BOOLEAN ) == 0 )
+ {
+ query_boolean_t pData = (query_boolean_t)pPredData;
- g_string_append( sql, ")" );
- }
+ g_string_append_printf( sql, "%d", pData->val );
+
+ }
+ else
+ {
+ PERR( "Unknown query predicate type: %s\n", pPredData->type_name );
+ }
+
+ g_string_append( sql, ")" );
+ }
}
-typedef struct {
+typedef struct
+{
GncSqlStatement* stmt;
- gboolean has_been_run;
+ gboolean has_been_run;
} split_query_info_t;
static /*@ null @*/ gpointer
@@ -978,161 +1086,193 @@
{
const GncGUID* acct_guid;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
- split_query_info_t* query_info = NULL;
- gchar* query_sql;
+ split_query_info_t* query_info = NULL;
+ gchar* query_sql;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( query != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( query != NULL, NULL );
- query_info = g_malloc( (gsize)sizeof(split_query_info_t) );
- g_assert( query_info != NULL );
- query_info->has_been_run = FALSE;
+ query_info = g_malloc( (gsize)sizeof(split_query_info_t) );
+ g_assert( query_info != NULL );
+ query_info->has_been_run = FALSE;
- if( qof_query_has_terms( query ) ) {
+ if ( qof_query_has_terms( query ) )
+ {
GList* orterms = qof_query_get_terms( query );
GList* orTerm;
- GString* sql = g_string_new( "" );
- gboolean need_OR = FALSE;
+ GString* sql = g_string_new( "" );
+ gboolean need_OR = FALSE;
- for( orTerm = orterms; orTerm != NULL; orTerm = orTerm->next ) {
+ for ( orTerm = orterms; orTerm != NULL; orTerm = orTerm->next )
+ {
GList* andterms = (GList*)orTerm->data;
GList* andTerm;
- gboolean need_AND = FALSE;
- gboolean has_tx_guid_check = FALSE;
+ gboolean need_AND = FALSE;
+ gboolean has_tx_guid_check = FALSE;
- if( need_OR ) {
- g_string_append( sql, " OR " );
- }
+ if ( need_OR )
+ {
+ g_string_append( sql, " OR " );
+ }
g_string_append( sql, "(" );
- for( andTerm = andterms; andTerm != NULL; andTerm = andTerm->next ) {
- QofQueryTerm* term;
- GSList* paramPath;
- gboolean unknownPath = FALSE;
+ for ( andTerm = andterms; andTerm != NULL; andTerm = andTerm->next )
+ {
+ QofQueryTerm* term;
+ GSList* paramPath;
+ gboolean unknownPath = FALSE;
term = (QofQueryTerm*)andTerm->data;
- paramPath = qof_query_term_get_param_path( term );
+ paramPath = qof_query_term_get_param_path( term );
- if( strcmp( paramPath->data, QOF_PARAM_BOOK ) == 0 ) continue;
+ if ( strcmp( paramPath->data, QOF_PARAM_BOOK ) == 0 ) continue;
#if SIMPLE_QUERY_COMPILATION
- if( strcmp( paramPath->data, SPLIT_ACCOUNT ) != 0
- || strcmp( paramPath->next->data, QOF_PARAM_GUID ) != 0 ) continue;
+ if ( strcmp( paramPath->data, SPLIT_ACCOUNT ) != 0
+ || strcmp( paramPath->next->data, QOF_PARAM_GUID ) != 0 ) continue;
#endif
- if( need_AND ) g_string_append( sql, " AND " );
+ if ( need_AND ) g_string_append( sql, " AND " );
- if( strcmp( paramPath->data, SPLIT_ACCOUNT ) == 0
- && strcmp( paramPath->next->data, QOF_PARAM_GUID ) == 0 ) {
- convert_query_term_to_sql( be, "s.account_guid", term, sql );
+ if ( strcmp( paramPath->data, SPLIT_ACCOUNT ) == 0
+ && strcmp( paramPath->next->data, QOF_PARAM_GUID ) == 0 )
+ {
+ convert_query_term_to_sql( be, "s.account_guid", term, sql );
#if SIMPLE_QUERY_COMPILATION
- goto done_compiling_query;
+ goto done_compiling_query;
#endif
- } else if( strcmp( paramPath->data, SPLIT_RECONCILE ) == 0 ) {
- convert_query_term_to_sql( be, "s.reconcile_state", term, sql );
+ }
+ else if ( strcmp( paramPath->data, SPLIT_RECONCILE ) == 0 )
+ {
+ convert_query_term_to_sql( be, "s.reconcile_state", term, sql );
- } else if( strcmp( paramPath->data, SPLIT_TRANS ) == 0 ) {
+ }
+ else if ( strcmp( paramPath->data, SPLIT_TRANS ) == 0 )
+ {
#if 0
- if( !has_tx_guid_check ) {
- g_string_append( sql, "(splits.tx_guid = transactions.guid) AND " );
- has_tx_guid_check = TRUE;
- }
+ if ( !has_tx_guid_check )
+ {
+ g_string_append( sql, "(splits.tx_guid = transactions.guid) AND " );
+ has_tx_guid_check = TRUE;
+ }
#endif
- if( strcmp( paramPath->next->data, TRANS_DATE_POSTED ) == 0 ) {
- convert_query_term_to_sql( be, "t.post_date", term, sql );
- } else if( strcmp( paramPath->next->data, TRANS_DESCRIPTION ) == 0 ) {
- convert_query_term_to_sql( be, "t.description", term, sql );
- } else {
- unknownPath = TRUE;
- }
+ if ( strcmp( paramPath->next->data, TRANS_DATE_POSTED ) == 0 )
+ {
+ convert_query_term_to_sql( be, "t.post_date", term, sql );
+ }
+ else if ( strcmp( paramPath->next->data, TRANS_DESCRIPTION ) == 0 )
+ {
+ convert_query_term_to_sql( be, "t.description", term, sql );
+ }
+ else
+ {
+ unknownPath = TRUE;
+ }
- } else if( strcmp( paramPath->data, SPLIT_VALUE ) == 0 ) {
- convert_query_term_to_sql( be, "s.value_num/s.value_denom", term, sql );
+ }
+ else if ( strcmp( paramPath->data, SPLIT_VALUE ) == 0 )
+ {
+ convert_query_term_to_sql( be, "s.value_num/s.value_denom", term, sql );
- } else {
- unknownPath = TRUE;
- }
+ }
+ else
+ {
+ unknownPath = TRUE;
+ }
- if( unknownPath ) {
- GString* name = g_string_new( (gchar*)paramPath->data );
- while( paramPath->next != NULL ) {
- g_string_append( name, "." );
- g_string_append( name, paramPath->next->data );
- paramPath = paramPath->next;
- }
- PERR( "Unknown SPLIT query field: %s\n", name->str );
- g_string_free( name, TRUE );
- }
- need_AND = TRUE;
+ if ( unknownPath )
+ {
+ GString* name = g_string_new( (gchar*)paramPath->data );
+ while ( paramPath->next != NULL )
+ {
+ g_string_append( name, "." );
+ g_string_append( name, paramPath->next->data );
+ paramPath = paramPath->next;
+ }
+ PERR( "Unknown SPLIT query field: %s\n", name->str );
+ g_string_free( name, TRUE );
+ }
+ need_AND = TRUE;
}
- /* If the last char in the string is a '(', then for some reason, there were
- no terms added to the SQL. If so, remove it and ignore the OR term. */
- if( sql->str[sql->len-1] == '(' ) {
- g_string_truncate( sql, sql->len-1 );
- need_OR = FALSE;
- } else {
- g_string_append( sql, ")" );
- need_OR = TRUE;
- }
+ /* If the last char in the string is a '(', then for some reason, there were
+ no terms added to the SQL. If so, remove it and ignore the OR term. */
+ if ( sql->str[sql->len-1] == '(' )
+ {
+ g_string_truncate( sql, sql->len - 1 );
+ need_OR = FALSE;
+ }
+ else
+ {
+ g_string_append( sql, ")" );
+ need_OR = TRUE;
+ }
}
#if SIMPLE_QUERY_COMPILATION
done_compiling_query:
#endif
- if( sql->len != 0 ) {
+ if ( sql->len != 0 )
+ {
#if SIMPLE_QUERY_COMPILATION
- g_string_append( sql, ")" );
+ g_string_append( sql, ")" );
#endif
- query_sql = g_strdup_printf(
- "SELECT DISTINCT t.* FROM %s AS t, %s AS s WHERE s.tx_guid=t.guid AND %s",
- TRANSACTION_TABLE, SPLIT_TABLE, sql->str );
- } else {
- query_sql = g_strdup_printf( "SELECT * FROM %s", TRANSACTION_TABLE );
- }
- query_info->stmt = gnc_sql_create_statement_from_sql( be, query_sql );
+ query_sql = g_strdup_printf(
+ "SELECT DISTINCT t.* FROM %s AS t, %s AS s WHERE s.tx_guid=t.guid AND %s",
+ TRANSACTION_TABLE, SPLIT_TABLE, sql->str );
+ }
+ else
+ {
+ query_sql = g_strdup_printf( "SELECT * FROM %s", TRANSACTION_TABLE );
+ }
+ query_info->stmt = gnc_sql_create_statement_from_sql( be, query_sql );
- g_string_free( sql, TRUE );
- g_free( query_sql );
+ g_string_free( sql, TRUE );
+ g_free( query_sql );
- } else {
- query_sql = g_strdup_printf( "SELECT * FROM %s", TRANSACTION_TABLE );
- query_info->stmt = gnc_sql_create_statement_from_sql( be, query_sql );
- g_free( query_sql );
- }
+ }
+ else
+ {
+ query_sql = g_strdup_printf( "SELECT * FROM %s", TRANSACTION_TABLE );
+ query_info->stmt = gnc_sql_create_statement_from_sql( be, query_sql );
+ g_free( query_sql );
+ }
- return query_info;
+ return query_info;
}
static void
run_split_query( GncSqlBackend* be, gpointer pQuery )
{
- split_query_info_t* query_info = (split_query_info_t*)pQuery;
+ split_query_info_t* query_info = (split_query_info_t*)pQuery;
- g_return_if_fail( be != NULL );
- g_return_if_fail( pQuery != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( pQuery != NULL );
- if( !query_info->has_been_run ) {
- query_transactions( be, query_info->stmt );
- query_info->has_been_run = TRUE;
- gnc_sql_statement_dispose( query_info->stmt );
- query_info->stmt = NULL;
- }
+ if ( !query_info->has_been_run )
+ {
+ query_transactions( be, query_info->stmt );
+ query_info->has_been_run = TRUE;
+ gnc_sql_statement_dispose( query_info->stmt );
+ query_info->stmt = NULL;
+ }
}
static void
free_split_query( GncSqlBackend* be, gpointer pQuery )
{
- g_return_if_fail( be != NULL );
- g_return_if_fail( pQuery != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( pQuery != NULL );
- g_free( pQuery );
+ g_free( pQuery );
}
/* ----------------------------------------------------------------- */
-typedef struct {
+typedef struct
+{
/*@ dependent @*/ const GncSqlBackend* be;
- /*@ dependent @*/ Account* acct;
+ /*@ dependent @*/
+ Account* acct;
char reconcile_state;
gnc_numeric balance;
} single_acct_balance_t;
@@ -1141,61 +1281,61 @@
set_acct_bal_account_from_guid( gpointer pObject, gpointer pValue )
{
single_acct_balance_t* bal = (single_acct_balance_t*)pObject;
- const GncGUID* guid = (const GncGUID*)pValue;
+ const GncGUID* guid = (const GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pValue != NULL );
bal->acct = xaccAccountLookup( guid, bal->be->primary_book );
}
-static void
+static void
set_acct_bal_reconcile_state( gpointer pObject, gpointer pValue )
{
single_acct_balance_t* bal = (single_acct_balance_t*)pObject;
const gchar* s = (const gchar*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pValue != NULL );
bal->reconcile_state = s[0];
}
-static void
+static void
set_acct_bal_balance( gpointer pObject, gnc_numeric value )
{
single_acct_balance_t* bal = (single_acct_balance_t*)pObject;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pObject != NULL );
bal->balance = value;
}
static const GncSqlColumnTableEntry acct_balances_col_table[] =
{
- /*@ -full_init_block @*/
+ /*@ -full_init_block @*/
{ "account_guid", CT_GUID, 0, 0, NULL, NULL, NULL, (QofSetterFunc)set_acct_bal_account_from_guid },
{ "reconcile_state", CT_STRING, 1, 0, NULL, NULL, NULL, (QofSetterFunc)set_acct_bal_reconcile_state },
{ "quantity", CT_NUMERIC, 0, 0, NULL, NULL, NULL, (QofSetterFunc)set_acct_bal_balance },
{ NULL }
- /*@ +full_init_block @*/
+ /*@ +full_init_block @*/
};
static /*@ null @*/ single_acct_balance_t*
load_single_acct_balances( const GncSqlBackend* be, GncSqlRow* row )
{
- single_acct_balance_t* bal = NULL;
+ single_acct_balance_t* bal = NULL;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( row != NULL, NULL );
- bal = g_malloc( (gsize)sizeof(single_acct_balance_t) );
- g_assert( bal != NULL );
+ bal = g_malloc( (gsize)sizeof(single_acct_balance_t) );
+ g_assert( bal != NULL );
- bal->be = be;
+ bal->be = be;
gnc_sql_load_object( be, row, NULL, bal, acct_balances_col_table );
- return bal;
+ return bal;
}
/*@ null @*/ GSList*
@@ -1204,70 +1344,81 @@
#if LOAD_TRANSACTIONS_AS_NEEDED
GncSqlResult* result;
GncSqlStatement* stmt;
- gchar* buf;
- GSList* bal_slist = NULL;
+ gchar* buf;
+ GSList* bal_slist = NULL;
- g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail( be != NULL, NULL );
- buf = g_strdup_printf( "SELECT account_guid, reconcile_state, sum(quantity_num) as quantity_num, quantity_denom FROM %s GROUP BY account_guid, reconcile_state, quantity_denom ORDER BY account_guid, reconcile_state",
- SPLIT_TABLE );
- stmt = gnc_sql_create_statement_from_sql( be, buf );
- g_assert( stmt != NULL );
- g_free( buf );
+ buf = g_strdup_printf( "SELECT account_guid, reconcile_state, sum(quantity_num) as quantity_num, quantity_denom FROM %s GROUP BY account_guid, reconcile_state, quantity_denom ORDER BY account_guid, reconcile_state",
+ SPLIT_TABLE );
+ stmt = gnc_sql_create_statement_from_sql( be, buf );
+ g_assert( stmt != NULL );
+ g_free( buf );
result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if( result != NULL ) {
- GncSqlRow* row;
- acct_balances_t* bal = NULL;
+ gnc_sql_statement_dispose( stmt );
+ if ( result != NULL )
+ {
+ GncSqlRow* row;
+ acct_balances_t* bal = NULL;
- row = gnc_sql_result_get_first_row( result );
- while( row != NULL ) {
- single_acct_balance_t* single_bal;
+ row = gnc_sql_result_get_first_row( result );
+ while ( row != NULL )
+ {
+ single_acct_balance_t* single_bal;
- // Get the next reconcile state balance and merge with other balances
+ // Get the next reconcile state balance and merge with other balances
single_bal = load_single_acct_balances( be, row );
- if( single_bal != NULL ) {
- if( bal != NULL && bal->acct != single_bal->acct ) {
- bal->cleared_balance = gnc_numeric_add( bal->cleared_balance, bal->reconciled_balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- bal->balance = gnc_numeric_add( bal->balance, bal->cleared_balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- bal_slist = g_slist_append( bal_slist, bal );
- bal = NULL;
- }
- if( bal == NULL ) {
- bal = g_malloc( (gsize)sizeof(acct_balances_t) );
- g_assert( bal != NULL );
+ if ( single_bal != NULL )
+ {
+ if ( bal != NULL && bal->acct != single_bal->acct )
+ {
+ bal->cleared_balance = gnc_numeric_add( bal->cleared_balance, bal->reconciled_balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ bal->balance = gnc_numeric_add( bal->balance, bal->cleared_balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ bal_slist = g_slist_append( bal_slist, bal );
+ bal = NULL;
+ }
+ if ( bal == NULL )
+ {
+ bal = g_malloc( (gsize)sizeof(acct_balances_t) );
+ g_assert( bal != NULL );
- bal->acct = single_bal->acct;
- bal->balance = gnc_numeric_zero();
- bal->cleared_balance = gnc_numeric_zero();
- bal->reconciled_balance = gnc_numeric_zero();
- }
- if( single_bal->reconcile_state == 'n' ) {
- bal->balance = gnc_numeric_add( bal->balance, single_bal->balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- } else if( single_bal->reconcile_state == 'c' ) {
- bal->cleared_balance = gnc_numeric_add( bal->cleared_balance, single_bal->balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- } else if( single_bal->reconcile_state == 'y' ) {
- bal->reconciled_balance = gnc_numeric_add( bal->reconciled_balance, single_bal->balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- }
- g_free( single_bal );
- }
- row = gnc_sql_result_get_next_row( result );
+ bal->acct = single_bal->acct;
+ bal->balance = gnc_numeric_zero();
+ bal->cleared_balance = gnc_numeric_zero();
+ bal->reconciled_balance = gnc_numeric_zero();
+ }
+ if ( single_bal->reconcile_state == 'n' )
+ {
+ bal->balance = gnc_numeric_add( bal->balance, single_bal->balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ }
+ else if ( single_bal->reconcile_state == 'c' )
+ {
+ bal->cleared_balance = gnc_numeric_add( bal->cleared_balance, single_bal->balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ }
+ else if ( single_bal->reconcile_state == 'y' )
+ {
+ bal->reconciled_balance = gnc_numeric_add( bal->reconciled_balance, single_bal->balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ }
+ g_free( single_bal );
+ }
+ row = gnc_sql_result_get_next_row( result );
}
- // Add the final balance
- if( bal != NULL ) {
- bal->cleared_balance = gnc_numeric_add( bal->cleared_balance, bal->reconciled_balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- bal->balance = gnc_numeric_add( bal->balance, bal->cleared_balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- bal_slist = g_slist_append( bal_slist, bal );
- }
- gnc_sql_result_dispose( result );
+ // Add the final balance
+ if ( bal != NULL )
+ {
+ bal->cleared_balance = gnc_numeric_add( bal->cleared_balance, bal->reconciled_balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ bal->balance = gnc_numeric_add( bal->balance, bal->cleared_balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ bal_slist = g_slist_append( bal_slist, bal );
+ }
+ gnc_sql_result_dispose( result );
}
return bal_slist;
@@ -1279,55 +1430,62 @@
/* ----------------------------------------------------------------- */
static void
load_tx_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GncGUID guid;
- Transaction* tx;
- const gchar* guid_str;
+ Transaction* tx;
+ const gchar* guid_str;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail( be != NULL );
+ g_return_if_fail( row != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( table_row != NULL );
val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- g_assert( val != NULL );
- guid_str = g_value_get_string(val);
- if( guid_str != NULL ) {
- (void)string_to_guid( guid_str, &guid );
- tx = xaccTransLookup( &guid, be->primary_book );
+ g_assert( val != NULL );
+ guid_str = g_value_get_string(val);
+ if ( guid_str != NULL )
+ {
+ (void)string_to_guid( guid_str, &guid );
+ tx = xaccTransLookup( &guid, be->primary_book );
- // If the transaction is not found, try loading it
- if( tx == NULL ) {
- gchar* buf;
- GncSqlStatement* stmt;
+ // If the transaction is not found, try loading it
+ if ( tx == NULL )
+ {
+ gchar* buf;
+ GncSqlStatement* stmt;
- buf = g_strdup_printf( "SELECT * FROM %s WHERE guid='%s'",
+ buf = g_strdup_printf( "SELECT * FROM %s WHERE guid='%s'",
TRANSACTION_TABLE, guid_str );
- stmt = gnc_sql_create_statement_from_sql( (GncSqlBackend*)be, buf );
- g_free( buf );
- query_transactions( (GncSqlBackend*)be, stmt );
- tx = xaccTransLookup( &guid, be->primary_book );
- }
+ stmt = gnc_sql_create_statement_from_sql( (GncSqlBackend*)be, buf );
+ g_free( buf );
+ query_transactions( (GncSqlBackend*)be, stmt );
+ tx = xaccTransLookup( &guid, be->primary_book );
+ }
- if( tx != NULL ) {
- if( table_row->gobj_param_name != NULL ) {
- g_object_set( pObject, table_row->gobj_param_name, tx, NULL );
- } else {
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)tx );
- }
- }
+ if ( tx != NULL )
+ {
+ if ( table_row->gobj_param_name != NULL )
+ {
+ g_object_set( pObject, table_row->gobj_param_name, tx, NULL );
+ }
+ else
+ {
+ g_return_if_fail( setter != NULL );
+ (*setter)( pObject, (const gpointer)tx );
+ }
+ }
}
}
static GncSqlColumnTypeHandler tx_guid_handler
- = { load_tx_guid,
- gnc_sql_add_objectref_guid_col_info_to_list,
- gnc_sql_add_colname_to_list,
- gnc_sql_add_gvalue_objectref_guid_to_slist };
+= { load_tx_guid,
+ gnc_sql_add_objectref_guid_col_info_to_list,
+ gnc_sql_add_colname_to_list,
+ gnc_sql_add_gvalue_objectref_guid_to_slist
+ };
/* ================================================================= */
void
gnc_sql_init_transaction_handler( void )
@@ -1343,10 +1501,10 @@
gnc_sql_transaction_load_all_tx,
#endif
create_transaction_tables, /* create tables */
- NULL, /* compile_query */
- NULL, /* run_query */
- NULL, /* free_query */
- NULL /* write */
+ NULL, /* compile_query */
+ NULL, /* run_query */
+ NULL, /* free_query */
+ NULL /* write */
};
static GncSqlObjectBackend be_data_split =
{
@@ -1360,17 +1518,17 @@
run_split_query,
free_split_query,
#else
- NULL, /* compile_query */
- NULL, /* run_query */
- NULL, /* free_query */
+ NULL, /* compile_query */
+ NULL, /* run_query */
+ NULL, /* free_query */
#endif
- NULL /* write */
+ NULL /* write */
};
(void)qof_object_register_backend( GNC_ID_TRANS, GNC_SQL_BACKEND, &be_data_tx );
(void)qof_object_register_backend( GNC_ID_SPLIT, GNC_SQL_BACKEND, &be_data_split );
- gnc_sql_register_col_type_handler( CT_TXREF, &tx_guid_handler );
+ gnc_sql_register_col_type_handler( CT_TXREF, &tx_guid_handler );
}
/* ========================== END OF FILE ===================== */
Modified: gnucash/trunk/src/business/business-core/sql/gnc-bill-term-sql.c
===================================================================
--- gnucash/trunk/src/business/business-core/sql/gnc-bill-term-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/business/business-core/sql/gnc-bill-term-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -95,9 +95,10 @@
{ NULL }
};
-typedef struct {
- /*@ dependent @*/ GncBillTerm* billterm;
- GncGUID guid;
+typedef struct
+{
+ /*@ dependent @*/ GncBillTerm* billterm;
+ GncGUID guid;
gboolean have_guid;
} billterm_parent_guid_struct;
@@ -121,14 +122,17 @@
const GncBillTerm* pParent;
const GncGUID* parent_guid;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_BILLTERM(pObject), NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( GNC_IS_BILLTERM(pObject), NULL );
billterm = GNC_BILLTERM(pObject);
pParent = gncBillTermGetParent( billterm );
- if( pParent == NULL ) {
+ if ( pParent == NULL )
+ {
parent_guid = NULL;
- } else {
+ }
+ else
+ {
parent_guid = qof_instance_get_guid( QOF_INSTANCE(pParent) );
}
@@ -151,7 +155,8 @@
if ( guid != NULL )
{
parent = gncBillTermLookup( pBook, guid );
- if( parent != NULL ) {
+ if ( parent != NULL )
+ {
gncBillTermSetParent( billterm, parent );
gncBillTermSetChild( parent, billterm );
}
@@ -161,19 +166,19 @@
static void
bt_set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
{
- billterm_parent_guid_struct* s = (billterm_parent_guid_struct*)pObject;
+ billterm_parent_guid_struct* s = (billterm_parent_guid_struct*)pObject;
GncGUID* guid = (GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pValue != NULL );
- s->guid = *guid;
+ s->guid = *guid;
s->have_guid = TRUE;
}
static GncBillTerm*
load_single_billterm( GncSqlBackend* be, GncSqlRow* row,
- GList** l_billterms_needing_parents )
+ GList** l_billterms_needing_parents )
{
const GncGUID* guid;
GncBillTerm* pBillTerm;
@@ -194,15 +199,15 @@
GncGUID so that after they are all loaded, the parents can be fixed up. */
if ( gncBillTermGetParent( pBillTerm ) == NULL )
{
- billterm_parent_guid_struct* s = g_malloc( (gsize)sizeof(billterm_parent_guid_struct) );
- g_assert( s != NULL );
+ billterm_parent_guid_struct* s = g_malloc( (gsize)sizeof(billterm_parent_guid_struct) );
+ g_assert( s != NULL );
- s->billterm = pBillTerm;
+ s->billterm = pBillTerm;
s->have_guid = FALSE;
- gnc_sql_load_object( be, row, GNC_ID_TAXTABLE, s, billterm_parent_col_table );
+ gnc_sql_load_object( be, row, GNC_ID_TAXTABLE, s, billterm_parent_col_table );
if ( s->have_guid )
{
- *l_billterms_needing_parents = g_list_prepend( *l_billterms_needing_parents, s );
+ *l_billterms_needing_parents = g_list_prepend( *l_billterms_needing_parents, s );
}
else
{
@@ -252,26 +257,29 @@
gnc_sql_slots_load_for_list( be, list );
}
- /* While there are items on the list of billterms needing parents,
- try to see if the parent has now been loaded. Theory says that if
- items are removed from the front and added to the back if the
- parent is still not available, then eventually, the list will
- shrink to size 0. */
- if( l_billterms_needing_parents != NULL ) {
- gboolean progress_made = TRUE;
- GncTaxTable* root;
- Account* pParent;
- GList* elem;
-
- while( progress_made ) {
- progress_made = FALSE;
- for( elem = l_billterms_needing_parents; elem != NULL; elem = g_list_next( elem ) ) {
- billterm_parent_guid_struct* s = (billterm_parent_guid_struct*)elem->data;
+ /* While there are items on the list of billterms needing parents,
+ try to see if the parent has now been loaded. Theory says that if
+ items are removed from the front and added to the back if the
+ parent is still not available, then eventually, the list will
+ shrink to size 0. */
+ if ( l_billterms_needing_parents != NULL )
+ {
+ gboolean progress_made = TRUE;
+ GncTaxTable* root;
+ Account* pParent;
+ GList* elem;
+
+ while ( progress_made )
+ {
+ progress_made = FALSE;
+ for ( elem = l_billterms_needing_parents; elem != NULL; elem = g_list_next( elem ) )
+ {
+ billterm_parent_guid_struct* s = (billterm_parent_guid_struct*)elem->data;
bt_set_parent( s->billterm, &s->guid );
- l_billterms_needing_parents = g_list_delete_link( l_billterms_needing_parents, elem );
- progress_made = TRUE;
- }
- }
+ l_billterms_needing_parents = g_list_delete_link( l_billterms_needing_parents, elem );
+ progress_made = TRUE;
+ }
+ }
}
}
}
Modified: gnucash/trunk/src/business/business-core/sql/gnc-tax-table-sql.c
===================================================================
--- gnucash/trunk/src/business/business-core/sql/gnc-tax-table-sql.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/business/business-core/sql/gnc-tax-table-sql.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -121,9 +121,10 @@
{ NULL }
};
-typedef struct {
- /*@ dependent @*/ GncTaxTable* tt;
- GncGUID guid;
+typedef struct
+{
+ /*@ dependent @*/ GncTaxTable* tt;
+ GncGUID guid;
gboolean have_guid;
} taxtable_parent_guid_struct;
@@ -175,14 +176,17 @@
const GncTaxTable* pParent;
const GncGUID* parent_guid;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_TAXTABLE(pObject), NULL );
+ g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail( GNC_IS_TAXTABLE(pObject), NULL );
tt = GNC_TAXTABLE(pObject);
pParent = gncTaxTableGetParent( tt );
- if( pParent == NULL ) {
+ if ( pParent == NULL )
+ {
parent_guid = NULL;
- } else {
+ }
+ else
+ {
parent_guid = qof_instance_get_guid( QOF_INSTANCE(pParent) );
}
@@ -205,7 +209,8 @@
if ( guid != NULL )
{
parent = gncTaxTableLookup( pBook, guid );
- if( parent != NULL ) {
+ if ( parent != NULL )
+ {
gncTaxTableSetParent( tt, parent );
gncTaxTableSetChild( parent, tt );
}
@@ -215,13 +220,13 @@
static void
tt_set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
{
- taxtable_parent_guid_struct* s = (taxtable_parent_guid_struct*)pObject;
+ taxtable_parent_guid_struct* s = (taxtable_parent_guid_struct*)pObject;
GncGUID* guid = (GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail( pObject != NULL );
+ g_return_if_fail( pValue != NULL );
- s->guid = *guid;
+ s->guid = *guid;
s->have_guid = TRUE;
}
@@ -276,7 +281,7 @@
static void
load_single_taxtable( GncSqlBackend* be, GncSqlRow* row,
- GList** l_tt_needing_parents )
+ GList** l_tt_needing_parents )
{
const GncGUID* guid;
GncTaxTable* tt;
@@ -297,16 +302,20 @@
/* If the tax table doesn't have a parent, it might be because it hasn't been loaded yet.
If so, add this tax table to the list of tax tables with no parent, along with the parent
GncGUID so that after they are all loaded, the parents can be fixed up. */
- if( gncTaxTableGetParent( tt ) == NULL ) {
- taxtable_parent_guid_struct* s = g_malloc( (gsize)sizeof(taxtable_parent_guid_struct) );
- g_assert( s != NULL );
+ if ( gncTaxTableGetParent( tt ) == NULL )
+ {
+ taxtable_parent_guid_struct* s = g_malloc( (gsize)sizeof(taxtable_parent_guid_struct) );
+ g_assert( s != NULL );
- s->tt = tt;
+ s->tt = tt;
s->have_guid = FALSE;
- gnc_sql_load_object( be, row, GNC_ID_TAXTABLE, s, tt_parent_col_table );
- if( s->have_guid ) {
- *l_tt_needing_parents = g_list_prepend( *l_tt_needing_parents, s );
- } else {
+ gnc_sql_load_object( be, row, GNC_ID_TAXTABLE, s, tt_parent_col_table );
+ if ( s->have_guid )
+ {
+ *l_tt_needing_parents = g_list_prepend( *l_tt_needing_parents, s );
+ }
+ else
+ {
g_free( s );
}
}
@@ -339,26 +348,29 @@
}
gnc_sql_result_dispose( result );
- /* While there are items on the list of taxtables needing parents,
- try to see if the parent has now been loaded. Theory says that if
- items are removed from the front and added to the back if the
- parent is still not available, then eventually, the list will
- shrink to size 0. */
- if( tt_needing_parents != NULL ) {
- gboolean progress_made = TRUE;
- GncTaxTable* root;
- Account* pParent;
- GList* elem;
-
- while( progress_made ) {
- progress_made = FALSE;
- for( elem = tt_needing_parents; elem != NULL; elem = g_list_next( elem ) ) {
- taxtable_parent_guid_struct* s = (taxtable_parent_guid_struct*)elem->data;
+ /* While there are items on the list of taxtables needing parents,
+ try to see if the parent has now been loaded. Theory says that if
+ items are removed from the front and added to the back if the
+ parent is still not available, then eventually, the list will
+ shrink to size 0. */
+ if ( tt_needing_parents != NULL )
+ {
+ gboolean progress_made = TRUE;
+ GncTaxTable* root;
+ Account* pParent;
+ GList* elem;
+
+ while ( progress_made )
+ {
+ progress_made = FALSE;
+ for ( elem = tt_needing_parents; elem != NULL; elem = g_list_next( elem ) )
+ {
+ taxtable_parent_guid_struct* s = (taxtable_parent_guid_struct*)elem->data;
tt_set_parent( s->tt, &s->guid );
- tt_needing_parents = g_list_delete_link( tt_needing_parents, elem );
- progress_made = TRUE;
- }
- }
+ tt_needing_parents = g_list_delete_link( tt_needing_parents, elem );
+ progress_made = TRUE;
+ }
+ }
}
}
}
Modified: gnucash/trunk/src/business/business-core/sql/test/test-dbi-business.c
===================================================================
--- gnucash/trunk/src/business/business-core/sql/test/test-dbi-business.c 2010-03-27 21:01:56 UTC (rev 18970)
+++ gnucash/trunk/src/business/business-core/sql/test/test-dbi-business.c 2010-03-27 21:02:18 UTC (rev 18971)
@@ -66,7 +66,7 @@
gnc_commodity* currency;
GncAddress* addr;
GncCustomer* cust;
-
+
table = gnc_commodity_table_get_table( book );
currency = gnc_commodity_table_lookup( table, GNC_COMMODITY_NS_CURRENCY, "CAD" );
@@ -106,20 +106,20 @@
static void
init_business_sql(void)
{
- /* Initialize our pointers into the backend subsystem */
- gnc_address_sql_initialize();
- gnc_billterm_sql_initialize();
- gnc_customer_sql_initialize();
- gnc_employee_sql_initialize();
- gnc_entry_sql_initialize();
- gnc_invoice_sql_initialize();
- gnc_job_sql_initialize();
- gnc_order_sql_initialize();
- gnc_owner_sql_initialize();
- gnc_taxtable_sql_initialize();
- gnc_vendor_sql_initialize();
+ /* Initialize our pointers into the backend subsystem */
+ gnc_address_sql_initialize();
+ gnc_billterm_sql_initialize();
+ gnc_customer_sql_initialize();
+ gnc_employee_sql_initialize();
+ gnc_entry_sql_initialize();
+ gnc_invoice_sql_initialize();
+ gnc_job_sql_initialize();
+ gnc_order_sql_initialize();
+ gnc_owner_sql_initialize();
+ gnc_taxtable_sql_initialize();
+ gnc_vendor_sql_initialize();
- gnc_sql_set_load_order( fixed_load_order );
+ gnc_sql_set_load_order( fixed_load_order );
}
int main (int argc, char ** argv)
@@ -138,7 +138,7 @@
filename = tempnam( "/tmp", "test-sqlite3-" );
printf( "Using filename: %s\n", filename );
test_dbi_business_store_and_reload( "sqlite3", session_1, filename );
- #if 0
+#if 0
printf( "TEST_MYSQL_URL='%s'\n", TEST_MYSQL_URL );
if ( strlen( TEST_MYSQL_URL ) > 0 )
{
@@ -151,7 +151,7 @@
session_1 = create_session();
test_dbi_store_and_reload( "pgsql", session_1, TEST_PGSQL_URL );
}
- #endif
+#endif
print_test_results();
qof_close();
exit(get_rv());
More information about the gnucash-changes
mailing list