paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-19 00:09:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from Werner Pamler to fix some errors in JSON export

Browse Source
This commit is contained in:
Michaël Van Canneyt 2021-12-01 12:53:56 +01:00
parent a9b4fa5ed4
commit a868a45ba9
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/fcl-db/src/export/fpsimplejsonexport.pp
View File

@ -222,13 +222,13 @@ Var
begin begin
if EF.Field.IsNull then if EF.Field.IsNull then
S:='NULL' // do not localize S:='null' // do not localize
else if EF.Field.DataType=ftBoolean then else if EF.Field.DataType=ftBoolean then
begin begin
If EF.FIeld.AsBoolean then If EF.FIeld.AsBoolean then
S:='True' // Do not localize S:='true' // Do not localize
else else
S:='False';// Do not localize S:='false';// Do not localize
end end
else if EF.Field.DataType=ftFloat then else if EF.Field.DataType=ftFloat then
Str(EF.FIeld.asFloat,S) Str(EF.FIeld.asFloat,S)
@ -239,9 +239,6 @@ begin
If FCF=cfObject then If FCF=cfObject then
S:='"'+EF.ExportedName+'" : '+S; S:='"'+EF.ExportedName+'" : '+S;
If (FCurrentRow<>'') then If (FCurrentRow<>'') then
if FCF=cfObject then
FCurrentRow:=FCurrentRow+'; '
else
FCurrentRow:=FCurrentRow+', '; FCurrentRow:=FCurrentRow+', ';
FCurrentRow:=FCurrentRow+S; FCurrentRow:=FCurrentRow+S;
end; end;