*Support for HAVING clause
authorAaron Schulz <aaron@users.mediawiki.org>
Fri, 4 May 2007 22:54:13 +0000 (22:54 +0000)
committerAaron Schulz <aaron@users.mediawiki.org>
Fri, 4 May 2007 22:54:13 +0000 (22:54 +0000)
includes/Database.php
includes/DatabasePostgres.php

index 3fd6ad1..21e38ba 100644 (file)
@@ -1091,6 +1091,7 @@ class Database {
                }
 
                if ( isset( $options['GROUP BY'] ) ) $preLimitTail .= " GROUP BY {$options['GROUP BY']}";
+               if ( isset( $options['HAVING'] ) ) $preLimitTail .= " HAVING {$options['HAVING']}";
                if ( isset( $options['ORDER BY'] ) ) $preLimitTail .= " ORDER BY {$options['ORDER BY']}";
                
                //if (isset($options['LIMIT'])) {
@@ -1175,7 +1176,6 @@ class Database {
                if (isset($options['EXPLAIN'])) {
                        $sql = 'EXPLAIN ' . $sql;
                }
-
                return $this->query( $sql, $fname );
        }
 
index 2892d95..b946912 100644 (file)
@@ -1097,6 +1097,7 @@ END;
                }
 
                if ( isset( $options['GROUP BY'] ) ) $preLimitTail .= " GROUP BY " . $options['GROUP BY'];
+               if ( isset( $options['HAVING'] ) ) $preLimitTail .= " HAVING {$options['HAVING']}";
                if ( isset( $options['ORDER BY'] ) ) $preLimitTail .= " ORDER BY " . $options['ORDER BY'];
                
                //if (isset($options['LIMIT'])) {