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

[ph...@apache.org]

Author: philip
Date: Wed Oct 13 22:07:53 2010
New Revision: 1022308

URL: http://svn.apache.org/viewvc?rev=1022308&view=rev
Log:
Remove a multi-dbism; in single-db tree conflicts are no longer always
recorded on wcroot.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_INSERT_ACTUAL_TREE_CONFLICTS): Add parent_relpath.

* subversion/libsvn_wc/wc_db.c
  (set_tc_txn): Bind parent_relpath.

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=1022308&r1=1022307&r2=1022308&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Wed Oct 13 22:07:53 2010
@@ -205,11 +205,9 @@ UPDATE actual_node SET tree_conflict_dat
 WHERE wc_id = ?1 AND local_relpath = ?2;
 
 -- STMT_INSERT_ACTUAL_TREE_CONFLICTS
-/* tree conflicts are always recorded on the wcroot node, so the
-   parent_relpath will be null.  */
 INSERT INTO actual_node (
-  wc_id, local_relpath, tree_conflict_data)
-VALUES (?1, ?2, ?3);
+  wc_id, local_relpath, tree_conflict_data, parent_relpath)
+VALUES (?1, ?2, ?3, ?4);
 
 -- STMT_UPDATE_ACTUAL_TEXT_CONFLICTS
 UPDATE actual_node SET conflict_old = ?3, conflict_new = ?4,

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1022308&r1=1022307&r2=1022308&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Oct 13 22:07:53 2010
@@ -3700,6 +3700,11 @@ set_tc_txn(void *baton, svn_sqlite__db_t
   SVN_ERR(svn_sqlite__bindf(stmt, "iss", stb->wc_id, stb->local_relpath,
                             tree_conflict_data));
 
+  if (!have_row && stb->local_relpath[0])
+    SVN_ERR(svn_sqlite__bind_text(stmt, 4,
+                                  svn_dirent_dirname(stb->local_relpath,
+                                                     scratch_pool)));
+
   return svn_error_return(svn_sqlite__step_done(stmt));
 }