You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/05/26 15:30:06 UTC

svn commit: r1127899 - in /subversion/trunk/subversion: libsvn_wc/wc_db_private.h libsvn_wc/wc_db_util.c libsvn_wc/wc_db_wcroot.c tests/libsvn_wc/db-test.c tests/libsvn_wc/entries-compat.c tests/libsvn_wc/op-depth-test.c

Author: julianfoad
Date: Thu May 26 13:30:05 2011
New Revision: 1127899

URL: http://svn.apache.org/viewvc?rev=1127899&view=rev
Log:
Make all WC test programs use svn_wc__db_util_open_db() instead of calling
svn_sqlite__open() directly, to ensure that the SQLite user-defined function
'relpath_depth' gets installed in the DB connection.  That function will be
needed by the validation triggers in wc-checks.c as soon as we activate
them.

* subversion/libsvn_wc/wc_db_private.h,
  subversion/libsvn_wc/wc_db_util.c
  (svn_wc__db_util_open_db): Add an optional parameter to specify the list
    of statements to prepare instead of the default set. Write a doc string.

* subversion/libsvn_wc/wc_db.c
  (create_db): Update the call to svn_wc__db_util_open_db().

* subversion/libsvn_wc/wc_db_wcroot.c
  (svn_wc__db_wcroot_parse_local_abspath): Same.

* subversion/tests/libsvn_wc/db-test.c
  (create_fake_wc): Call svn_wc__db_wcroot_parse_local_abspath() instead of
    svn_sqlite__open().

* subversion/tests/libsvn_wc/entries-compat.c
  (make_one_db): Same.

* subversion/tests/libsvn_wc/op-depth-test.c
  (open_wc_db): Same.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db_private.h
    subversion/trunk/subversion/libsvn_wc/wc_db_util.c
    subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/trunk/subversion/tests/libsvn_wc/db-test.c
    subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
    subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_private.h?rev=1127899&r1=1127898&r2=1127899&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_private.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_private.h Thu May 26 13:30:05 2011
@@ -155,12 +155,20 @@ svn_wc__db_util_fetch_wc_id(apr_int64_t 
                             svn_sqlite__db_t *sdb,
                             apr_pool_t *scratch_pool);
 
