Merge pull request #47 from randrescastaneda/row_order

Row order fix
randrescastaneda · Feb 26, 2024 · d84b2e0 · d84b2e0
2 parents 144231a + 2699753
commit d84b2e0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 27 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: joyn
 Type: Package
 Title: Tool for Diagnosis of Tables Joins and Complementary Join Features
-Version: 0.1.6.9001
+Version: 0.1.6.9002
 Authors@R: c(person(given = "R.Andres", 
                     family = "Castaneda", 
                     email = "acastanedaa@worldbank.org",

diff --git a/R/joyn-merge.R b/R/joyn-merge.R
@@ -212,12 +212,8 @@ joyn <- function(x,
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   start_joyn <- Sys.time()
   # copy objects if data.tables
-  if (any(class(x) == "data.table")) {
-    x <- copy(x)
-  }
-  if (any(class(y) == "data.table")) {
-    y <- copy(y)
-  }
+  x <- copy(x)
+  y <- copy(y)
 
   ## X and Y -----------
   check_xy(x,y)
@@ -238,7 +234,6 @@ joyn <- function(x,
     y <- as.data.table(y)
   }
 
-
   ## Modify BY when is expression ---------
   fixby  <- check_by_vars(by, x, y)
   by     <- fixby$by
@@ -392,19 +387,6 @@ joyn <- function(x,
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   #                   Update x   ---------
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  # if (isTRUE(update_values) || isTRUE(update_NAs)) {
-  #   var_use <- sub(
-  #     pattern = "\\.y$",
-  #     replacement = "",
-  #     x = newyvars[
-  #       grepl(
-  #         pattern = "\\.y$",
-  #         x       = newyvars
-  #       )
-  #     ]
-  #   )
-  # }
   var_use <- NULL
   if (isTRUE(update_values) || isTRUE(update_NAs)) {
     var_use <- common_vars
@@ -466,6 +448,11 @@ joyn <- function(x,
                          .yreport = NULL)
 
 
+  if (sort) {
+    setorderv(x, by, na.last = na.last)
+    setattr(x, 'sorted', by)
+  }
+
   ## Rename by variables -----
 
   if (!is.null(fixby$xby)) {
@@ -523,10 +510,6 @@ joyn <- function(x,
     x |> fselect(get(reportvar)) <- NULL
   }
 
-  if (sort) {
-    setorderv(x, by, na.last = na.last)
-    setattr(x, 'sorted', by)
-  }
 
   if (verbose == TRUE) {
     end_joyn <- Sys.time()

diff --git a/tests/testthat/test-joyn.R b/tests/testthat/test-joyn.R
@@ -568,8 +568,8 @@ test_that("different names in key vars are working fine", {
                    ".joyn" = c("x & y", "x & y", "x", "y", "x", "x & y", "y", "y")
                    )
 
-  setorderv(dd, "id1", na.last = TRUE)
-  setattr(dd, 'sorted', "id1")
+  setorderv(dd, c("id1", "id2"), na.last = TRUE)
+  setattr(dd, 'sorted', c("id1", "id2"))
 
   expect_equal(df, dd)