Doctrine

Timestamp:

12/31/08 20:29:51 (6 months ago)

Author:

guilhermeblanco

Message:

[1.1] fixes #1792. Fixed usage of relation aliases in BETWEEN queries. Thanks for the great patch/work!

Location:

branches/1.1

Files:

• lib/Doctrine/Query/Where.php (modified) (2 diffs)
• tests/models/QueryTest_Subscription.php (added)
• tests/models/QueryTest_User.php (modified) (2 diffs)
• tests/QueryTestCase.php (modified) (2 diffs)

branches/1.1/lib/Doctrine/Query/Where.php

@@ -80 +80 @@
 
             $sql = $this->_buildSql($leftExpr, $operator, $rightExpr);
+            
 
             //echo '<pre>Built SQL: '.$sql.'</pre>';
@@ -92 +93 @@
     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);
 

branches/1.1/tests/models/QueryTest_User.php

@@ -8 +8 @@
                 array('notnull'));
         $this->hasColumn('visibleRankId', 'integer', 4);
+        $this->hasColumn('subscriptionId', 'integer', 4);
     }
 
@@ -18 +19 @@
             'local' => 'visibleRankId', 'foreign' => 'id'
         ));
+        
+        $this->hasOne('QueryTest_Subscription', array(
+            'local' => 'subscriptionId', 'foreign' => 'id'
+        ));
 
         $this->hasMany('QueryTest_Rank as ranks', array(

branches/1.1/tests/QueryTestCase.php

@@ -33 +33 @@
 class Doctrine_Query_TestCase extends Doctrine_UnitTestCase 
 {
-
+    
     public function testWhereInSupportInDql()
     {
@@ -301 +301 @@
         $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 );
+        
+    } 
 }