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

[rh...@apache.org]

Author: rhuijben
Date: Fri Jun 29 19:38:33 2012
New Revision: 1355527

URL: http://svn.apache.org/viewvc?rev=1355527&view=rev
Log:
Remove unneeded/mostly duplicated query.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_CONFLICT_DETAILS): Remove query.

* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_read_conflicts): Update user.

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=1355527&r1=1355526&r2=1355527&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Fri Jun 29 19:38:33 2012
@@ -760,12 +760,6 @@ SELECT local_relpath, tree_conflict_data
 FROM actual_node
 WHERE wc_id = ?1 AND parent_relpath = ?2 AND tree_conflict_data IS NOT NULL
 
--- STMT_SELECT_CONFLICT_DETAILS
-SELECT prop_reject, conflict_old, conflict_new, conflict_working,
-    tree_conflict_data
-FROM actual_node
-WHERE wc_id = ?1 AND local_relpath = ?2
-
 -- STMT_CLEAR_TEXT_CONFLICT
 UPDATE actual_node SET
   conflict_old = NULL,

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1355527&r1=1355526&r2=1355527&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Jun 29 19:38:33 2012
@@ -11670,7 +11670,7 @@ svn_wc__db_read_conflicts(const apr_arra
 
   /* First look for text and property conflicts in ACTUAL */
   SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
-                                    STMT_SELECT_CONFLICT_DETAILS));
+                                    STMT_SELECT_ACTUAL_NODE));
   SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
 
   cflcts = apr_array_make(result_pool, 4,
@@ -11703,9 +11703,9 @@ svn_wc__db_read_conflicts(const apr_arra
           APR_ARRAY_PUSH(cflcts, svn_wc_conflict_description2_t*) = desc;
         }
 
-      conflict_old = svn_sqlite__column_text(stmt, 1, NULL);
-      conflict_new = svn_sqlite__column_text(stmt, 2, NULL);
-      conflict_working = svn_sqlite__column_text(stmt, 3, NULL);
+      conflict_old = svn_sqlite__column_text(stmt, 2, NULL);
+      conflict_new = svn_sqlite__column_text(stmt, 3, NULL);
+      conflict_working = svn_sqlite__column_text(stmt, 4, NULL);
 
       if (conflict_old || conflict_new || conflict_working)
         {
@@ -11727,7 +11727,7 @@ svn_wc__db_read_conflicts(const apr_arra
           APR_ARRAY_PUSH(cflcts, svn_wc_conflict_description2_t*) = desc;
         }
 
-      conflict_data = svn_sqlite__column_text(stmt, 4, scratch_pool);
+      conflict_data = svn_sqlite__column_text(stmt, 5, scratch_pool);
       if (conflict_data)
         {
           const svn_wc_conflict_description2_t *desc;