svn commit: r1001847 - in /subversion/trunk/subversion/libsvn_wc: upgrade.c wc-queries.sql

[ph...@apache.org]

Author: philip
Date: Mon Sep 27 18:13:10 2010
New Revision: 1001847

URL: http://svn.apache.org/viewvc?rev=1001847&view=rev
Log:
Make upgrade_test.py 7 PASS with SVN_WC__NODES_ONLY.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_ALL_FILES_1): New.

* subversion/libsvn_wc/upgrade.c
  (get_versioned_files): Add NODES support.

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

Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1001847&r1=1001846&r2=1001847&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Mon Sep 27 18:13:10 2010
@@ -346,7 +346,11 @@ get_versioned_files(const apr_array_head
   svn_boolean_t have_row;
 
   /* ### just select 'file' children. do we need 'symlink' in the future?  */
+#ifndef SVN_WC__NODES_ONLY
   SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_SELECT_ALL_FILES));
+#else
+  SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_SELECT_ALL_FILES_1));
+#endif
   SVN_ERR(svn_sqlite__bindf(stmt, "s", parent_relpath));
 
   /* ### 10 is based on Subversion's average of 8.5 files per versioned

Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1001847&r1=1001846&r2=1001847&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Mon Sep 27 18:13:10 2010
@@ -895,6 +895,11 @@ UNION
 SELECT local_relpath FROM working_node
 WHERE kind = 'file' AND parent_relpath = ?1;
 
+-- STMT_SELECT_ALL_FILES_1
+/* Should this select on wc_id as well? */
+SELECT DISTINCT local_relpath FROM nodes
+WHERE kind = 'file' AND parent_relpath = ?1;
+
 -- STMT_PLAN_PROP_UPGRADE
 SELECT 0, presence, wc_id FROM base_node WHERE local_relpath = ?1
 UNION ALL