svn commit: r1299820 - /subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c

[st...@apache.org]

Author: stsp
Date: Mon Mar 12 20:11:57 2012
New Revision: 1299820

URL: http://svn.apache.org/viewvc?rev=1299820&view=rev
Log:
On the multi-layer-moves branch: Follow-up fix of r1299817:

* subversion/libsvn_wc/wc_db.c
  (insert_incomplete_children): Reset SQL statement during each iteration,
    else sqlite complains about out-of-sequence API calls.

Modified:
    subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c

Modified: subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c?rev=1299820&r1=1299819&r2=1299820&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c Mon Mar 12 20:11:57 2012
@@ -979,8 +979,6 @@ insert_incomplete_children(svn_sqlite__d
    * such nodes in order not to lose move information during replace. */
   if (op_depth > 0)
     {
-      SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_SELECT_WORKING_NODE));
-
       for (i = children->nelts; i--; )
         {
           const char *name = APR_ARRAY_IDX(children, i, const char *);
@@ -988,6 +986,8 @@ insert_incomplete_children(svn_sqlite__d
 
           svn_pool_clear(iterpool);
 
+          SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
+                                            STMT_SELECT_WORKING_NODE));
           SVN_ERR(svn_sqlite__bindf(stmt, "is", wc_id,
                                     svn_relpath_join(local_relpath, name,
                                                      iterpool)));
@@ -995,9 +995,9 @@ insert_incomplete_children(svn_sqlite__d
           if (have_row && !svn_sqlite__column_is_null(stmt, 14))
             apr_hash_set(moved_to_relpaths, name, APR_HASH_KEY_STRING,
               svn_sqlite__column_text(stmt, 14, scratch_pool));
-        }
 
-      SVN_ERR(svn_sqlite__reset(stmt));
+          SVN_ERR(svn_sqlite__reset(stmt));
+        }
     }
 
   SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_INSERT_NODE));