-/* */
+/* Open a connection in *SDB to the WC database found in the WC metadata
+ * directory inside DIR_ABSPATH, having the filename SDB_FNAME.
+ *
+ * SMODE is passed to svn_sqlite__open().
+ *
+ * Register MY_STATEMENTS, or if that is null, the default set of WC DB
+ * statements, as the set of statements to be prepared now and
+ * executed later.  See svn_sqlite__open() for details. */
 svn_error_t *
 svn_wc__db_util_open_db(svn_sqlite__db_t **sdb,
                         const char *dir_abspath,
                         const char *sdb_fname,
                         svn_sqlite__mode_t smode,
+                        const char *const *my_statements,
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool);
 

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_util.c?rev=1127899&r1=1127898&r2=1127899&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_util.c Thu May 26 13:30:05 2011
@@ -114,13 +114,15 @@ svn_wc__db_util_open_db(svn_sqlite__db_t
                         const char *dir_abspath,
                         const char *sdb_fname,
                         svn_sqlite__mode_t smode,
+                        const char *const *my_statements,
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool)
 {
   const char *sdb_abspath = svn_wc__adm_child(dir_abspath, sdb_fname,
                                               scratch_pool);
 
-  SVN_ERR(svn_sqlite__open(sdb, sdb_abspath, smode, statements,
+  SVN_ERR(svn_sqlite__open(sdb, sdb_abspath, smode,
+                           my_statements ? my_statements : statements,
                            0, NULL, result_pool, scratch_pool));
 
   SVN_ERR(svn_sqlite__create_scalar_function(*sdb, "relpath_depth", 1,

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c?rev=1127899&r1=1127898&r2=1127899&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c Thu May 26 13:30:05 2011
@@ -469,7 +469,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv
          we're caching database handles, it make sense to be as permissive
          as the filesystem allows. */
       err = svn_wc__db_util_open_db(&sdb, local_abspath, SDB_FILE,
-                                    svn_sqlite__mode_readwrite,
+                                    svn_sqlite__mode_readwrite, NULL,
                                     db->state_pool, scratch_pool);
       if (err == NULL)
         break;

Modified: subversion/trunk/subversion/tests/libsvn_wc/db-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/db-test.c?rev=1127899&r1=1127898&r2=1127899&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Thu May 26 13:30:05 2011
@@ -42,6 +42,8 @@
 #include "../../libsvn_wc/wc.h"
 #include "../../libsvn_wc/wc_db.h"
 #include "../../libsvn_wc/wc-queries.h"
+#define SVN_WC__I_AM_WC_DB
+#include "../../libsvn_wc/wc_db_private.h"
 
 #include "private/svn_wc_private.h"
 
@@ -330,10 +332,9 @@ create_fake_wc(const char *subdir_abspat
 
   SVN_ERR(svn_io_make_dir_recursively(dotsvn_abspath, scratch_pool));
   svn_error_clear(svn_io_remove_file(db_abspath, scratch_pool));
-  SVN_ERR(svn_sqlite__open(&sdb, db_abspath, svn_sqlite__mode_rwcreate,
-                           my_statements,
-                           0, NULL,
-                           scratch_pool, scratch_pool));
+  SVN_ERR(svn_wc__db_util_open_db(&sdb, subdir_abspath, "wc.db",
+                                  svn_sqlite__mode_rwcreate, my_statements,
+                                  scratch_pool, scratch_pool));
 
   for (i = 0; my_statements[i] != NULL; i++)
     SVN_ERR(svn_sqlite__exec_statements(sdb, /* my_statements[] */ i));

Modified: subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c?rev=1127899&r1=1127898&r2=1127899&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c Thu May 26 13:30:05 2011
@@ -321,10 +321,9 @@ make_one_db(const char *wc_abspath,
   SVN_ERR(svn_io_make_dir_recursively(dotsvn_abspath, scratch_pool));
 
   svn_error_clear(svn_io_remove_file(db_abspath, scratch_pool));
-  SVN_ERR(svn_sqlite__open(&sdb, db_abspath, svn_sqlite__mode_rwcreate,
-                           my_statements,
-                           0, NULL,
-                           scratch_pool, scratch_pool));
+  SVN_ERR(svn_wc__db_util_open_db(&sdb, wc_abspath, "wc.db",
+                                  svn_sqlite__mode_rwcreate, my_statements,
+                                  scratch_pool, scratch_pool));
 
   for (i = 0; my_statements[i] != NULL; i++)
     SVN_ERR(svn_sqlite__exec_statements(sdb, /* my_statements[] */ i));

Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1127899&r1=1127898&r2=1127899&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Thu May 26 13:30:05 2011
@@ -42,6 +42,8 @@
 #include "private/svn_sqlite.h"
 #include "../../libsvn_wc/wc.h"
 #include "../../libsvn_wc/wc_db.h"
+#define SVN_WC__I_AM_WC_DB
+#include "../../libsvn_wc/wc_db_private.h"
 
 #include "../svn_test.h"
 
@@ -73,12 +75,9 @@ open_wc_db(svn_sqlite__db_t **sdb,
            apr_pool_t *result_pool,
            apr_pool_t *scratch_pool)
 {
-  const char *dbpath = svn_dirent_join_many(scratch_pool,
-                                            wc_root_abspath, ".svn", "wc.db",
-                                            NULL);
-  SVN_ERR(svn_sqlite__open(sdb, dbpath, svn_sqlite__mode_readonly,
-                           my_statements, 0, NULL,
-                           result_pool, scratch_pool));
+  SVN_ERR(svn_wc__db_util_open_db(sdb, wc_root_abspath, "wc.db",
+                                  svn_sqlite__mode_readonly, my_statements,
+                                  result_pool, scratch_pool));
   return SVN_NO_ERROR;
 }