From 0547748716c736683ba909929e7cdceb8cd9a03b Mon Sep 17 00:00:00 2001
From: rey4 <rey4@8cb11bc2-c004-0410-86c3-e597b4017df7>
Date: Thu, 14 Oct 2004 02:07:07 +0000
Subject: [PATCH] Remove site-specific kludge from cvsdb (originally added by
 Jay Painter for RealNetworks repositories)

* lib/cvsdb.py
  (CheckinDatabase.CreateSQLQueryString):
    remove code that excludes ".ver" files from all queries


git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@951 8cb11bc2-c004-0410-86c3-e597b4017df7
---
 lib/cvsdb.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/cvsdb.py b/lib/cvsdb.py
index 5b1f3c52..3da094a1 100644
--- a/lib/cvsdb.py
+++ b/lib/cvsdb.py
@@ -318,12 +318,6 @@ class CheckinDatabase:
         tableList = [("checkins", None)]
         condList = []
 
-        ## XXX: this is to exclude .ver files -- RN specific hack --JMP
-        tableList.append(("files", "(checkins.fileid=files.id)"))
-        temp = "(files.file NOT LIKE \"%.ver\")"
-        condList.append(temp)
-        ## XXX
-
         if len(query.repository_list):
             tableList.append(("repositories",
                               "(checkins.repositoryid=repositories.id)"))
@@ -382,6 +376,7 @@ class CheckinDatabase:
 
         tables = string.join(tables, ",")
         conditions = string.join(joinConds + condList, " AND ")
+        conditions = conditions and "WHERE %s" % conditions
 
         ## limit the number of rows requested or we could really slam
         ## a server with a large database
@@ -389,7 +384,7 @@ class CheckinDatabase:
         if cfg.cvsdb.row_limit:
             limit = "LIMIT %s" % (str(cfg.cvsdb.row_limit))
 
-        sql = "SELECT checkins.* FROM %s WHERE %s %s %s" % (
+        sql = "SELECT checkins.* FROM %s %s %s %s" % (
             tables, conditions, order_by, limit)
 
         return sql