Author: stsp
Date: Tue Nov 1 17:12:47 2011
New Revision: 1196149
URL: http://svn.apache.org/viewvc?rev=1196149&view=rev
Log:
* subversion/libsvn_wc/wc-queries.sql
(STMT_INSERT_DELETE_LIST): Use the NODES_CURRENT view instead of manually
filtering by MAX(op_depth).
Modified:
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1196149&r1=1196148&r2=1196149&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Tue Nov 1 17:12:47
2011
@@ -1199,15 +1199,12 @@ CREATE TEMPORARY TABLE delete_list (
/* This matches the selection in STMT_INSERT_DELETE_FROM_NODE_RECURSIVE */
-- STMT_INSERT_DELETE_LIST
INSERT INTO delete_list(local_relpath)
-SELECT local_relpath FROM nodes n
+SELECT local_relpath FROM nodes_current
WHERE wc_id = ?1
AND (local_relpath = ?2
OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth >= ?3
AND presence NOT IN ('base-deleted', 'not-present', 'excluded', 'absent')
- AND op_depth = (SELECT MAX(op_depth) FROM nodes s
- WHERE s.wc_id = n.wc_id
- AND s.local_relpath = n.local_relpath)
-- STMT_SELECT_DELETE_LIST
SELECT local_relpath FROM delete_list
