Revert "db.tuples[{-docs,-tests}]: add reject-tuples"

This reverts commit 6cae2046b5df5ad975206a0eb09e3d64d56f9897.

diff --git a/basis/db/tuples/tuples-docs.factor b/basis/db/tuples/tuples-docs.factor
index 1d9d915b008b218e940d2fdbd0ea68ffa31011b7..fecfdff3eeff042021c5cb43dce653e57986e90a 100644 (file)
--- a/basis/db/tuples/tuples-docs.factor
+++ b/basis/db/tuples/tuples-docs.factor
@@ -139,18 +139,7 @@ HELP: delete-tuples
 { $description "Uses the " { $snippet "tuple" } " as an exemplar object and deletes any objects that have the same slots set. If a slot is not " { $link f } ", then it is used to generate an SQL statement that deletes tuples." }
 { $warning "This word will delete your data." } ;
 
-HELP: reject-tuples
-{ $values
-     { "query/tuple" tuple }
-     { "quot" { $quotation ( tuple -- ? ) } } }
-{ $description "An SQL query is constructed from the slots of the exemplar tuple that are not " { $link f } ". The " { $snippet "quot" } " is applied to each tuple from the database that matches the query, and if it returns a true value, the row is deleted from the database."
-$nl
-"The word is equivalent to the following code:"
-{ $code "query/tuple select-tuples quot filter [ delete-tuples ] each" }
-"The difference is that " { $snippet "reject-tuples" } " handles query results one by one, thus avoiding the overhead of allocating the intermediate array of tuples, which " { $link select-tuples } " would do. This is important when processing large amounts of data in limited memory." }
-{ $warning "This word will delete your data." } ;
-
-{ insert-tuple update-tuple update-tuples delete-tuples reject-tuples } related-words
+{ insert-tuple update-tuple update-tuples delete-tuples } related-words
 
 HELP: each-tuple
 { $values
@@ -211,10 +200,7 @@ ARTICLE: "db-tuples-words" "High-level tuple/database words"
     update-tuples
 }
 "Deleting tuples:"
-{ $subsections
-    delete-tuples
-    reject-tuples
-}
+{ $subsections delete-tuples }
 "Querying tuples:"
 { $subsections
     each-tuple

diff --git a/basis/db/tuples/tuples-tests.factor b/basis/db/tuples/tuples-tests.factor
index 90a8e0afa91ab568edbe214818de601d0dd74ad1..275f47f89e78efb38bf495191fcba3607a66b6d8 100644 (file)
--- a/basis/db/tuples/tuples-tests.factor
+++ b/basis/db/tuples/tuples-tests.factor
@@ -690,12 +690,6 @@ select-me "select_me"
         ] update-tuples
         select-me new [ data>> ] collector [ each-tuple ] dip
         natural-sort
-    ] unit-test
-
-    [ { "test2" } ] [
-        select-me new [ data>> "test1" = ] reject-tuples
-        select-me new [ data>> ] collector [ each-tuple ] dip
-        natural-sort
     ] unit-test ;
 
 [ test-mapping ] test-sqlite

diff --git a/basis/db/tuples/tuples.factor b/basis/db/tuples/tuples.factor
index e4422eea89334a2b69d28f0d6759241bca6918d2..293a9b42e4f9b390f22444ec3922a3a4ff5898af 100644 (file)
--- a/basis/db/tuples/tuples.factor
+++ b/basis/db/tuples/tuples.factor
@@ -163,6 +163,3 @@ ERROR: no-defined-persistent object ;
 
 : update-tuples ( query/tuple quot: ( tuple -- tuple'/f ) -- )
     '[ @ [ update-tuple ] when* ] each-tuple ; inline
-
-: reject-tuples ( query/tuple quot: ( tuple -- ? ) -- )
-    '[ dup @ [ delete-tuples ] [ drop ] if ] each-tuple ; inline