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

Merge branch 'plug-recurrence-to-string' into stable #1812

Browse Source
This commit is contained in:
Christopher Lam 2023-11-07 06:28:39 +08:00
commit 9e47c297ba
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libgnucash/backend/sql/gnc-recurrence-sql.cpp
View File

@ -379,14 +379,13 @@ upgrade_recurrence_table_1_2 (GncSqlBackend* sql_be)
/* Step 2: insert a default value in the newly created column */ /* Step 2: insert a default value in the newly created column */
{ {
gchar* weekend_adj_str = recurrenceWeekendAdjustToString (WEEKEND_ADJ_NONE); const gchar* weekend_adj_str = recurrenceWeekendAdjustToString (WEEKEND_ADJ_NONE);
std::stringstream sql; std::stringstream sql;
sql << "UPDATE " << TABLE_NAME << " SET " << sql << "UPDATE " << TABLE_NAME << " SET " <<
weekend_adjust_col_table[0]->name() << "='" << weekend_adjust_col_table[0]->name() << "='" <<
weekend_adj_str << "'"; weekend_adj_str << "'";
auto stmt = sql_be->create_statement_from_sql(sql.str()); auto stmt = sql_be->create_statement_from_sql(sql.str());
sql_be->execute_nonselect_statement(stmt); sql_be->execute_nonselect_statement(stmt);
g_free (weekend_adj_str);
} }
/* Step 3: rewrite the table, requiring the weekend_adj column to be non-null */ /* Step 3: rewrite the table, requiring the weekend_adj column to be non-null */

8
libgnucash/engine/Recurrence.c
View File

@ -518,10 +518,10 @@ recurrenceListToString(const GList *r)
return g_string_free(str, FALSE); return g_string_free(str, FALSE);
} }
gchar * const gchar *
recurrencePeriodTypeToString(PeriodType pt) recurrencePeriodTypeToString(PeriodType pt)
{ {
return VALID_PERIOD_TYPE(pt) ? g_strdup(period_type_strings[pt]) : NULL; return VALID_PERIOD_TYPE(pt) ? period_type_strings[pt] : NULL;
} }
PeriodType PeriodType
@ -535,10 +535,10 @@ recurrencePeriodTypeFromString(const gchar *str)
return -1; return -1;
} }
gchar * const gchar *
recurrenceWeekendAdjustToString(WeekendAdjust wadj) recurrenceWeekendAdjustToString(WeekendAdjust wadj)
{ {
return VALID_WEEKEND_ADJ(wadj) ? g_strdup(weekend_adj_strings[wadj]) : NULL; return VALID_WEEKEND_ADJ(wadj) ? weekend_adj_strings[wadj] : NULL;
} }
WeekendAdjust WeekendAdjust

4
libgnucash/engine/Recurrence.h
View File

@ -155,9 +155,9 @@ void recurrenceListNextInstance(const GList *r, const GDate *refDate,
GDate *nextDate); GDate *nextDate);
/* These four functions are only for xml storage, not user presentation. */ /* These four functions are only for xml storage, not user presentation. */
gchar *recurrencePeriodTypeToString(PeriodType pt); const gchar *recurrencePeriodTypeToString(PeriodType pt);
PeriodType recurrencePeriodTypeFromString(const gchar *str); PeriodType recurrencePeriodTypeFromString(const gchar *str);
gchar *recurrenceWeekendAdjustToString(WeekendAdjust wadj); const gchar *recurrenceWeekendAdjustToString(WeekendAdjust wadj);
WeekendAdjust recurrenceWeekendAdjustFromString(const gchar *str); WeekendAdjust recurrenceWeekendAdjustFromString(const gchar *str);
/* For debugging. Caller owns the returned string. Not intl. */ /* For debugging. Caller owns the returned string. Not intl. */