Merge branch 'main' into copilot/follow-dplyr-120-updates

Author: krlmlr

AGENTS.md

@@ -95,7 +95,9 @@ All new functions must include:
 ## Testing
 
 - Add test cases for all new functionality
-- Test file naming should mirror source file naming
+- Test file naming should mirror source file naming: `R/name.R` → `tests/testthat/test-name.R`
+- Place new tests near existing tests for the same function in the test file
+- Add regression tests for bug fixes directly after the last existing test for the affected function
 - Implement both structured and snapshot tests
 - When testing error behavior, prefer snapshot tests
 - Run tests frequently during development and at the end: `testthat::test_local(reporter = "check")`

R/foreign-keys.R

@@ -460,12 +460,11 @@ dm_rm_fk_impl <- function(
   } else if (!is.null(ref_cols)) {
     show_disambiguation <- FALSE
   } else {
-    # Check if all FKs point to the primary key
-    show_disambiguation <- !all(map2_lgl(
-      def$fks[idx],
-      def$pks[idx],
+    # Check if all FKs (being removed) point to the primary key
+    show_disambiguation <- !all(pmap_lgl(
+      list(def$fks[idx], idx_fk, def$pks[idx]),
       ~ {
-        all(map_lgl(.x$ref_column, identical, .y$column[[1]]))
+        all(map_lgl(..1$ref_column[..2], identical, ..3$column[[1]]))
       }
     ))
   }

tests/testthat/test-foreign-keys.R

@@ -176,6 +176,21 @@ test_that("dm_rm_fk() works with partial matching", {
 })
 
 
+test_that("dm_rm_fk() produces no message when removing FK to PK in presence of FK to non-PK", {
+  p <- tibble(p_id = 1, p2_id = 1)
+  c1 <- tibble(p_id = 1)
+  c2 <- tibble(p2_id = 1)
+
+  my_dm <-
+    dm(p, c1, c2) %>%
+    dm_add_pk(p, p_id) %>%
+    dm_add_fk(c1, p_id, p) %>%
+    dm_add_fk(c2, p2_id, p, p2_id)
+
+  expect_silent(my_dm %>% dm_rm_fk(c1, p_id, p))
+})
+
+
 test_that("dm_enum_fk_candidates() works as intended?", {
   skip_if_ide()