svn commit: r1056416 - /subversion/trunk/subversion/libsvn_wc/wc-queries.sql

[ju...@apache.org]

Author: julianfoad
Date: Fri Jan  7 17:50:42 2011
New Revision: 1056416

URL: http://svn.apache.org/viewvc?rev=1056416&view=rev
Log:
* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_ANY_PRISTINE_REFERENCE, STMT_SELECT_UNREFERENCED_PRISTINES):
    Ignore the conflict info in the 'actual_node' table when looking for
    references to pristine texts, because the conflict checksum columns are
    not yet used and so this was just an extra complication.

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

Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1056416&r1=1056415&r2=1056416&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Fri Jan  7 17:50:42 2011
@@ -426,11 +426,6 @@ WHERE md5_checksum = ?1
 -- STMT_SELECT_ANY_PRISTINE_REFERENCE
 SELECT 1 FROM nodes
   WHERE checksum = ?1 OR checksum = ?2
-UNION ALL
-SELECT 1 FROM actual_node
-  WHERE older_checksum = ?1 OR older_checksum = ?2
-    OR  left_checksum  = ?1 OR left_checksum  = ?2
-    OR  right_checksum = ?1 OR right_checksum = ?2
 LIMIT 1
 
 -- STMT_SELECT_UNREFERENCED_PRISTINES
@@ -439,15 +434,6 @@ FROM pristine
 EXCEPT
 SELECT checksum FROM nodes
   WHERE checksum IS NOT NULL
-EXCEPT
-SELECT older_checksum FROM actual_node
-  WHERE older_checksum IS NOT NULL
-EXCEPT
-SELECT left_checksum FROM actual_node
-  WHERE left_checksum  IS NOT NULL
-EXCEPT
-SELECT right_checksum FROM actual_node
-  WHERE right_checksum IS NOT NULL
 
 -- STMT_DELETE_PRISTINE
 DELETE FROM pristine