Merge branch 'main' into write-data-page-v2

r-lib · Aug 9, 2024 · 9a162f8 · 9a162f8
2 parents 21f0589 + 75fe736
commit 9a162f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/write.cpp b/src/write.cpp
@@ -1,4 +1,5 @@
 #include <cmath>
+#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 #include "lib/nanoparquet.h"

diff --git a/tests/testthat/test-write-encodings.R b/tests/testthat/test-write-encodings.R
@@ -189,6 +189,11 @@ test_that("double -> INT96", {
   on.exit(unlink(tmp), add = TRUE)
   schema <- "INT96"
 
+  # TODO: fix tests
+  if (.Platform$OS.type == "windows" && getRversion() < "4.2.0") {
+    skip("Needs INT96 read w/o converting to time")
+  }
+
   do <- function(d) {
     test_write(d, schema)
     test_write(d, schema, "PLAIN")