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

Bug 791848 - GC 2.6.x does not handle ISO dates introduced with GC 2.7

Browse Source 
Enable reading ISO-formatted dates, recognize GNC_FEATURE_SQLITE3_ISO_DATES.
This commit is contained in:
John Ralls 2017-12-23 16:42:43 -08:00
parent a28bcdf19b
commit 44c51f433b
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1855,7 +1855,9 @@ typedef Timespec (*TimespecAccessFunc)( const gpointer );
typedef void (*TimespecSetterFunc)( const gpointer, Timespec ); typedef void (*TimespecSetterFunc)( const gpointer, Timespec );
#define TIMESPEC_STR_FORMAT "%04d%02d%02d%02d%02d%02d" #define TIMESPEC_STR_FORMAT "%04d%02d%02d%02d%02d%02d"
#define TIMESPEC_ALT_FORMAT "%04d-%02d%-02d %02d:%02d:%02d"
#define TIMESPEC_COL_SIZE (4+2+2+2+2+2) #define TIMESPEC_COL_SIZE (4+2+2+2+2+2)
#define TIMESPEC_ALT_COL_SIZE (4+3+3+3+3+3)
/* This is required because we're passing be->timespace_format to /* This is required because we're passing be->timespace_format to
* g_strdup_printf. * g_strdup_printf.
@ -1926,22 +1928,24 @@ load_timespec( const GncSqlBackend* be, GncSqlRow* row,
else if (G_VALUE_HOLDS_STRING (val)) else if (G_VALUE_HOLDS_STRING (val))
{ {
const gchar* s = g_value_get_string( val ); const gchar* s = g_value_get_string( val );
if ( s != NULL ) if ( s != NULL && strlen(s) == TIMESPEC_COL_SIZE)
{ {
if (! g_str_has_prefix (s, "0000-00-00")) gchar* buf;
{ buf = g_strdup_printf( "%c%c%c%c-%c%c-%c%c %c%c:%c%c:%c%c",
gchar* buf; s[0], s[1], s[2], s[3],
buf = g_strdup_printf( "%c%c%c%c-%c%c-%c%c %c%c:%c%c:%c%c", s[4], s[5],
s[0], s[1], s[2], s[3], s[6], s[7],
s[4], s[5], s[8], s[9],
s[6], s[7], s[10], s[11],
s[8], s[9], s[12], s[13] );
s[10], s[11], ts = gnc_iso8601_to_timespec_gmt( buf );
s[12], s[13] ); g_free( buf );
ts = gnc_iso8601_to_timespec_gmt( buf ); isOK = TRUE;
g_free( buf ); }
} else if (! g_str_has_prefix (s, "0000-00-00"))
isOK = TRUE; {
ts = gnc_iso8601_to_timespec_gmt (s);
isOK = TRUE;
} }
} }
else else

1
src/core-utils/gnc-features.c
View File

@ -46,6 +46,7 @@ static gncFeature known_features[] =
{ GNC_FEATURE_KVP_EXTRA_DATA, "Extra data for addresses, jobs or invoice entries (requires at least GnuCash 2.6.4)" }, { GNC_FEATURE_KVP_EXTRA_DATA, "Extra data for addresses, jobs or invoice entries (requires at least GnuCash 2.6.4)" },
{ GNC_FEATURE_GUID_BAYESIAN, "Use account GUID as key for Bayesian data (requires at least GnuCash 2.6.12)" }, { GNC_FEATURE_GUID_BAYESIAN, "Use account GUID as key for Bayesian data (requires at least GnuCash 2.6.12)" },
{ GNC_FEATURE_GUID_FLAT_BAYESIAN, "Use account GUID as key for bayesian data and store KVP flat (requires at least GnuCash 2.6.19)" }, { GNC_FEATURE_GUID_FLAT_BAYESIAN, "Use account GUID as key for bayesian data and store KVP flat (requires at least GnuCash 2.6.19)" },
{ GNC_FEATURE_SQLITE3_ISO_DATES, "Use ISO formatted date-time strings in SQLite3 databases (requires at least GnuCash 2.6.20)"},
{ NULL }, { NULL },
}; };

1
src/core-utils/gnc-features.h
View File

@ -46,6 +46,7 @@
#define GNC_FEATURE_KVP_EXTRA_DATA "Extra data in addresses, jobs or invoice entries" #define GNC_FEATURE_KVP_EXTRA_DATA "Extra data in addresses, jobs or invoice entries"
#define GNC_FEATURE_GUID_BAYESIAN "Account GUID based Bayesian data" #define GNC_FEATURE_GUID_BAYESIAN "Account GUID based Bayesian data"
#define GNC_FEATURE_GUID_FLAT_BAYESIAN "Account GUID based bayesian with flat KVP" #define GNC_FEATURE_GUID_FLAT_BAYESIAN "Account GUID based bayesian with flat KVP"
#define GNC_FEATURE_SQLITE3_ISO_DATES "ISO-8601 formatted date strings in SQLite3 databases."
/** @} */ /** @} */