Skip to content

Issue 51160: update jsonEncodeRowsAndParams() to better handle decimal values for toJSON() #109

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

Merged
cnathe merged 1 commit into from
Oct 23, 2024
Merged

Issue 51160: update jsonEncodeRowsAndParams() to better handle decimal values for toJSON() #109

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
4 changes: 2 additions & 2 deletions Rlabkey/DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: Rlabkey
Version: 3.3.0
Date: 2024-08-08
Version: 3.4.0
Date: 2024-10-22
Title: Data Exchange Between R and 'LabKey' Server
Authors@R: c(person(given = "Peter",
family = "Hussey",
Expand Down
3 changes: 3 additions & 0 deletions Rlabkey/NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Changes in 3.4.0
o Issue 51160: update jsonEncodeRowsAndParams() to better handle decimal values for toJSON()

Changes in 3.3.0
o Add labkey.experiment.lineage API to support getting parent/child relationships for exp objects by LSID

Expand Down
4 changes: 2 additions & 2 deletions Rlabkey/R/makeDF.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ convertFactorsToStrings <- function(df)
jsonEncodeRowsAndParams <- function(rows, params, na=NULL)
{
nrows <- nrow(rows)
p1 <- toJSON(params, auto_unbox=TRUE)
p1 <- toJSON(params, auto_unbox=TRUE, digits = NA) # digits = NA to avoid trimming values (Issue 51160)
cnames <- colnames(rows)
p3 <- NULL
for(j in 1:nrows)
Expand All @@ -247,7 +247,7 @@ jsonEncodeRowsAndParams <- function(rows, params, na=NULL)
if (!is.null(na)) {
cvalues[is.na(cvalues)] = na
}
p2 <- toJSON(cvalues, auto_unbox=TRUE)
p2 <- toJSON(cvalues, auto_unbox=TRUE, digits = NA) # digits = NA to avoid trimming values (Issue 51160)
p3 <- c(p3, p2)
}
p3 <- paste(p3, collapse=",")
Expand Down
4 changes: 2 additions & 2 deletions Rlabkey/man/Rlabkey-package.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ schema objects (\code{labkey.getSchema}).
\tabular{ll}{
Package: \tab Rlabkey\cr
Type: \tab Package\cr
Version: \tab 3.3.0\cr
Date: \tab 2024-08-08\cr
Version: \tab 3.4.0\cr
Date: \tab 2024-10-22\cr
License: \tab Apache License 2.0\cr
LazyLoad: \tab yes\cr
}
Expand Down