slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: fix bug in pivot for postings without tag (#491)

Browse Source 
Without this fix for postings without tag query checked effective
account which is always empty text ("").
This commit is contained in:
Mykola Orliuk 2017-01-19 17:53:00 +02:00 committed by Simon Michael
parent 9759b5c867
commit 295af41f38
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hledger/Hledger/Cli/Utils.hs
View File

@ -92,7 +92,7 @@ pivot tag j = j{jtxns = map pivotTrans . jtxns $ j}
pivotTrans t = t{tpostings = map pivotPosting . tpostings $ t} pivotTrans t = t{tpostings = map pivotPosting . tpostings $ t}
pivotPosting p pivotPosting p
| Just (_ , value) <- tagTuple = p{paccount = value, porigin = Just $ originalPosting p} | Just (_ , value) <- tagTuple = p{paccount = value, porigin = Just $ originalPosting p}
| _ <- tagTuple = p{paccount = T.pack ""} | _ <- tagTuple = p{paccount = T.pack "", porigin = Just $ originalPosting p}
where tagTuple = find ((tag ==) . fst) . postingAllImplicitTags $ p where tagTuple = find ((tag ==) . fst) . postingAllImplicitTags $ p
-- | Apply the anonymisation transformation on a journal, if option is present -- | Apply the anonymisation transformation on a journal, if option is present

14
tests/misc/pivot.test
View File

@ -54,6 +54,20 @@ hledger -f- --pivot TAG reg '^Account2$' '^fun$' not:hidden
value -1 EUR 1 EUR value -1 EUR 1 EUR
>>>=0 >>>=0
# We should be able to query on original account names
hledger -f- --pivot expenses reg not:liabilities
<<<
2017/1/1 prepay
assets $1500 ; expenses:a
assets $100 ; expenses:b
assets $5 ; expenses:c
liabilities $-1605
>>>
2017/01/01 prepay a $1500 $1500
b $100 $1600
c $5 $1605
>>>=0
# pivot for implicit tag desc (technical sample) # pivot for implicit tag desc (technical sample)
hledger -f- --pivot description reg -M hledger -f- --pivot description reg -M
<<< <<<