From 214949104497ecdc8f1169c25c47879caa607cd3 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Apr 2008 21:03:01 -0500
Subject: [PATCH] Rename delete-tuple to delete-tuples

---
 extra/db/queries/queries.factor      | 2 +-
 extra/db/tuples/tuples-tests.factor  | 4 ++--
 extra/db/tuples/tuples.factor        | 6 +++---
 extra/semantic-db/semantic-db.factor | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extra/db/queries/queries.factor b/extra/db/queries/queries.factor
index 43ca4f369c..6dab4f80b8 100644
--- a/extra/db/queries/queries.factor
+++ b/extra/db/queries/queries.factor
@@ -112,7 +112,7 @@ M: string where ( spec obj -- ) object-where ;
         ] interleave drop
     ] if ;
 
-M: db <delete-tuple-statement> ( tuple table -- sql )
+M: db <delete-tuples-statement> ( tuple table -- sql )
     [
         "delete from " 0% 0%
         where-clause
diff --git a/extra/db/tuples/tuples-tests.factor b/extra/db/tuples/tuples-tests.factor
index 8e6b9bfbe4..4da82d92d6 100755
--- a/extra/db/tuples/tuples-tests.factor
+++ b/extra/db/tuples/tuples-tests.factor
@@ -68,7 +68,7 @@ SYMBOL: person4
     ] [ T{ person f f f 10 3.14 } select-tuples ] unit-test
 
 
-    [ ] [ person1 get delete-tuple ] unit-test
+    [ ] [ person1 get delete-tuples ] unit-test
     [ f ] [ T{ person f 1 } select-tuple ] unit-test
 
     [ ] [ person3 get insert-tuple ] unit-test
@@ -418,7 +418,7 @@ TUPLE: does-not-persist ;
 \ bind-tuple must-infer
 \ insert-tuple must-infer
 \ update-tuple must-infer
-\ delete-tuple must-infer
+\ delete-tuples must-infer
 \ select-tuple must-infer
 \ define-persistent must-infer
 \ ensure-table must-infer
diff --git a/extra/db/tuples/tuples.factor b/extra/db/tuples/tuples.factor
index 835b4b45d3..5747fa7de7 100755
--- a/extra/db/tuples/tuples.factor
+++ b/extra/db/tuples/tuples.factor
@@ -40,7 +40,7 @@ HOOK: drop-sql-statement db ( class -- obj )
 HOOK: <insert-db-assigned-statement> db ( class -- obj )
 HOOK: <insert-user-assigned-statement> db ( class -- obj )
 HOOK: <update-tuple-statement> db ( class -- obj )
-HOOK: <delete-tuple-statement> db ( tuple class -- obj )
+HOOK: <delete-tuples-statement> db ( tuple class -- obj )
 HOOK: <select-by-slots-statement> db ( tuple class -- tuple )
 
 HOOK: insert-tuple* db ( tuple statement -- )
@@ -136,8 +136,8 @@ M: retryable execute-statement* ( statement type -- )
     db get db-update-statements [ <update-tuple-statement> ] cache
     [ bind-tuple ] keep execute-statement ;
 
-: delete-tuple ( tuple -- )
-    dup dup class <delete-tuple-statement> [
+: delete-tuples ( tuple -- )
+    dup dup class <delete-tuples-statement> [
         [ bind-tuple ] keep execute-statement
     ] with-disposal ;
 
diff --git a/extra/semantic-db/semantic-db.factor b/extra/semantic-db/semantic-db.factor
index 3ecda97584..8953281359 100755
--- a/extra/semantic-db/semantic-db.factor
+++ b/extra/semantic-db/semantic-db.factor
@@ -20,7 +20,7 @@ node "node"
     node create-table ;
 
 : delete-node ( node-id -- )
-    <id-node> delete-tuple ;
+    <id-node> delete-tuples ;
 
 : create-node* ( str -- node-id )
     <node> dup insert-tuple id>> ;
@@ -43,7 +43,7 @@ TUPLE: arc id relation subject object ;
     f <node> dup insert-tuple id>> >>id insert-tuple ;
 
 : delete-arc ( arc-id -- )
-    dup delete-node <id-arc> delete-tuple ;
+    dup delete-node <id-arc> delete-tuples ;
 
 : create-arc* ( relation subject object -- arc-id )
     <arc> dup insert-arc id>> ;