correct Fast commit after force pushes

Rdatatable · May 4, 2024 · ca6c94d · ca6c94d
1 parent 1e4b311
commit ca6c94d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.ci/atime/tests.R b/.ci/atime/tests.R
@@ -129,7 +129,7 @@ test.list <- atime::atime_test_list(
     },
     expr = data.table::fread(tmp_csv, colClasses=list(Date='date')),
     Slow = "d19bfef7026f25bb2d36c17879187d09bcb2b2c3",
-    Fast = "e2ffcaf31f91564049014d8fae284a89a1a1deb7"),
+    Fast = "1a61365b6d6474668c342d960f947577c81266ff"),
   "fread(colClasses=Date) improved in #6107" = atime::atime_test(
     N = 10^seq(1, 7),
     setup = {
@@ -139,7 +139,7 @@ test.list <- atime::atime_test_list(
     },
     expr = data.table::fread(tmp_csv, colClasses="Date"),
     Slow = "d19bfef7026f25bb2d36c17879187d09bcb2b2c3",
-    Fast = "e2ffcaf31f91564049014d8fae284a89a1a1deb7"),
+    Fast = "1a61365b6d6474668c342d960f947577c81266ff"),
   "fread(select=list(Date)) improved in #6107" = atime::atime_test(
     N = 10^seq(1, 7),
     setup = {
@@ -149,6 +149,6 @@ test.list <- atime::atime_test_list(
     },
     expr = data.table::fread(tmp_csv, select=list(Date='date')),
     Slow = "d19bfef7026f25bb2d36c17879187d09bcb2b2c3",
-    Fast = "e2ffcaf31f91564049014d8fae284a89a1a1deb7")
+    Fast = "1a61365b6d6474668c342d960f947577c81266ff")
 )
 # nolint end: undesirable_operator_linter.
diff --git a/src/freadR.c b/src/freadR.c
@@ -406,9 +406,8 @@ bool userOverride(int8_t *type, lenOff *colNames, const char *anchor, const int
           if (selectRankD) selectRankD[colIdx-1] = rank++;
           // NB: mark as negative to indicate 'seen'
           if (type[colIdx-1]==CT_ISO8601_DATE && colClassType==CT_STRING && STRING_ELT(listNames, i) == char_Date) {
-            continue;
-          }
-          if (colClassType == CT_ISO8601_TIME && type[colIdx-1]!=CT_ISO8601_TIME) {
+            type[colIdx-1] *= -1;
+          } else if (colClassType == CT_ISO8601_TIME && type[colIdx-1]!=CT_ISO8601_TIME) {
             type[colIdx-1] = -CT_STRING; // don't use in-built UTC parser, defer to character and as.POSIXct afterwards which reads in local time
             SET_STRING_ELT(colClassesAs, colIdx-1, STRING_ELT(listNames, i));
           } else {