Skip to content

Commit

Permalink
revert last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
etiennebacher committed May 18, 2024
1 parent 60b92a0 commit 41f1d44
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ S3method(names,RPolarsDataFrame)
S3method(names,RPolarsGroupBy)
S3method(names,RPolarsLazyFrame)
S3method(names,RPolarsLazyGroupBy)
S3method(parse_string_as_polars_duration,character)
S3method(parse_string_as_polars_duration,default)
S3method(parse_string_as_polars_duration,difftime)
S3method(parse_as_polars_duration_string,character)
S3method(parse_as_polars_duration_string,default)
S3method(parse_as_polars_duration_string,difftime)
S3method(plain,RPolarsErr)
S3method(plain,character)
S3method(plain,default)
Expand Down
6 changes: 3 additions & 3 deletions R/dataframe__frame.R
Original file line number Diff line number Diff line change
Expand Up @@ -2216,9 +2216,9 @@ DataFrame_group_by_dynamic = function(
group_by = NULL,
start_by = "window",
check_sorted = TRUE) {
every = parse_string_as_polars_duration(every)
offset = parse_string_as_polars_duration(offset) %||% paste0("-", every)
period = parse_string_as_polars_duration(period) %||% every
every = parse_as_polars_duration_string(every)
offset = parse_as_polars_duration_string(offset) %||% paste0("-", every)
period = parse_as_polars_duration_string(period) %||% every
construct_group_by_dynamic(
self, index_column, every, period, offset, include_boundaries, closed, label,
group_by, start_by, check_sorted
Expand Down
6 changes: 3 additions & 3 deletions R/expr__datetime.R
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#' )
#' df
ExprDT_truncate = function(every, offset = NULL) {
offset = parse_string_as_polars_duration(offset, default = "0ns")
offset = parse_as_polars_duration_string(offset, default = "0ns")
.pr$Expr$dt_truncate(self, every, offset) |>
unwrap("in $dt$truncate()")
}
Expand Down Expand Up @@ -83,8 +83,8 @@ ExprDT_truncate = function(every, offset = NULL) {
#' )
#' df
ExprDT_round = function(every, offset = NULL) {
every = parse_string_as_polars_duration(every, default = "0ns")
offset = parse_string_as_polars_duration(offset, default = "0ns")
every = parse_as_polars_duration_string(every, default = "0ns")
offset = parse_as_polars_duration_string(offset, default = "0ns")
.pr$Expr$dt_round(self, every, offset) |>
unwrap("in $dt$round()")
}
Expand Down
8 changes: 4 additions & 4 deletions R/functions__eager.R
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ pl_date_range = function(
time_zone = NULL) {
.warn_for_deprecated_date_range_use(start, end, interval, time_unit, time_zone)

interval = parse_string_as_polars_duration(interval)
interval = parse_as_polars_duration_string(interval)
date_range(start, end, interval, closed, time_unit, time_zone) |>
unwrap("in pl$date_range():")
}
Expand Down Expand Up @@ -294,7 +294,7 @@ pl_date_ranges = function(
time_zone = NULL) {
.warn_for_deprecated_date_range_use(start, end, interval, time_unit, time_zone)

interval = parse_string_as_polars_duration(interval)
interval = parse_as_polars_duration_string(interval)
date_ranges(start, end, interval, closed, time_unit, time_zone) |>
unwrap("in pl$date_ranges():")
}
Expand Down Expand Up @@ -344,7 +344,7 @@ pl_datetime_range = function(
closed = "both",
time_unit = NULL,
time_zone = NULL) {
interval = parse_string_as_polars_duration(interval)
interval = parse_as_polars_duration_string(interval)
datetime_range(start, end, interval, closed, time_unit, time_zone) |>
unwrap("in pl$datetime_range():")
}
Expand Down Expand Up @@ -386,7 +386,7 @@ pl_datetime_ranges = function(
closed = "both",
time_unit = NULL,
time_zone = NULL) {
interval = parse_string_as_polars_duration(interval)
interval = parse_as_polars_duration_string(interval)
datetime_ranges(start, end, interval, closed, time_unit, time_zone) |>
unwrap("in pl$datetimes_ranges():")
}
Expand Down
6 changes: 3 additions & 3 deletions R/lazyframe__lazy.R
Original file line number Diff line number Diff line change
Expand Up @@ -2025,9 +2025,9 @@ LazyFrame_group_by_dynamic = function(
group_by = NULL,
start_by = "window",
check_sorted = TRUE) {
every = parse_string_as_polars_duration(every)
offset = parse_string_as_polars_duration(offset) %||% paste0("-", every)
period = parse_string_as_polars_duration(period) %||% every
every = parse_as_polars_duration_string(every)
offset = parse_as_polars_duration_string(offset) %||% paste0("-", every)
period = parse_as_polars_duration_string(period) %||% every

.pr$LazyFrame$group_by_dynamic(
self, index_column, every, period, offset, label, include_boundaries, closed,
Expand Down
14 changes: 7 additions & 7 deletions R/parse_as_duration.R
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,26 @@ NULL
#' @noRd
#' @examples
#' # A single character is passed as is
#' parse_string_as_polars_duration("1d")
#' parse_as_polars_duration_string("1d")
#'
#' # A single difftime is converted to a duration string
#' parse_string_as_polars_duration(as.difftime(1, units = "days"))
parse_string_as_polars_duration = function(x, default = NULL, ...) {
#' parse_as_polars_duration_string(as.difftime(1, units = "days"))
parse_as_polars_duration_string = function(x, default = NULL, ...) {
if (is.null(x)) {
return(default)
}
UseMethod("parse_string_as_polars_duration")
UseMethod("parse_as_polars_duration_string")
}

#' @exportS3Method
parse_string_as_polars_duration.default = function(x, default = NULL, ...) {
parse_as_polars_duration_string.default = function(x, default = NULL, ...) {
Err_plain(paste0("`", deparse(substitute(x)), "` must be a single non-NA character or difftime.")) |>
unwrap()
}


#' @exportS3Method
parse_string_as_polars_duration.character = function(x, default = NULL, ...) {
parse_as_polars_duration_string.character = function(x, default = NULL, ...) {
if (length(x) != 1L || is.na(x)) {
Err_plain(paste0("`", deparse(substitute(x)), "` must be a single non-NA character or difftime.")) |>
unwrap()
Expand All @@ -69,7 +69,7 @@ parse_string_as_polars_duration.character = function(x, default = NULL, ...) {


#' @exportS3Method
parse_string_as_polars_duration.difftime = function(x, default = NULL, ...) {
parse_as_polars_duration_string.difftime = function(x, default = NULL, ...) {
if (length(x) != 1L || is.na(x)) {
Err_plain(paste0("`", deparse(substitute(x)), "` must be a single non-NA character or difftime.")) |>
unwrap()
Expand Down

0 comments on commit 41f1d44

Please sign in to comment.