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

Fix bug implementing queries.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5777 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-11-06 23:02:26 +00:00
parent 28eae010cb
commit 228946cd10
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/backend/postgres/gncquery.c
View File

@ -418,7 +418,7 @@ sql_sort_need_entry (Query *q)
* broken as well.
*/
#define AMOUNT_TERM(fieldname) \
#define AMOUNT_TERM(fieldname,comtable) \
{ \
if (0 == pd->amount.sense) \
{ \
@ -439,17 +439,17 @@ sql_sort_need_entry (Query *q)
{ \
case AMT_MATCH_ATLEAST: \
sq->pq = stpcpy(sq->pq, \
"abs(" fieldname ") >= gncCommodity.fraction * float8"); \
"abs(" fieldname ") >= "comtable".fraction * float8"); \
sq->pq += sprintf (sq->pq, "(%22.18g)", pd->amount.amount); \
break; \
case AMT_MATCH_ATMOST: \
sq->pq = stpcpy(sq->pq, \
"abs(" fieldname ") <= gncCommodity.fraction * float8"); \
"abs(" fieldname ") <= "comtable".fraction * float8"); \
sq->pq += sprintf (sq->pq, "(%22.18g)", pd->amount.amount); \
break; \
case AMT_MATCH_EXACTLY: \
sq->pq = stpcpy(sq->pq, \
"abs(abs(" fieldname ") - abs(gncCommodity.fraction * float8"); \
"abs(abs(" fieldname ") - abs("comtable".fraction * float8"); \
sq->pq += sprintf (sq->pq, "(%22.18g)", pd->amount.amount); \
sq->pq = stpcpy(sq->pq, ")) < 1"); \
break; \
@ -490,7 +490,8 @@ sqlQuery_build (sqlQuery *sq, Query *q, GNCSession *session)
int more_and = 0;
int max_rows;
gboolean need_account = FALSE;
gboolean need_commodity = FALSE;
gboolean need_account_commodity = FALSE;
gboolean need_trans_commodity = FALSE;
gboolean need_entry = FALSE;
sort_type_t sorter;
@ -529,7 +530,7 @@ sqlQuery_build (sqlQuery *sq, Query *q, GNCSession *session)
break;
case PR_AMOUNT:
need_entry = TRUE;
need_commodity = TRUE;
need_trans_commodity = TRUE;
break;
case PR_GUID:
switch (xaccGUIDType (&pd->guid.guid, session))
@ -549,7 +550,7 @@ sqlQuery_build (sqlQuery *sq, Query *q, GNCSession *session)
break;
case PR_SHRS:
need_entry = TRUE;
need_commodity = TRUE;
need_account_commodity = TRUE;
need_account = TRUE;
break;
default:
@ -564,7 +565,7 @@ sqlQuery_build (sqlQuery *sq, Query *q, GNCSession *session)
/* reset the buffer pointers */
sq->pq = sq->q_base;
sq->pq = stpcpy(sq->pq,
sq->pq = stpcpy(sq->pq,
"SELECT DISTINCT gncTransaction.* ");
/* For SELECT DISTINCT, ORDER BY expressions must appear in target list */
@ -579,9 +580,13 @@ sqlQuery_build (sqlQuery *sq, Query *q, GNCSession *session)
{
sq->pq = stpcpy(sq->pq, ", gncAccount");
}
if (need_commodity)
if (need_account_commodity)
{
sq->pq = stpcpy(sq->pq, ", gncCommodity");
sq->pq = stpcpy(sq->pq, ", gncCommodity account_com");
}
if (need_trans_commodity)
{
sq->pq = stpcpy(sq->pq, ", gncCommodity trans_com");
}
if (need_entry)
{
@ -659,8 +664,8 @@ sqlQuery_build (sqlQuery *sq, Query *q, GNCSession *session)
{
PINFO("term is PR_AMOUNT");
sq->pq = stpcpy(sq->pq,
"gncTransaction.currency = gncCommodity.commodity AND ");
AMOUNT_TERM ("gncEntry.value");
"gncTransaction.currency = trans_com.commodity AND ");
AMOUNT_TERM ("gncEntry.value","trans_com");
break;
}
@ -850,8 +855,8 @@ sqlQuery_build (sqlQuery *sq, Query *q, GNCSession *session)
PINFO("term is PR_SHRS");
sq->pq = stpcpy(sq->pq,
"gncEntry.accountGuid = gncAccount.accountGuid AND "
"gncAccount.commodity = gncCommodity.commodity AND ");
AMOUNT_TERM ("gncEntry.amount");
"gncAccount.commodity = account_com.commodity AND ");
AMOUNT_TERM ("gncEntry.amount","account_com");
break;
}