svn commit: r1000824 - /subversion/trunk/subversion/libsvn_wc/wc-queries.sql

[ph...@apache.org]

Author: philip
Date: Fri Sep 24 11:54:34 2010
New Revision: 1000824

URL: http://svn.apache.org/viewvc?rev=1000824&view=rev
Log:
Fix some SVN_WC__NODES queries.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_COUNT_WORKING_NODE_CHILDREN_1,
   STMT_SELECT_WORKING_NODE_CHILDREN_1): Use SELECT DISTINCT rather than
     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=1000824&r1=1000823&r2=1000824&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Fri Sep 24 11:54:34 2010
@@ -142,10 +142,9 @@ SELECT COUNT(*) FROM working_node
 WHERE wc_id = ?1 AND parent_relpath = ?2;
 
 -- STMT_COUNT_WORKING_NODE_CHILDREN_1
-SELECT COUNT(*) FROM nodes
-WHERE wc_id = ?1 AND parent_relpath = ?2
-  AND op_depth = (SELECT MAX(op_depth) FROM nodes
-                  WHERE wc_id = ?1 AND parent_relpath = ?2 AND op_depth > 0);
+SELECT COUNT(*) FROM (SELECT DISTINCT local_relpath FROM nodes
+                      WHERE wc_id = ?1 AND parent_relpath = ?2
+                      AND op_depth > 0);
 
 -- STMT_SELECT_BASE_NODE_CHILDREN
 SELECT local_relpath FROM base_node
@@ -160,10 +159,8 @@ SELECT local_relpath FROM working_node
 WHERE wc_id = ?1 AND parent_relpath = ?2;
 
 -- STMT_SELECT_WORKING_NODE_CHILDREN_1
-SELECT local_relpath FROM nodes
-WHERE wc_id = ?1 AND parent_relpath = ?2
-  AND op_depth = (SELECT MAX(op_depth) FROM nodes
-                  WHERE wc_id = ?1 AND parent_relpath = ?2 AND op_depth > 0);
+SELECT DISTINCT local_relpath FROM nodes
+WHERE wc_id = ?1 AND parent_relpath = ?2 AND op_depth > 0;
 
 -- STMT_SELECT_WORKING_IS_FILE
 SELECT kind == 'file' FROM working_node