From bbd26525fc8ca23bfa997c9ac1a20c774e347d27 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Fri, 28 Mar 2014 11:30:14 -0700 Subject: [PATCH] Set Gnucash version and GNUCASH_RESAVE_VERSION in init_version_info 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. --- src/backend/dbi/gnc-backend-dbi.c | 4 ---- src/backend/sql/gnc-backend-sql.c | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/dbi/gnc-backend-dbi.c b/src/backend/dbi/gnc-backend-dbi.c index fb93e06408..83476791f1 100644 --- a/src/backend/dbi/gnc-backend-dbi.c +++ b/src/backend/dbi/gnc-backend-dbi.c @@ -1412,10 +1412,6 @@ gnc_dbi_load( QofBackend* qbe, /*@ dependent @*/ QofBook *book, QofBackendLoadTy // Set up table version information 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 qof_object_foreach_backend( GNC_SQL_BACKEND, create_tables_cb, be ); diff --git a/src/backend/sql/gnc-backend-sql.c b/src/backend/sql/gnc-backend-sql.c index e6518bbf83..6169388ca0 100644 --- a/src/backend/sql/gnc-backend-sql.c +++ b/src/backend/sql/gnc-backend-sql.c @@ -439,8 +439,6 @@ gnc_sql_sync_all( GncSqlBackend* be, /*@ dependent @*/ QofBook *book ) ENTER( "book=%p, be->book=%p", book, be->book ); update_progress( 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 */ be->is_pristine_db = TRUE; @@ -3231,6 +3229,10 @@ gnc_sql_init_version_info( GncSqlBackend* be ) else { 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 ); } + 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; }