cvs: pearweb /include pear-database.php

mj              Mon Oct  2 10:55:37 2006 UTC

  Modified files:              
    /pearweb/include    pear-database.php 
  Log:
  * Save one query if $released_only is false.
  
  
http://cvs.php.net/viewvc.cgi/pearweb/include/pear-database.php?r1=1.310&r2=1.311&diff_format=u
Index: pearweb/include/pear-database.php
diff -u pearweb/include/pear-database.php:1.310 
pearweb/include/pear-database.php:1.311
--- pearweb/include/pear-database.php:1.310     Thu Sep 28 14:38:40 2006
+++ pearweb/include/pear-database.php   Mon Oct  2 10:55:37 2006
@@ -17,7 +17,7 @@
    |          Tomas V.V.Cox <cox@xxxxxxx>                                 |
    |          Martin Jansen <mj@xxxxxxx>                                  |
    +----------------------------------------------------------------------+
-   $Id: pear-database.php,v 1.310 2006/09/28 14:38:40 mj Exp $
+   $Id: pear-database.php,v 1.311 2006/10/02 10:55:37 mj Exp $
 */
 
 require_once 'DB/storage.php';
@@ -859,13 +859,17 @@
             "WHERE " . $package_type .
             ' p.id = r.package ' .
             "ORDER BY r.releasedate ASC ", false, null, DB_FETCHMODE_ASSOC);
-        $stablereleases = $dbh->getAssoc(
-            "SELECT p.name, r.id AS rid, r.version AS stable, r.state AS state 
".
-            "FROM packages p, releases r ".
-            "WHERE " . $package_type .
-            "p.id = r.package ".
-            ($released_only ? "AND r.state = 'stable' " : "").
-            "ORDER BY r.releasedate ASC ", false, null, DB_FETCHMODE_ASSOC);
+        if ($released_only) {
+            $stablereleases = $dbh->getAssoc(
+                "SELECT p.name, r.id AS rid, r.version AS stable, r.state AS 
state ".
+                "FROM packages p, releases r ".
+                "WHERE " . $package_type .
+                "p.id = r.package ".
+                "AND r.state = 'stable' " .
+                "ORDER BY r.releasedate ASC ", false, null, 
DB_FETCHMODE_ASSOC);
+        } else {
+            $stablereleases = $allreleases;
+        }
         $deps = $dbh->getAll(
             "SELECT package, release , type, relation, version, name ".
             "FROM deps", null, DB_FETCHMODE_ASSOC);

-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php