Doctrine

tests/QueryTestCase.php

@@ -32 +32 @@
  */
 class Doctrine_Query_TestCase extends Doctrine_UnitTestCase 
 {
-
+    
     public function testWhereInSupportInDql()
     {
         $q = Doctrine_Query::create()
@@ -300 +300 @@
         $q1->free();
         $q2->free();
     }
+    
+    public function testParseTableAliasesWithBetweenInWhereClause()
+    {
+        
+        $q1 = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('QueryTest_User u')
+            ->where("CURRENT_DATE() BETWEEN u.QueryTest_Subscription.begin AND u.QueryTest_Subscription.begin")
+            ->addWhere( 'u.id != 5' )
+            ;
+            
+        $expected = 'SELECT q.id AS q__id FROM query_test__user q LEFT JOIN query_test__subscription q2 ON q.subscriptionid = q2.id WHERE CURRENT_DATE() BETWEEN q2.begin AND q2.begin AND q.id != 5';
+        
+        $this->assertEqual( $q1->getSql(), $expected );
+        
+    } 
 }
 
 

tests/models/QueryTest_Subscription.php

@@ +1 @@
+<?php
+class QueryTest_Subscription extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {   $this->hasColumn('id', 'integer', 4, array('primary', 'autoincrement', 'notnull'));     
+        $this->hasColumn('begin', 'date');
+        $this->hasColumn('end', 'date');
+    }
+}

tests/models/QueryTest_User.php

@@ -7 +7 @@
         $this->hasColumn('username as username', 'string', 50,
                 array('notnull'));
         $this->hasColumn('visibleRankId', 'integer', 4);
+        $this->hasColumn('subscriptionId', 'integer', 4);
     }
 
     /**
@@ -17 +18 @@
         $this->hasOne('QueryTest_Rank as visibleRank', array(
             'local' => 'visibleRankId', 'foreign' => 'id'
         ));
+        
+        $this->hasOne('QueryTest_Subscription', array(
+            'local' => 'subscriptionId', 'foreign' => 'id'
+        ));
 
         $this->hasMany('QueryTest_Rank as ranks', array(
             'local' => 'userId', 'foreign' => 'rankId', 'refClass' => 'QueryTest_UserRank'

lib/Doctrine/Query/Where.php

@@ -79 +79 @@
             }
 
             $sql = $this->_buildSql($leftExpr, $operator, $rightExpr);
+            
 
             //echo '<pre>Built SQL: '.$sql.'</pre>';
 
@@ -91 +92 @@
 
     protected function _buildSql($leftExpr, $operator, $rightExpr)
     {
-        // Left Expression
+        
         $leftExpr = $this->query->parseClause($leftExpr);
-
+        
+        // BETWEEN operation
+        if ( 'BETWEEN' == strtoupper( substr( $operator, 0, 7 ) ) ) {
+            $midExpr = trim( substr( $operator, 7, -3 ) );
+            $operator = 'BETWEEN ' . $this->query->parseClause( $midExpr ) . ' AND';         
+        }
+     
         $op = strtolower($operator);
 
         // Right Expression