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 2010/10/06 18:23:47 UTC
svn commit: r1005107 - in /subversion/trunk/subversion:
libsvn_wc/wc-metadata.sql tests/libsvn_wc/db-test.c
tests/libsvn_wc/entries-compat.c
Author: julianfoad
Date: Wed Oct 6 16:23:46 2010
New Revision: 1005107
URL: http://svn.apache.org/viewvc?rev=1005107&view=rev
Log:
Re-order the columns in the NODES table so that they're grouped more
logically. Part 4: move 'symlink_target'.
* subversion/libsvn_wc/wc-metadata.sql
(NODES): Move a column.
* subversion/tests/libsvn_wc/db-test.c
(TESTING_DATA): Adjust.
* subversion/tests/libsvn_wc/entries-compat.c
(TESTING_DATA, M_TESTING_DATA): Adjust.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=1005107&r1=1005106&r2=1005107&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Wed Oct 6 16:23:46 2010
@@ -806,6 +806,9 @@ CREATE TABLE NODES (
moved here or copied here, else NULL. */
checksum TEXT,
+ /* for kind==symlink, this specifies the target. */
+ symlink_target TEXT,
+
/* Last-Change fields */
@@ -845,9 +848,6 @@ CREATE TABLE NODES (
node does not have any dav-cache. */
dav_cache BLOB,
- /* for kind==symlink, this specifies the target. */
- symlink_target TEXT,
-
/* The serialized file external information. */
/* ### hack. hack. hack.
### This information is already stored in properties, but because the
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=1005107&r1=1005106&r2=1005107&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Wed Oct 6 16:23:46 2010
@@ -193,84 +193,84 @@ static const char * const TESTING_DATA =
/* load the base nodes into the nodes table */
"insert into nodes values ("
" 1, '', 0, null, 1, '', 1, 'normal',"
- " null, null, 'dir', '()', 'infinity', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', 'infinity', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'A', 0, '', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 10, null, null, null, null);"
+ " null, null, 'file', '()', null, '$md5 $" MD5_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 10, null, null, null);"
"insert into nodes values ("
" 1, 'B', 0, '', null, null, null, 'excluded',"
- " null, null, 'symlink', null, null, null, null, null, null,"
- " null, null, null, null, null);"
+ " null, null, 'symlink', null, null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'C', 0, '', null, null, null, 'absent',"
- " null, null, 'unknown', null, null, null, null, null, null,"
- " null, null, null, null, null);"
+ " null, null, 'unknown', null, null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'D', 0, '', null, null, null, 'not-present',"
- " null, null, 'unknown', null, null, null, null, null, null,"
- " null, null, null, null, null);"
+ " null, null, 'unknown', null, null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'E', 0, '', null, null, null, 'incomplete',"
- " null, null, 'unknown', null, null, null, null, null, null,"
- " null, null, null, null, null);"
+ " null, null, 'unknown', null, null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'F', 0, '', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 15, null, null, null);"
"insert into nodes values ("
" 1, 'G', 0, '', 2, 'G-alt', 1, 'normal',"
- " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', 2, " TIME_2s ", '" AUTHOR_2 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
+ " 15, null, null, null);"
"insert into nodes values ("
" 1, 'H', 0, '', null, null, 1, 'normal',"
- " null, null, 'symlink', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, 'H-target', null);"
+ " null, null, 'symlink', '()', null, null, 'H-target', 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'I', 0, '', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J', 0, '', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e', 0, 'J', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-a', 0, 'J/J-e', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 15, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b', 0, 'J/J-e', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b/Jeba', 0, 'J/J-e/J-e-b', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 15, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f', 0, 'J', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f/J-f-a', 0, 'J/J-f', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'K', 0, '', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-a', 0, 'K', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 15, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-b', 0, 'K', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$sha1$" SHA1_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 15, null, null, null);"
""
#endif
#ifndef SVN_WC__NODES_ONLY
@@ -387,88 +387,88 @@ static const char * const TESTING_DATA =
the value 1 is just 'good enough' to make the nodes WORKING nodes. */
"insert into nodes values ("
" 1, 'I', 1, '', 2, 'some/dir', 2, 'normal',"
- " 0, null, 'dir', '()', 'immediates', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, 2, " TIME_2s ", '" AUTHOR_2 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J', 1, '', null, null, null, 'normal',"
- " 0, null, 'dir', '()', 'immediates', null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-a', 1, 'J', null, null, null, 'normal',"
- " 0, null, 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b', 1, 'J', 2, 'some/dir', 2, 'normal',"
- " 0, null, 'dir', '()', 'infinity', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'infinity', null, null, 2, " TIME_2s ", '" AUTHOR_2 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b/J-b-a', 1, 'J/J-b', 2, 'another/dir', 2, 'normal',"
- " 0, null, 'dir', '()', 'infinity', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'infinity', null, null, 2, " TIME_2s ", '" AUTHOR_2 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b/J-b-b', 1, 'J/J-b', null, null, null, 'normal',"
- " 0, null, 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-c', 1, 'J', null, null, null, 'not-present',"
- " 0, null, 'dir', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-c/J-c-a', 1, 'J/J-c', null, null, null, 'not-present',"
- " 0, null, 'dir', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-d', 1, 'J', 2, 'moved/file', 2, 'normal',"
- " 1, null, 'file', '()', null, '$md5 $" MD5_1 "', 2, " TIME_2s ", '" AUTHOR_2 "',"
- " 10, null, null, null, null);"
+ " 1, null, 'file', '()', null, '$md5 $" MD5_1 "', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
+ " 10, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e', 1, 'J', null, null, null, 'not-present',"
- " 0, 'other/place', 'dir', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, 'other/place', 'dir', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-a', 1, 'J/J-e', null, null, null, 'not-present',"
- " 0, null, 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b', 1, 'J/J-e', null, null, null, 'not-present',"
- " 0, null, 'dir', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b/Jeba', 1, 'J/J-e/J-e-b', null, null, null, 'base-deleted',"
- " 0, null, 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f', 1, 'J', null, null, null, 'normal',"
- " 0, null, 'dir', '()', 'immediates', null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f/J-f-a', 1, 'J/J-f', null, null, null,"
- " 'immediates', 0, null, 'dir', '()', 'base-deleted', null, null, null, null,"
- " null, null, null, null, null);"
+ " 'immediates', 0, null, 'dir', '()', 'base-deleted', null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'K', 1, '', null, null, null, 'base-deleted',"
- " 0, null, 'dir', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-a', 1, 'K', null, null, null, 'base-deleted',"
- " 0, null, 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-b', 1, 'K', null, null, null, 'base-deleted',"
- " 0, 'moved/away', 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, 'moved/away', 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'L', 1, '', null, null, null, 'normal',"
- " 0, null, 'dir', '()', 'immediates', null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'L/L-a', 1, 'L', null, null, null, 'not-present',"
- " 0, null, 'dir', '()', 'immediates', null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'L/L-a/L-a-a', 1, 'L', null, null, null, 'not-present',"
- " 0, null, 'dir', '()', 'immediates', null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
+ " null, null, null, null);"
#endif
"insert into actual_node values ("
" 1, 'I', '', null, null, null, null, null, 'changelist', null, "
@@ -489,12 +489,12 @@ static const char * const TESTING_DATA =
#ifdef SVN_WC__NODES
"insert into nodes values ("
" 1, 'M', 0, '', null, null, null, 'normal', "
- " 1, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " 1, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'M/M-a', 1, 'M', null, null, null, 'not-present', "
- " null, null, 'file', '()', null, null, null, null, null,"
- " null, 0, null, null, null);"
+ " null, null, 'file', '()', null, null, null, null, null, null,"
+ " null, 0, null, null);"
#endif
);
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=1005107&r1=1005106&r2=1005107&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c Wed Oct 6 16:23:46 2010
@@ -193,84 +193,84 @@ static const char * const TESTING_DATA =
/* load the base nodes into the nodes table */
"insert into nodes values ("
" 1, '', 0, null, 1, '', 1, 'normal',"
- " null, null, 'dir', '()', 'infinity', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', 'infinity', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'A', 0, '', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 10, null, null, null, null);"
+ " null, null, 'file', '()', null, '$md5 $" MD5_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 10, null, null, null);"
"insert into nodes values ("
" 1, 'B', 0, '', null, null, null, 'excluded',"
- " null, null, 'symlink', null, null, null, null, null, null,"
- " null, null, null, null, null);"
+ " null, null, 'symlink', null, null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'C', 0, '', null, null, null, 'absent',"
- " null, null, 'unknown', null, null, null, null, null, null,"
- " null, null, null, null, null);"
+ " null, null, 'unknown', null, null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'D', 0, '', null, null, null, 'not-present',"
- " null, null, 'unknown', null, null, null, null, null, null,"
- " null, null, null, null, null);"
+ " null, null, 'unknown', null, null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'E', 0, '', null, null, null, 'incomplete',"
- " null, null, 'unknown', null, null, null, null, null, null,"
- " null, null, null, null, null);"
+ " null, null, 'unknown', null, null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'F', 0, '', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$md5 $" MD5_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 15, null, null, null);"
"insert into nodes values ("
" 1, 'G', 0, '', 2, 'G-alt', 1, 'normal',"
- " null, null, 'file', '()', null, '$md5 $" MD5_1 "', 2, " TIME_2s ", '" AUTHOR_2 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$md5 $" MD5_1 "', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
+ " 15, null, null, null);"
"insert into nodes values ("
" 1, 'H', 0, '', null, null, 1, 'normal',"
- " null, null, 'symlink', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, 'H-target', null);"
+ " null, null, 'symlink', '()', null, null, 'H-target', 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'I', 0, '', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J', 0, '', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e', 0, 'J', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-a', 0, 'J/J-e', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$md5 $" MD5_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 15, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b', 0, 'J/J-e', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b/Jeba', 0, 'J/J-e/J-e-b', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$md5 $" MD5_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 15, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f', 0, 'J', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f/J-f-a', 0, 'J/J-f', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'K', 0, '', null, null, 1, 'normal',"
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-a', 0, 'K', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$md5 $" MD5_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 15, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-b', 0, 'K', null, null, 1, 'normal',"
- " null, null, 'file', '()', null, '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
- " 15, null, null, null, null);"
+ " null, null, 'file', '()', null, '$md5 $" MD5_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " 15, null, null, null);"
""
#endif
#ifndef SVN_WC__NODES_ONLY
@@ -387,88 +387,88 @@ static const char * const TESTING_DATA =
the value 1 is just 'good enough' to make the nodes WORKING nodes. */
"insert into nodes values ("
" 1, 'I', 1, '', 2, 'some/dir', 2, 'normal',"
- " 0, null, 'dir', '()', 'immediates', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, 2, " TIME_2s ", '" AUTHOR_2 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J', 1, '', null, null, null, 'normal',"
- " 0, null, 'dir', '()', 'immediates', null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-a', 1, 'J', null, null, null, 'normal',"
- " 0, null, 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b', 1, 'J', 2, 'some/dir', 2, 'normal',"
- " 0, null, 'dir', '()', 'infinity', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'infinity', null, null, 2, " TIME_2s ", '" AUTHOR_2 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b/J-b-a', 1, 'J/J-b', 2, 'another/dir', 2, 'normal',"
- " 0, null, 'dir', '()', 'infinity', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'infinity', null, null, 2, " TIME_2s ", '" AUTHOR_2 "',"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b/J-b-b', 1, 'J/J-b', null, null, null, 'normal',"
- " 0, null, 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-c', 1, 'J', null, null, null, 'not-present',"
- " 0, null, 'dir', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-c/J-c-a', 1, 'J/J-c', null, null, null, 'not-present',"
- " 0, null, 'dir', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-d', 1, 'J', 2, 'moved/file', 2, 'normal',"
- " 1, null, 'file', '()', null, '$md5 $" MD5_1 "', 2, " TIME_2s ", '" AUTHOR_2 "',"
- " 10, null, null, null, null);"
+ " 1, null, 'file', '()', null, '$md5 $" MD5_1 "', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
+ " 10, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e', 1, 'J', null, null, null, 'not-present',"
- " 0, 'other/place', 'dir', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, 'other/place', 'dir', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-a', 1, 'J/J-e', null, null, null, 'not-present',"
- " 0, null, 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b', 1, 'J/J-e', null, null, null, 'not-present',"
- " 0, null, 'dir', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b/Jeba', 1, 'J/J-e/J-e-b', null, null, null, 'base-deleted',"
- " 0, null, 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f', 1, 'J', null, null, null, 'normal',"
- " 0, null, 'dir', '()', 'immediates', null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f/J-f-a', 1, 'J/J-f', null, null, null, 'base-deleted',"
- " 0, null, 'dir', '()', 'immediates', null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'K', 1, '', null, null, null, 'base-deleted',"
- " 0, null, 'dir', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-a', 1, 'K', null, null, null, 'base-deleted',"
- " 0, null, 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-b', 1, 'K', null, null, null, 'base-deleted',"
- " 0, 'moved/away', 'file', '()', null, null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, 'moved/away', 'file', '()', null, null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'L', 1, '', null, null, null, 'normal',"
- " 0, null, 'dir', '()', 'immediates', null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'L/L-a', 1, 'L', null, null, null, 'not-present',"
- " 0, null, 'dir', '()', 'immediates', null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'L/L-a/L-a-a', 1, 'L', null, null, null, 'not-present',"
- " 0, null, 'dir', '()', 'immediates', null, null, null, null,"
- " null, null, null, null, null);"
+ " 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
+ " null, null, null, null);"
#endif
"insert into actual_node values ("
" 1, 'I', '', null, null, null, null, null, 'changelist', null, "
@@ -489,12 +489,12 @@ static const char * const TESTING_DATA =
#ifdef SVN_WC__NODES
"insert into nodes values ("
" 1, 'M', 0, '', null, null, 1, 'normal', "
- " null, null, 'dir', '()', null, null, 1, " TIME_1s ", '" AUTHOR_1 "', "
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "', "
+ " null, null, null, null);"
"insert into nodes values ("
" 1, 'M/M-a', 0, 'M', null, null, 1, 'not-present', "
- " null, null, 'file', '()', null, null, 1, null, null, "
- " null, null, null, null, null);"
+ " null, null, 'file', '()', null, null, null, 1, null, null, "
+ " null, null, null, null);"
#endif
);
@@ -519,8 +519,8 @@ static const char * const M_TESTING_DATA
#ifdef SVN_WC__NODES
"insert into nodes values ("
" 1, '', 0, null, 1, 'M', 1, 'normal',"
- " null, null, 'dir', '()', 'infinity', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
- " null, null, null, null, null);"
+ " null, null, 'dir', '()', 'infinity', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
+ " null, null, null, null);"
#endif
);