Changeset 4037

Show
Ignore:
Timestamp:
03/19/08 05:35:52 (16 months ago)
Author:
jwage
Message:

fixes #839

Location:
branches/0.10/lib/Doctrine
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • branches/0.10/lib/Doctrine/Connection.php

    r4005 r4037  
    14851485 
    14861486    /** 
     1487     * modifyLimitQuery 
     1488     * 
     1489     * Some dbms require specific functionality for this. Check the other connection adapters for examples 
     1490     * 
     1491     * @return void 
     1492     */ 
     1493    public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false) 
     1494    { 
     1495    } 
     1496 
     1497    /** 
    14871498     * returns a string representation of this object 
    14881499     * @return string 

  • branches/0.10/lib/Doctrine/Connection/Firebird.php

    r3884 r4037  
    101101     * @return string modified  query 
    102102     */ 
    103     public function modifyLimitQuery($query, $limit, $offset) 
     103    public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false) 
    104104    { 
    105105        if ($limit > 0) { 

  • branches/0.10/lib/Doctrine/Connection/Mssql.php

    r3884 r4037  
    9898     * @return string 
    9999     */ 
    100     public function modifyLimitQuery($query, $limit, $offset, $isManip = false) 
     100    public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false) 
    101101    { 
    102102        if ($limit > 0) { 

  • branches/0.10/lib/Doctrine/Connection/Oracle.php

    r3884 r4037  
    6060                          'pattern_escaping'     => true, 
    6161                          ); 
    62         /** 
    63         $this->options['DBA_username'] = false; 
    64         $this->options['DBA_password'] = false; 
    65         $this->options['database_name_prefix'] = false; 
    66         $this->options['emulate_database'] = true; 
    67         $this->options['default_tablespace'] = false; 
    68         $this->options['default_text_field_length'] = 2000; 
    69         $this->options['result_prefetching'] = false; 
    70         */ 
     62 
    7163        parent::__construct($manager, $adapter); 
    7264    } 
    … …  
    8981     * @return string               the modified query 
    9082     */ 
    91     public function modifyLimitQuery($query, $limit, $offset) 
     83    public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false) 
    9284    { 
    93         /** 
    94         $e      = explode("select ",strtolower($query)); 
    95         $e2     = explode(" from ",$e[1]); 
    96         $fields = $e2[0]; 
    97         */ 
    9885        $limit = (int) $limit; 
    9986        $offset = (int) $offset;