You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by David Glasser <gl...@davidglasser.net> on 2007/11/30 03:18:40 UTC

Re: svn commit: r28158 - in branches/issue-2897/subversion: include/private libsvn_fs_util libsvn_ra_neon libsvn_ra_serf libsvn_ra_svn mod_dav_svn mod_dav_svn/reports

On Nov 29, 2007 5:29 PM,  <kf...@tigris.org> wrote:
> Modified: branches/issue-2897/subversion/libsvn_fs_util/sqlite-util.c
> URL: http://svn.collab.net/viewvc/svn/branches/issue-2897/subversion/libsvn_fs_util/sqlite-util.c?pathrev=28158&r1=28157&r2=28158
> ==============================================================================
> --- branches/issue-2897/subversion/libsvn_fs_util/sqlite-util.c (original)
> +++ branches/issue-2897/subversion/libsvn_fs_util/sqlite-util.c Thu Nov 29 17:29:04 2007
> @@ -174,15 +174,18 @@
>  /* Time (in milliseconds) to wait for sqlite locks before giving up. */
>  #define BUSY_TIMEOUT 10000
>
> +#define MERGINFO_TABLE_SCHEMA                                           \
> +  "CREATE TABLE mergeinfo (revision INTEGER NOT NULL, mergedfrom TEXT " \
> +  "NOT NULL, mergedto TEXT NOT NULL, mergedrevstart INTEGER NOT NULL, " \
> +  "mergedrevend INTEGER NOT NULL, inheritable INTEGER NOT NULL);"
> +
>  static const char *schema_create_sql[] = {
>    NULL, /* An empty database is format 0 */
>
>    /* USER_VERSION 1 */
>    "PRAGMA auto_vacuum = 1;"
>    APR_EOL_STR
> -  "CREATE TABLE mergeinfo (revision INTEGER NOT NULL, mergedfrom TEXT NOT "
> -  "NULL, mergedto TEXT NOT NULL, mergedrevstart INTEGER NOT NULL, "
> -  "mergedrevend INTEGER NOT NULL, inheritable INTEGER NOT NULL);"
> +  MERGINFO_TABLE_SCHEMA
>    APR_EOL_STR
>    "CREATE INDEX mi_mergedfrom_idx ON mergeinfo (mergedfrom);"
>    APR_EOL_STR
> @@ -190,9 +193,7 @@
>    APR_EOL_STR
>    "CREATE INDEX mi_revision_idx ON mergeinfo (revision);"
>    APR_EOL_STR
> -  "CREATE TABLE mergeinfo_changed (revision INTEGER NOT NULL, mergedfrom TEXT "
> -  "NOT NULL, mergedto TEXT NOT NULL, mergedrevstart INTEGER NOT NULL, "
> -  "mergedrevend INTEGER NOT NULL, inheritable INTEGER NOT NULL);"
> +  MERGINFO_TABLE_SCHEMA
>    APR_EOL_STR
>    "CREATE UNIQUE INDEX "
>    "mi_c_merge_source_target_revstart_end_commit_rev_idx "

First, that probably wants to be MERGEINFO_TABLE_SCHEMA with an E, right?

Secondly, this will try to make the same table twice.  I guess you
want to just put the part within the parentheses into the comment.

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r28158 - in branches/issue-2897/subversion: include/private libsvn_fs_util libsvn_ra_neon libsvn_ra_serf libsvn_ra_svn mod_dav_svn mod_dav_svn/reports

Posted by Karl Fogel <kf...@red-bean.com>.
"David Glasser" <gl...@davidglasser.net> writes:
> First, that probably wants to be MERGEINFO_TABLE_SCHEMA with an E, right?

D'oh!  I always do that.

> Secondly, this will try to make the same table twice.  I guess you
> want to just put the part within the parentheses into the comment.

...whereas this is the first time I've done *that*, so clearly I'm
making some sort of progress!

Thanks for the review, David.  Fixed in r28159.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org