Author: rhuijben
Date: Wed Apr 24 22:29:20 2013
New Revision: 1471744
URL: http://svn.apache.org/r1471744
Log:
Following up on r1470904, move some tests to the where clause that I
accidentally moved to the join but didn't filter the left nodes when
that node referred to non-BASE nodes or the repository root.
Use the NULL handling of 'IS NOT' to avoid having to special case
local_relpath in multiple clauses.
* subversion/libsvn_wc/wc-metadata.sql
(STMT_UPGRADE_31_SELECT_WCROOT_NODES): Update query
Found by: pburba
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=1471744&r1=1471743&r2=1471744&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Wed Apr 24 22:29:20
2013
@@ -841,13 +841,10 @@ SELECT l.wc_id, l.local_relpath FROM nod
LEFT OUTER JOIN nodes as r
ON l.wc_id = r.wc_id
AND r.local_relpath = l.parent_relpath
- AND r.op_depth = 0 AND l.op_depth = 0
- AND l.repos_path != ''
-WHERE (l.local_relpath = '')
- OR (l.local_relpath != '' AND l.repos_id != r.repos_id)
- OR (l.local_relpath != ''
- AND l.repos_path
- != RELPATH_SKIP_JOIN(r.local_relpath, r.repos_path, l.local_relpath))
+WHERE l.op_depth = 0 AND r.op_depth = 0
+ AND l.repos_path != ''
+ AND ((l.repos_id IS NOT r.repos_id)
+ OR (l.repos_path IS NOT RELPATH_SKIP_JOIN(r.local_relpath,
r.repos_path, l.local_relpath)))
/* ------------------------------------------------------------------------- */
