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

Add autoincrementing int primary column 'id' to recurrences, slots and taxtable_entries tables.

Browse Source 
THIS REQUIRES THAT YOUR DATABASE BE DELETED AND RECREATED - You can back it up to an XML file.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18244 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Phil Longstaff 2009-08-11 23:51:37 +00:00
parent b3ce7cd096
commit c1488da872
4 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/backend/sql/gnc-backend-sql.c
View File

@ -945,7 +945,7 @@ gnc_sql_get_integer_value( const GValue* value )
/*@ null @*/ static gpointer /*@ null @*/ static gpointer
get_autoinc_id() get_autoinc_id()
{ {
// Just need a 0 to force a new recurrence id // Just need a 0 to force a new autoinc value
return (gpointer)0; return (gpointer)0;
} }
@ -998,7 +998,7 @@ gnc_sql_add_subtable_colnames_to_list( const GncSqlColumnTableEntry* table_row,
static GncSqlColumnInfo* static GncSqlColumnInfo*
create_column_info( const GncSqlColumnTableEntry* table_row, GType type, create_column_info( const GncSqlColumnTableEntry* table_row, GType type,
gint size, gboolean is_unicode ) gint size, gboolean is_unicode, gboolean is_autoinc )
{ {
GncSqlColumnInfo* info; GncSqlColumnInfo* info;
@ -1010,6 +1010,7 @@ create_column_info( const GncSqlColumnTableEntry* table_row, GType type,
info->is_primary_key = ((table_row->flags & COL_PKEY) != 0) ? TRUE : FALSE; info->is_primary_key = ((table_row->flags & COL_PKEY) != 0) ? TRUE : FALSE;
info->null_allowed = ((table_row->flags & COL_NNUL) != 0) ? FALSE : TRUE; info->null_allowed = ((table_row->flags & COL_NNUL) != 0) ? FALSE : TRUE;
info->is_unicode = is_unicode; info->is_unicode = is_unicode;
info->is_autoinc = is_autoinc;
return info; return info;
} }
@ -1049,7 +1050,7 @@ add_string_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEnt
g_return_if_fail( table_row != NULL ); g_return_if_fail( table_row != NULL );
g_return_if_fail( pList != NULL ); g_return_if_fail( pList != NULL );
info = create_column_info( table_row, G_TYPE_STRING, table_row->size, TRUE ); info = create_column_info( table_row, G_TYPE_STRING, table_row->size, TRUE, FALSE );
*pList = g_list_append( *pList, info ); *pList = g_list_append( *pList, info );
} }
@ -1135,7 +1136,7 @@ add_int_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry*
g_return_if_fail( table_row != NULL ); g_return_if_fail( table_row != NULL );
g_return_if_fail( pList != NULL ); g_return_if_fail( pList != NULL );
info = create_column_info( table_row, G_TYPE_INT, 0, FALSE ); info = create_column_info( table_row, G_TYPE_INT, 0, FALSE, ((table_row->flags & COL_AUTOINC) != 0) );
*pList = g_list_append( *pList, info ); *pList = g_list_append( *pList, info );
} }
@ -1219,7 +1220,7 @@ add_boolean_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEn
g_return_if_fail( table_row != NULL ); g_return_if_fail( table_row != NULL );
g_return_if_fail( pList != NULL ); g_return_if_fail( pList != NULL );
info = create_column_info( table_row, G_TYPE_INT, 0, FALSE ); info = create_column_info( table_row, G_TYPE_INT, 0, FALSE, FALSE );
*pList = g_list_append( *pList, info ); *pList = g_list_append( *pList, info );
} }
@ -1296,7 +1297,7 @@ add_int64_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntr
g_return_if_fail( table_row != NULL ); g_return_if_fail( table_row != NULL );
g_return_if_fail( pList != NULL ); g_return_if_fail( pList != NULL );
info = create_column_info( table_row, G_TYPE_INT64, 0, FALSE ); info = create_column_info( table_row, G_TYPE_INT64, 0, FALSE, FALSE );
*pList = g_list_append( *pList, info ); *pList = g_list_append( *pList, info );
} }
@ -1375,7 +1376,7 @@ add_double_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEnt
g_return_if_fail( table_row != NULL ); g_return_if_fail( table_row != NULL );
g_return_if_fail( pList != NULL ); g_return_if_fail( pList != NULL );
info = create_column_info( table_row, G_TYPE_DOUBLE, 0, FALSE ); info = create_column_info( table_row, G_TYPE_DOUBLE, 0, FALSE, FALSE );
*pList = g_list_append( *pList, info ); *pList = g_list_append( *pList, info );
} }
@ -1460,7 +1461,7 @@ add_guid_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry
g_return_if_fail( table_row != NULL ); g_return_if_fail( table_row != NULL );
g_return_if_fail( pList != NULL ); g_return_if_fail( pList != NULL );
info = create_column_info( table_row, G_TYPE_STRING, GUID_ENCODING_LENGTH, FALSE ); info = create_column_info( table_row, G_TYPE_STRING, GUID_ENCODING_LENGTH, FALSE, FALSE );
*pList = g_list_append( *pList, info ); *pList = g_list_append( *pList, info );
} }
@ -1626,7 +1627,7 @@ add_timespec_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableE
g_return_if_fail( table_row != NULL ); g_return_if_fail( table_row != NULL );
g_return_if_fail( pList != NULL ); g_return_if_fail( pList != NULL );
info = create_column_info( table_row, G_TYPE_STRING, TIMESPEC_COL_SIZE, FALSE ); info = create_column_info( table_row, G_TYPE_STRING, TIMESPEC_COL_SIZE, FALSE, FALSE );
*pList = g_list_append( *pList, info ); *pList = g_list_append( *pList, info );
} }
@ -1724,7 +1725,7 @@ add_date_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry
g_return_if_fail( table_row != NULL ); g_return_if_fail( table_row != NULL );
g_return_if_fail( pList != NULL ); g_return_if_fail( pList != NULL );
info = create_column_info( table_row, G_TYPE_STRING, DATE_COL_SIZE, FALSE ); info = create_column_info( table_row, G_TYPE_STRING, DATE_COL_SIZE, FALSE, FALSE );
*pList = g_list_append( *pList, info ); *pList = g_list_append( *pList, info );
} }
@ -2345,6 +2346,9 @@ build_insert_statement( GncSqlBackend* be,
GSList* values; GSList* values;
GSList* node; GSList* node;
gchar* sqlbuf; gchar* sqlbuf;
GList* colnames = NULL;
GList* colname;
const GncSqlColumnTableEntry* table_row;
g_return_val_if_fail( be != 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_name != NULL, NULL );
@ -2352,9 +2356,32 @@ build_insert_statement( GncSqlBackend* be,
g_return_val_if_fail( pObject != NULL, NULL ); g_return_val_if_fail( pObject != NULL, NULL );
g_return_val_if_fail( table != NULL, NULL ); g_return_val_if_fail( table != NULL, NULL );
sqlbuf = g_strdup_printf( "INSERT INTO %s VALUES(", table_name ); sqlbuf = g_strdup_printf( "INSERT INTO %s(", table_name );
sql = g_string_new( sqlbuf ); sql = g_string_new( sqlbuf );
g_free( 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;
// 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_list_free( colnames );
g_string_append( sql, ") VALUES(" );
values = create_gslist_from_values( be, obj_name, pObject, table ); values = create_gslist_from_values( be, obj_name, pObject, table );
for( node = values; node != NULL; node = node->next ) { for( node = values; node != NULL; node = node->next ) {
GValue* value = (GValue*)node->data; GValue* value = (GValue*)node->data;
@ -2390,7 +2417,7 @@ build_update_statement( GncSqlBackend* be,
GSList* value; GSList* value;
GList* colname; GList* colname;
gboolean firstCol; gboolean firstCol;
const GncSqlColumnTableEntry* table_row = table; const GncSqlColumnTableEntry* table_row;
gchar* sqlbuf; gchar* sqlbuf;
g_return_val_if_fail( be != NULL, NULL ); g_return_val_if_fail( be != NULL, NULL );
@ -2400,13 +2427,15 @@ build_update_statement( GncSqlBackend* be,
g_return_val_if_fail( table != NULL, NULL ); g_return_val_if_fail( table != NULL, NULL );
// Get all col names and all values // Get all col names and all values
for( ; table_row->col_name != NULL; table_row++ ) { for( table_row = table; table_row->col_name != NULL; table_row++ ) {
GncSqlColumnTypeHandler* pHandler; if(( table_row->flags & COL_AUTOINC ) == 0 ) {
GncSqlColumnTypeHandler* pHandler;
// Add col names to the list // Add col names to the list
pHandler = get_handler( table_row ); pHandler = get_handler( table_row );
g_assert( pHandler != NULL ); g_assert( pHandler != NULL );
pHandler->add_colname_to_list_fn( table_row, &colnames ); pHandler->add_colname_to_list_fn( table_row, &colnames );
}
} }
g_assert( colnames != NULL ); g_assert( colnames != NULL );
values = create_gslist_from_values( be, obj_name, pObject, table ); values = create_gslist_from_values( be, obj_name, pObject, table );

1
src/backend/sql/gnc-recurrence-sql.c
View File

@ -67,6 +67,7 @@ static void set_recurrence_period_start( gpointer pObject, /*@ null @*/ gpointer
static const GncSqlColumnTableEntry col_table[] = static const GncSqlColumnTableEntry col_table[] =
{ {
/*@ -full_init_block @*/ /*@ -full_init_block @*/
{ "id", CT_INT, 0, COL_PKEY|COL_NNUL|COL_AUTOINC },
{ "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, { "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid }, (QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid },
{ "recurrence_mult", CT_INT, 0, COL_NNUL, NULL, NULL, { "recurrence_mult", CT_INT, 0, COL_NNUL, NULL, NULL,

1
src/backend/sql/gnc-slots-sql.c
View File

@ -81,6 +81,7 @@ static void set_numeric_val( gpointer pObject, gnc_numeric value );
static const GncSqlColumnTableEntry col_table[] = static const GncSqlColumnTableEntry col_table[] =
{ {
/*@ -full_init_block @*/ /*@ -full_init_block @*/
{ "id", CT_INT, 0, COL_PKEY|COL_NNUL|COL_AUTOINC },
{ "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, { "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid }, (QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid },
{ "name", CT_STRING, SLOT_MAX_PATHNAME_LEN, COL_NNUL, NULL, NULL, { "name", CT_STRING, SLOT_MAX_PATHNAME_LEN, COL_NNUL, NULL, NULL,

3
src/business/business-core/sql/gnc-tax-table-sql.c
View File

@ -78,10 +78,11 @@ static GncSqlColumnTableEntry tt_col_table[] =
}; };
#define TTENTRIES_TABLE_NAME "taxtable_entries" #define TTENTRIES_TABLE_NAME "taxtable_entries"
#define TTENTRIES_TABLE_VERSION 2 #define TTENTRIES_TABLE_VERSION 3
static GncSqlColumnTableEntry ttentries_col_table[] = static GncSqlColumnTableEntry ttentries_col_table[] =
{ {
{ "id", CT_INT, 0, COL_PKEY|COL_NNUL|COL_AUTOINC },
{ "taxtable", CT_TAXTABLEREF, 0, COL_NNUL, NULL, NULL, { "taxtable", CT_TAXTABLEREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncTaxTableEntryGetTable, set_obj_guid }, (QofAccessFunc)gncTaxTableEntryGetTable, set_obj_guid },
{ "account", CT_ACCOUNTREF, 0, COL_NNUL, NULL, NULL, { "account", CT_ACCOUNTREF, 0, COL_NNUL, NULL, NULL,