Skip to content

imp: pivot: Tag name shadowing field name takes precedence (#2169) #2418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

imp: pivot: Tag name shadowing field name takes precedence (#2169) #2418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hledger-lib/Hledger/Data/Journal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,8 +1145,10 @@ pivotAccount fieldortagname p =
-- "comm" and "cur" are accepted as synonyms meaning the commodity symbol.
-- Pivoting on an unknown field or tag, or on commodity when there are multiple commodities, returns "".
-- Pivoting on a tag when there are multiple values for that tag, returns the first value.
-- Pivoting on a tag name that shadows a field name gives precedence to the tag value.
pivotComponent :: Text -> Posting -> Text
pivotComponent fieldortagname p
| Just (_, tagvalue) <- postingFindTag fieldortagname p = tagvalue
| fieldortagname == "code", Just t <- ptransaction p = tcode t
| fieldortagname `elem` descnames, Just t <- ptransaction p = tdescription t
| fieldortagname == "payee", Just t <- ptransaction p = transactionPayee t
Expand All @@ -1156,7 +1158,6 @@ pivotComponent fieldortagname p
| fieldortagname `elem` commnames = case map acommodity $ amounts $ pamount p of [s] -> s; _ -> unknown
| fieldortagname == "amt" = case amounts $ pamount p of [a] -> T.pack $ show $ aquantity a; _ -> unknown
| fieldortagname == "cost" = case amounts $ pamount p of [a@Amount{acost=Just _}] -> T.pack $ lstrip $ showAmountCost a; _ -> unknown
| Just (_, tagvalue) <- postingFindTag fieldortagname p = tagvalue
| otherwise = unknown
where
descnames = ["desc", "description"] -- allow "description" for hledger <=1.30 compat
Expand Down
25 changes: 25 additions & 0 deletions hledger/test/pivot.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,28 @@ Balance changes in 2025:
@ $100 || 2 B
--------++-----------------
|| $-210, 1 A, 2 B

# ** 18. When tag shadows field, tag takes precedence.
<
2025-01-01 CustA ; payee:CustB
asset $100
asset $200
revenue $-300

$ hledger -f- bal asset --pivot=payee
$300 CustB
--------------------
$300

# ** 19. More specific tag takes precedence over less specific (ie. posting tag precedes transaction tag).
<
2025-01-01 CustA ; payee:CustB
asset $100 ; payee:CustA
asset $200 ; payee:CustB
revenue $-300

$ hledger -f- bal asset --pivot=payee
$100 CustA
$200 CustB
--------------------
$300