From 97e4cf9eff67480159fdfcf04ea44e5bc5d276ae Mon Sep 17 00:00:00 2001 From: Phil Longstaff Date: Sun, 27 Jul 2008 13:01:58 +0000 Subject: [PATCH] Don't put quotes around address pieces. This stops an empty string from being put into the db as ''. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/gda-dev2@17415 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/business/business-core/sql/gnc-address-sql.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/business/business-core/sql/gnc-address-sql.c b/src/business/business-core/sql/gnc-address-sql.c index 943c728a5a..a5337860ee 100644 --- a/src/business/business-core/sql/gnc-address-sql.c +++ b/src/business/business-core/sql/gnc-address-sql.c @@ -167,7 +167,6 @@ add_gvalue_address_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name, gchar* s; QofAccessFunc getter; const GncSqlColumnTableEntry* subtable_row; - gchar* buf; g_return_if_fail( be != NULL ); g_return_if_fail( obj_name != NULL ); @@ -180,8 +179,6 @@ add_gvalue_address_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name, if( G_VALUE_TYPE(&value) != 0 ) { addr = g_value_get_object( &value ); for( subtable_row = col_table; subtable_row->col_name != NULL; subtable_row++ ) { - buf = g_strdup_printf( "%s_%s", table_row->col_name, subtable_row->col_name ); - subfield_value = g_new0( GValue, 1 ); if( subtable_row->gobj_param_name != NULL ) { g_object_get( addr, subtable_row->gobj_param_name, &s, NULL ); @@ -189,16 +186,13 @@ add_gvalue_address_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name, getter = gnc_sql_get_getter( GNC_ID_ADDRESS, subtable_row ); s = (gchar*)(*getter)( addr, NULL ); } + g_value_init( subfield_value, G_TYPE_STRING ); if( s ) { - g_value_init( subfield_value, G_TYPE_STRING ); - g_value_take_string( subfield_value, - g_strdup_printf( "'%s'", s ) ); + g_value_set_string( subfield_value, s ); } else { - g_value_init( subfield_value, G_TYPE_STRING ); g_value_set_string( subfield_value, "NULL" ); } (*pList) = g_slist_append( (*pList), subfield_value ); - g_free( buf ); } } }