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

Merge pull request #1814 from Xitian9/csverror

Browse Source 
imp: csv: Give an error if unable to substitute csv templates. (#1803)
This commit is contained in:
Stephen Morgan 2022-05-22 11:35:39 +10:00 committed by GitHub
commit 15a5d5d38b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-lib/Hledger/Read/CsvReader.hs
View File

@ -1237,10 +1237,10 @@ renderTemplate rules record t = maybe t mconcat $ parseMaybe
-- | Replace something that looks like a reference to a csv field ("%date" or "%1) -- | Replace something that looks like a reference to a csv field ("%date" or "%1)
-- with that field's value. If it doesn't look like a field reference, or if we -- with that field's value. If it doesn't look like a field reference, or if we
-- can't find such a field, leave it unchanged. -- can't find such a field, replace it with the empty string.
replaceCsvFieldReference :: CsvRules -> CsvRecord -> CsvFieldReference -> Text replaceCsvFieldReference :: CsvRules -> CsvRecord -> CsvFieldReference -> Text
replaceCsvFieldReference rules record s = case T.uncons s of replaceCsvFieldReference rules record s = case T.uncons s of
Just ('%', fieldname) -> fromMaybe s $ csvFieldValue rules record fieldname Just ('%', fieldname) -> fromMaybe "" $ csvFieldValue rules record fieldname
_ -> s _ -> s
-- | Get the (whitespace-stripped) value of a CSV field, identified by its name or -- | Get the (whitespace-stripped) value of a CSV field, identified by its name or

13
hledger/test/csv.test
View File

@ -1029,6 +1029,19 @@ $ ./csvtest.sh
>=0 >=0
# 51. Throw an error when unable to substitute csv templates
<
"2021-12-23","caffe_siciliaexpenses:cibo:dolce","-10.5"
RULES file
account1 assets:bank:checking
fields date, description, account2, amount
$ ./csvtest.sh
>2 /could not balance this transaction/
>=1
## . ## .
#< #<
#$ ./csvtest.sh #$ ./csvtest.sh