fixed column name containing "index"

closes #284
tidyverts · Oct 8, 2022 · 5f26be3 · 5f26be3
1 parent d7a9cd3
commit 5f26be3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml
@@ -20,15 +20,15 @@ jobs:
 
           - {os: windows-latest, r: 'release'}
           # Use 3.6 to trigger usage of RTools35
-          - {os: windows-latest, r: '3.6'}
+          # - {os: windows-latest, r: '3.6'}
 
           # Use older ubuntu to maximise backward compatibility
           - {os: ubuntu-20.04,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-20.04,   r: 'release'}
           - {os: ubuntu-20.04,   r: 'oldrel-1'}
           - {os: ubuntu-20.04,   r: 'oldrel-2'}
           - {os: ubuntu-20.04,   r: 'oldrel-3'}
-          - {os: ubuntu-20.04,   r: 'oldrel-4'}
+          # - {os: ubuntu-20.04,   r: 'oldrel-4'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,7 @@
 # tsibble 1.1.3
 
 * Fixed the argument of `.full` in `*_gaps()` when inputs like `T`, `F` are valid. (#275)
+* Fixed validation of `index2` in `build_tsibble()` when a column name contains "index". (#284)
 
 # tsibble 1.1.2
 

diff --git a/R/as-tsibble.R b/R/as-tsibble.R
@@ -78,7 +78,7 @@ tsibble <- function(..., key = NULL, index, regular = TRUE, .drop = TRUE) {
   tbl <- tibble(!!!dots)
   index <- enquo(index)
   build_tsibble(tbl,
-    key = !!enquo(key), index = !!index, interval = regular,
+    key = !!enquo(key), index = !!index, index2 = !!index, interval = regular,
     .drop = .drop
   )
 }
@@ -150,7 +150,7 @@ as_tsibble.tbl_df <- function(x, key = NULL, index, regular = TRUE,
                               validate = TRUE, .drop = TRUE, ...) {
   index <- enquo(index)
   build_tsibble(x,
-    key = !!enquo(key), index = !!index, interval = regular,
+    key = !!enquo(key), index = !!index, index2 = !!index, interval = regular,
     validate = validate, .drop = .drop
   )
 }