svn commit: r1127909 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

[ph...@apache.org]

Author: philip
Date: Thu May 26 13:44:33 2011
New Revision: 1127909

URL: http://svn.apache.org/viewvc?rev=1127909&view=rev
Log:
* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_ABSENT_NODES): Rename too...
  (STMT_HAS_ABSENT_NODES): ...this since it doesn't select all absent nodes.

* subversion/libsvn_wc/wc_db.c
  (catch_copy_of_absent, op_delete_txn): Adjust for rename.

Suggested by: gstein

Modified:
    subversion/trunk/subversion/libsvn_wc/wc-queries.sql
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1127909&r1=1127908&r2=1127909&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Thu May 26 13:44:33 2011
@@ -812,7 +812,7 @@ SELECT 1 FROM nodes WHERE wc_id = ?1 AND
 LIMIT 1
 
 /* ### This doesn't select all absent nodes, it only selects one of them. */
--- STMT_SELECT_ABSENT_NODES
+-- STMT_HAS_ABSENT_NODES
 SELECT local_relpath FROM nodes
 WHERE wc_id = ?1 AND (local_relpath = ?2 OR local_relpath LIKE ?3 ESCAPE '#')
   AND op_depth = 0 AND presence = 'absent' LIMIT 1

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1127909&r1=1127908&r2=1127909&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu May 26 13:44:33 2011
@@ -4037,7 +4037,7 @@ catch_copy_of_absent(svn_wc__db_wcroot_t
   const char *absent_relpath;
 
   SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
-                                    STMT_SELECT_ABSENT_NODES));
+                                    STMT_HAS_ABSENT_NODES));
   SVN_ERR(svn_sqlite__bindf(stmt, "iss",
                             wcroot->wc_id,
                             local_relpath,
@@ -6082,7 +6082,7 @@ op_delete_txn(void *baton,
   like_arg = construct_like_arg(local_relpath, scratch_pool);
 
   SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
-                                    STMT_SELECT_ABSENT_NODES));
+                                    STMT_HAS_ABSENT_NODES));
   SVN_ERR(svn_sqlite__bindf(stmt, "iss",
                             wcroot->wc_id, local_relpath, like_arg));
   SVN_ERR(svn_sqlite__step(&have_row, stmt));