PHP on T R A X
Rapid Application Development Made Easy

Changeset 297 for trunk

Show
Ignore:
Timestamp:
05/20/08 02:00:21 (3 months ago)
Author:
john
Message:

fixed bug in aggregate_all with joins

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/trax/vendor/trax/active_record.php

    r296 r297  
    964964        $aggregate_type = strtoupper(substr($aggregate_type, 0, -4)); 
    965965        #($parameters[0]) ? $field = $parameters[0] : $field = "*"; 
    966         $field = ($parameters[0] ? $parameters[0] : "{$this->table_prefix}{$this->table_name}.".$this->primary_keys[0]); 
     966        $field = (stristr($parameters[0], ".") ? $parameters[0] : "{$this->table_prefix}{$this->table_name}.".$this->primary_keys[0]); 
    967967        $sql = "SELECT {$aggregate_type}({$field}) AS agg_result FROM {$this->table_prefix}{$this->table_name} "; 
    968968