Show
Ignore:
Timestamp:
07/13/08 01:48:01 (6 months ago)
Author:
jwage
Message:

fixes #939

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/1.0/tests/Query/ConditionTestCase.php

    r3884 r4683  
    6969        $query->where("(User.name LIKE 'z%') || User.name LIKE 's%' && User.name LIKE 'a%'"); 
    7070 
    71         $sql = "SELECT e.id AS e__id FROM entity e WHERE ((e.name LIKE 'z%' OR e.name LIKE 's%') AND e.name LIKE 'a%') AND (e.type = 0)"; 
    72  
    73         $this->assertEqual($query->getQuery(), $sql); 
     71        $this->assertEqual($query->getQuery(), "SELECT e.id AS e__id FROM entity e WHERE (e.name LIKE 'z%' OR (e.name LIKE 's%' AND e.name LIKE 'a%')) AND (e.type = 0)"); 
    7472 
    7573        $query->where("(((User.name LIKE 'z%') || User.name LIKE 's%')) && User.name LIKE 'a%'"); 
    76         $this->assertEqual($query->getQuery(), $sql); 
     74        $this->assertEqual($query->getQuery(), "SELECT e.id AS e__id FROM entity e WHERE ((e.name LIKE 'z%' OR e.name LIKE 's%') AND e.name LIKE 'a%') AND (e.type = 0)"); 
    7775 
    7876        $query->where("((((User.name LIKE 'z%') || User.name LIKE 's%')) && User.name LIKE 'a%')"); 
    79         $this->assertEqual($query->getQuery(), $sql); 
     77        $this->assertEqual($query->getQuery(), "SELECT e.id AS e__id FROM entity e WHERE ((e.name LIKE 'z%' OR e.name LIKE 's%') AND e.name LIKE 'a%') AND (e.type = 0)"); 
    8078 
    8179        $query->where("(((((User.name LIKE 'z%') || User.name LIKE 's%')) && User.name LIKE 'a%'))"); 
    82         $this->assertEqual($query->getQuery(), $sql); 
     80        $this->assertEqual($query->getQuery(), "SELECT e.id AS e__id FROM entity e WHERE ((e.name LIKE 'z%' OR e.name LIKE 's%') AND e.name LIKE 'a%') AND (e.type = 0)"); 
    8381 
    8482    } 
     
    109107        $sql = "SELECT e.id AS e__id FROM entity e WHERE ((e.name LIKE 'z%' OR e.name LIKE 's%') AND e.name LIKE 'a%') AND (e.type = 0)"; 
    110108 
    111         $this->assertEqual($query->getQuery(), $sql); 
     109        $this->assertEqual($query->getQuery(), "SELECT e.id AS e__id FROM entity e WHERE (e.name LIKE 'z%' OR (e.name LIKE 's%' AND e.name LIKE 'a%')) AND (e.type = 0)"); 
    112110 
    113111        $query->where("(((User.name LIKE 'z%') OR User.name LIKE 's%')) AND User.name LIKE 'a%'");