You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by be...@qqmail.nl on 2020/06/25 17:41:37 UTC

RE: svn commit: r1879198 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

It looks like you get failures on this when you compile recent SQLite versions with OMIT_DEPRECATED.
(I just bumped several dependencies on the Windows buildbot in an attempt to fix the python breakage)

This should probably be backported...

	Bert


-----Oorspronkelijk bericht-----
Van: rhuijben@apache.org <rh...@apache.org> 
Verzonden: donderdag 25 juni 2020 19:12
Aan: commits@subversion.apache.org
Onderwerp: svn commit: r1879198 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

Author: rhuijben
Date: Thu Jun 25 17:11:44 2020
New Revision: 1879198

URL: http://svn.apache.org/viewvc?rev=1879198&view=rev
Log:
Fix invalid escape sequence in working copy queries which causes
upgrades from Subversion 1.7 working copies to fail with recent
SQLite versions (>= 3.29.0).

* subversion/libsvn_wc/wc-metadata.sql
  (STMT_UPGRADE_TO_30): Use '' to delimit values and "" to escape column names.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=1879198&r1=1879197&r2=1879198&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Thu Jun 25 17:11:44 2020
@@ -636,7 +636,7 @@ ON NODES (wc_id, moved_to, op_depth);
 
 CREATE INDEX IF NOT EXISTS I_PRISTINE_MD5 ON PRISTINE (md5_checksum);
 
-UPDATE nodes SET presence = "server-excluded" WHERE presence = "absent";
+UPDATE nodes SET presence = 'server-excluded' WHERE presence = 'absent';
 
 /* Just to be sure clear out file external skels from pre 1.7.0 development
    working copies that were never updated by 1.7.0+ style clients */

Re: svn commit: r1879198 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Daniel Shahaf wrote on Fri, 26 Jun 2020 13:27 +0000:
> bert@qqmail.nl wrote on Thu, 25 Jun 2020 19:41 +0200:
> > It looks like you get failures on this when you compile recent SQLite versions with OMIT_DEPRECATED.
> > (I just bumped several dependencies on the Windows buildbot in an attempt to fix the python breakage)
> > 
> > This should probably be backported...  
> 
> Nominated with my own vote only.  You may want to add yours.

Oh, you'd beat me to it.  I'll merge the nominations.  Sorry for the noise.

Re: svn commit: r1879198 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Daniel Shahaf wrote on Fri, 26 Jun 2020 13:27 +0000:
> bert@qqmail.nl wrote on Thu, 25 Jun 2020 19:41 +0200:
> > It looks like you get failures on this when you compile recent SQLite versions with OMIT_DEPRECATED.
> > (I just bumped several dependencies on the Windows buildbot in an attempt to fix the python breakage)
> > 
> > This should probably be backported...  
> 
> Nominated with my own vote only.  You may want to add yours.

Oh, you'd beat me to it.  I'll merge the nominations.  Sorry for the noise.

Re: svn commit: r1879198 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
bert@qqmail.nl wrote on Thu, 25 Jun 2020 19:41 +0200:
> It looks like you get failures on this when you compile recent SQLite versions with OMIT_DEPRECATED.
> (I just bumped several dependencies on the Windows buildbot in an attempt to fix the python breakage)
> 
> This should probably be backported...

Nominated with my own vote only.  You may want to add yours.

Cheers,

Daniel

> 	Bert
> 
> 
> -----Oorspronkelijk bericht-----
> Van: rhuijben@apache.org <rh...@apache.org> 
> Verzonden: donderdag 25 juni 2020 19:12
> Aan: commits@subversion.apache.org
> Onderwerp: svn commit: r1879198 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
> 
> Author: rhuijben
> Date: Thu Jun 25 17:11:44 2020
> New Revision: 1879198
> 
> URL: http://svn.apache.org/viewvc?rev=1879198&view=rev
> Log:
> Fix invalid escape sequence in working copy queries which causes
> upgrades from Subversion 1.7 working copies to fail with recent
> SQLite versions (>= 3.29.0).
> 
> * subversion/libsvn_wc/wc-metadata.sql
>   (STMT_UPGRADE_TO_30): Use '' to delimit values and "" to escape column names.
> 
> Modified:
>     subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
> 
> Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=1879198&r1=1879197&r2=1879198&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
> +++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Thu Jun 25 17:11:44 2020
> @@ -636,7 +636,7 @@ ON NODES (wc_id, moved_to, op_depth);
>  
>  CREATE INDEX IF NOT EXISTS I_PRISTINE_MD5 ON PRISTINE (md5_checksum);
>  
> -UPDATE nodes SET presence = "server-excluded" WHERE presence = "absent";
> +UPDATE nodes SET presence = 'server-excluded' WHERE presence = 'absent';
>  
>  /* Just to be sure clear out file external skels from pre 1.7.0 development
>     working copies that were never updated by 1.7.0+ style clients */
> 
> 
>

Re: svn commit: r1879198 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
bert@qqmail.nl wrote on Thu, 25 Jun 2020 19:41 +0200:
> It looks like you get failures on this when you compile recent SQLite versions with OMIT_DEPRECATED.
> (I just bumped several dependencies on the Windows buildbot in an attempt to fix the python breakage)
> 
> This should probably be backported...

Nominated with my own vote only.  You may want to add yours.

Cheers,

Daniel

> 	Bert
> 
> 
> -----Oorspronkelijk bericht-----
> Van: rhuijben@apache.org <rh...@apache.org> 
> Verzonden: donderdag 25 juni 2020 19:12
> Aan: commits@subversion.apache.org
> Onderwerp: svn commit: r1879198 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
> 
> Author: rhuijben
> Date: Thu Jun 25 17:11:44 2020
> New Revision: 1879198
> 
> URL: http://svn.apache.org/viewvc?rev=1879198&view=rev
> Log:
> Fix invalid escape sequence in working copy queries which causes
> upgrades from Subversion 1.7 working copies to fail with recent
> SQLite versions (>= 3.29.0).
> 
> * subversion/libsvn_wc/wc-metadata.sql
>   (STMT_UPGRADE_TO_30): Use '' to delimit values and "" to escape column names.
> 
> Modified:
>     subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
> 
> Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=1879198&r1=1879197&r2=1879198&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
> +++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Thu Jun 25 17:11:44 2020
> @@ -636,7 +636,7 @@ ON NODES (wc_id, moved_to, op_depth);
>  
>  CREATE INDEX IF NOT EXISTS I_PRISTINE_MD5 ON PRISTINE (md5_checksum);
>  
> -UPDATE nodes SET presence = "server-excluded" WHERE presence = "absent";
> +UPDATE nodes SET presence = 'server-excluded' WHERE presence = 'absent';
>  
>  /* Just to be sure clear out file external skels from pre 1.7.0 development
>     working copies that were never updated by 1.7.0+ style clients */
> 
> 
>