Changeset 4431 for trunk/tests/Orm

Timestamp:

05/24/08 23:04:14 (8 months ago)

Author:

guilhermeblanco

Message:

Added more semantical checks. Fixed some tests.

Location:

trunk/tests/Orm/Query

Files:

• DeleteSqlGenerationTest.php (modified) (1 diff)
• LanguageRecognitionTest.php (modified) (11 diffs)

trunk/tests/Orm/Query/DeleteSqlGenerationTest.php

@@ -103 +103 @@
             $q->getSql();
             $this->fail("Invalid DQL '$invalidDql' was not rejected.");
-        } catch (Doctrine_Query_Parser_Exception $parseEx) {}
-
-        $invalidDql = 'DELETE FROM hey.boy';
+        } catch (Doctrine_Exception $parseEx) {}
+        $q->free();
+
+        $invalidDql = 'DELETE FROM CmsUser.articles';
         $q->setDql($invalidDql);
         try {
             $q->getSql();
             $this->fail("Invalid DQL '$invalidDql' was not rejected.");
-        } catch (Doctrine_Query_Parser_Exception $parseEx) {}
-
-        $invalidDql = 'DELETE FROM CmsUser cu WHERE cu.my.thing > ?';
+        } catch (Doctrine_Exception $parseEx) {}
+        $q->free();
+
+        $invalidDql = 'DELETE FROM CmsUser cu WHERE cu.articles.id > ?';
         $q->setDql($invalidDql);
         try {
             $q->getSql();
             $this->fail("Invalid DQL '$invalidDql' was not rejected.");
-        } catch (Doctrine_Relation_Exception $parseEx) {}
-
+        } catch (Doctrine_Exception $parseEx) {}
+        $q->free();
     }
 

trunk/tests/Orm/Query/LanguageRecognitionTest.php

@@ -1 +1 @@
 <?php
+
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.org>.
+ */
+require_once 'lib/DoctrineTestInit.php';
+/**
+ * Test case for testing the saving and referencing of query identifiers.
+ *
+ * @package     Doctrine
+ * @subpackage  Query
+ * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author      Janne Vanhala <jpvanhal@cc.hut.fi>
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        http://www.phpdoctrine.org
+ * @since       1.0
+ * @version     $Revision$
+ * @todo        1) [romanb] We  might want to split the SQL generation tests into multiple
+ *              testcases later since we'll have a lot of them and we might want to have special SQL
+ *              generation tests for some dbms specific SQL syntaxes.
+ */
 class Orm_Query_LanguageRecognitionTest extends Doctrine_OrmTestCase
 {
@@ -48 +85 @@
     public function testInvalidSelectSingleComponentWithAsterisk()
     {
-        $this->assertValidDql('SELECT p.* FROM CmsUser u');
+        $this->assertInvalidDql('SELECT p.* FROM CmsUser u');
     }
 
@@ -98 +135 @@
     public function testExistsExpressionSupportedInWherePart()
     {
-        $this->assertValidDql('SELECT * FROM CmsUser u WHERE EXISTS (SELECT p.user_id FROM CmsPhonenumber p WHERE p.user_id = u.id)');
+        $this->assertValidDql('SELECT u.* FROM CmsUser u WHERE EXISTS (SELECT p.user_id FROM CmsPhonenumber p WHERE p.user_id = u.id)');
     }
 
     public function testNotExistsExpressionSupportedInWherePart()
     {
-        $this->assertValidDql('SELECT * FROM CmsUser u WHERE NOT EXISTS (SELECT p.user_id FROM CmsPhonenumber p WHERE p.user_id = u.id)');
+        $this->assertValidDql('SELECT u.* FROM CmsUser u WHERE NOT EXISTS (SELECT p.user_id FROM CmsPhonenumber p WHERE p.user_id = u.id)');
     }
 
@@ -148 +185 @@
     }
 */
+
     public function testAdditionExpression()
     {
@@ -191 +229 @@
     public function testLeftJoin()
     {
-        $this->assertValidDql('SELECT * FROM CmsUser u LEFT JOIN u.phonenumbers');
+        $this->assertValidDql('SELECT u.*, p.* FROM CmsUser u LEFT JOIN u.phonenumbers p');
     }
 
@@ -201 +239 @@
     public function testInnerJoin()
     {
-        $this->assertValidDql('SELECT * FROM CmsUser u INNER JOIN u.phonenumbers');
+        $this->assertValidDql('SELECT u.*, u.phonenumbers.* FROM CmsUser u INNER JOIN u.phonenumbers');
     }
 
     public function testMultipleLeftJoin()
     {
-        $this->assertValidDql('SELECT * FROM CmsUser u LEFT JOIN u.articles LEFT JOIN u.phonenumbers');
+        $this->assertValidDql('SELECT u.articles.*, u.phonenumbers.* FROM CmsUser u LEFT JOIN u.articles LEFT JOIN u.phonenumbers');
     }
 
@@ -223 +261 @@
         $this->assertValidDql('SELECT u.name, a.topic, p.phonenumber FROM CmsUser u INNER JOIN u.articles a LEFT JOIN u.phonenumbers p');
     }
-/*
+
     public function testMixingOfJoins2()
     {
-        $this->assertValidDql('SELECT u.name, u.articles.topic, c.text FROM CmsUser u INNER JOIN u.articles.comments c');
-    }
-*/
+        $this->assertInvalidDql('SELECT u.name, u.articles.topic, c.text FROM CmsUser u INNER JOIN u.articles.comments c');
+    }
+
     public function testOrderBySingleColumn()
     {
@@ -253 +291 @@
         $this->assertValidDql('SELECT u.name FROM CmsUser u ORDER BY COALESCE(u.id, u.name) DESC');
     }
-
+/*
     public function testSubselectInInExpression()
     {
         $this->assertValidDql("SELECT * FROM CmsUser u WHERE u.id NOT IN (SELECT u2.id FROM CmsUser u2 WHERE u2.name = 'zYne')");
     }
-/*
+
     public function testSubselectInSelectPart()
     {
@@ -281 +319 @@
     }
 */
+
     public function testJoinConditionsSupported()
     {
@@ -293 +332 @@
     public function testIndexBySupportsJoins()
     {
-        $this->assertValidDql('SELECT * FROM CmsUser u LEFT JOIN u.articles INDEX BY id'); // INDEX BY is now referring to articles
+        $this->assertValidDql('SELECT u.*, u.articles.* FROM CmsUser u LEFT JOIN u.articles INDEX BY id'); // INDEX BY is now referring to articles
     }
 
     public function testIndexBySupportsJoins2()
     {
-        $this->assertValidDql('SELECT * FROM CmsUser u INDEX BY id LEFT JOIN u.phonenumbers p INDEX BY phonenumber');
+        $this->assertValidDql('SELECT u.*, u.phonenumbers.* FROM CmsUser u INDEX BY id LEFT JOIN u.phonenumbers p INDEX BY phonenumber');
     }
 
@@ -343 +382 @@
         $this->assertValidDql("SELECT u.id FROM CmsUser u WHERE u.name LIKE 'z|%' ESCAPE '|'");
     }
+
 }