From 4ba2ac3e786e671403aad975b7c8eddfe7028525 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 30 Dec 2018 22:29:54 -0600 Subject: [PATCH] Revert "db.tuples[{-docs,-tests}]: add reject-tuples" This reverts commit 6cae2046b5df5ad975206a0eb09e3d64d56f9897. --- basis/db/tuples/tuples-docs.factor | 18 ++---------------- basis/db/tuples/tuples-tests.factor | 6 ------ basis/db/tuples/tuples.factor | 3 --- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/basis/db/tuples/tuples-docs.factor b/basis/db/tuples/tuples-docs.factor index 1d9d915b00..fecfdff3ee 100644 --- 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 90a8e0afa9..275f47f89e 100644 --- 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 e4422eea89..293a9b42e4 100644 --- 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