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

Set Gnucash version and GNUCASH_RESAVE_VERSION in init_version_info

Browse Source 
And reset_version_info. This is a better solution than setting it in load
after calling init_version_info because in load it would over-write the
values stored in the database.
This commit is contained in:
John Ralls 2014-03-28 11:30:14 -07:00
parent b73c77408a
commit bbd26525fc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1412,10 +1412,6 @@ gnc_dbi_load( QofBackend* qbe, /*@ dependent @*/ QofBook *book, QofBackendLoadTy
// Set up table version information // Set up table version information
gnc_sql_init_version_info (&be->sql_be); gnc_sql_init_version_info (&be->sql_be);
gnc_sql_set_table_version (&be->sql_be, "Gnucash",
gnc_prefs_get_long_version());
gnc_sql_set_table_version (&be->sql_be, "Gnucash-Resave",
GNUCASH_RESAVE_VERSION);
// Call all object backends to create any required tables // Call all object backends to create any required tables
qof_object_foreach_backend( GNC_SQL_BACKEND, create_tables_cb, be ); qof_object_foreach_backend( GNC_SQL_BACKEND, create_tables_cb, be );

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

@ -439,8 +439,6 @@ gnc_sql_sync_all( GncSqlBackend* be, /*@ dependent @*/ QofBook *book )
ENTER( "book=%p, be->book=%p", book, be->book ); ENTER( "book=%p, be->book=%p", book, be->book );
update_progress( be ); update_progress( be );
(void)reset_version_info( be ); (void)reset_version_info( be );
gnc_sql_set_table_version( be, "Gnucash", gnc_prefs_get_long_version() );
gnc_sql_set_table_version( be, "Gnucash-Resave", GNUCASH_RESAVE_VERSION );
/* Create new tables */ /* Create new tables */
be->is_pristine_db = TRUE; be->is_pristine_db = TRUE;
@ -3231,6 +3229,10 @@ gnc_sql_init_version_info( GncSqlBackend* be )
else else
{ {
do_create_table( be, VERSION_TABLE_NAME, version_table ); do_create_table( be, VERSION_TABLE_NAME, version_table );
gnc_sql_set_table_version( be, "Gnucash",
gnc_prefs_get_long_version() );
gnc_sql_set_table_version( be, "Gnucash-Resave",
GNUCASH_RESAVE_VERSION );
} }
} }
@ -3258,6 +3260,8 @@ reset_version_info( GncSqlBackend* be )
g_hash_table_remove_all( be->versions ); g_hash_table_remove_all( be->versions );
} }
gnc_sql_set_table_version( be, "Gnucash", gnc_prefs_get_long_version() );
gnc_sql_set_table_version( be, "Gnucash-Resave", GNUCASH_RESAVE_VERSION );
return ok; return ok;
} }