Optimized scalar type mapping support.

doctrine · Jan 16, 2012 · fdb2b9c · fdb2b9c
1 parent 28403ab
commit fdb2b9c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/lib/Doctrine/ORM/Query/ResultSetMapping.php b/lib/Doctrine/ORM/Query/ResultSetMapping.php
@@ -308,10 +308,10 @@ public function addJoinedEntityResult($class, $alias, $parentAlias, $relation)
      *
      * @todo Rename: addScalar
      */
-    public function addScalarResult($columnName, $alias, $type = null)
+    public function addScalarResult($columnName, $alias, $type = 'string')
     {
         $this->scalarMappings[$columnName] = $alias;
-        $this->typeMappings[$columnName]   = $type ?: 'string';
+        $this->typeMappings[$columnName]   = $type;
 
         if ( ! $this->isMixed && $this->fieldMappings) {
             $this->isMixed = true;

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php
@@ -26,11 +26,11 @@ public function testEntitySingleResult()
         $query      = $this->_em->createQuery('SELECT d FROM ' . self::NS . '\DateTimeModel d');
         $datetime   = $query->setMaxResults(1)->getSingleResult();
 
-        $this->assertTrue($datetime instanceof DateTimeModel);
+        $this->assertInstanceOf('Doctrine\Tests\Models\Generic\DateTimeModel', $datetime);
 
-        $this->assertTrue($datetime->datetime instanceof \DateTime);
-        $this->assertTrue($datetime->time instanceof \DateTime);
-        $this->assertTrue($datetime->date instanceof \DateTime);
+        $this->assertInstanceOf('DateTime', $datetime->datetime);
+        $this->assertInstanceOf('DateTime', $datetime->time);
+        $this->assertInstanceOf('DateTime', $datetime->date);
     }
 
     public function testScalarResult()
@@ -56,13 +56,13 @@ public function testaTicketEntityArrayResult()
 
         $this->assertCount(2,$result);
 
-        $this->assertTrue($result[0]['datetime'] instanceof \DateTime);
-        $this->assertTrue($result[0]['time'] instanceof \DateTime);
-        $this->assertTrue($result[0]['date'] instanceof \DateTime);
+        $this->assertInstanceOf('DateTime', $result[0]['datetime']);
+        $this->assertInstanceOf('DateTime', $result[0]['time']);
+        $this->assertInstanceOf('DateTime', $result[0]['date']);
 
-        $this->assertTrue($result[1]['datetime'] instanceof \DateTime);
-        $this->assertTrue($result[1]['time'] instanceof \DateTime);
-        $this->assertTrue($result[1]['date'] instanceof \DateTime);
+        $this->assertInstanceOf('DateTime', $result[1]['datetime']);
+        $this->assertInstanceOf('DateTime', $result[1]['time']);
+        $this->assertInstanceOf('DateTime', $result[1]['date']);
     }
 
     public function testTicketSingleResult()
@@ -72,9 +72,9 @@ public function testTicketSingleResult()
 
         $this->assertTrue(is_array($datetime));
 
-        $this->assertTrue($datetime['datetime'] instanceof \DateTime);
-        $this->assertTrue($datetime['time'] instanceof \DateTime);
-        $this->assertTrue($datetime['date'] instanceof \DateTime);
+        $this->assertInstanceOf('DateTime', $datetime['datetime']);
+        $this->assertInstanceOf('DateTime', $datetime['time']);
+        $this->assertInstanceOf('DateTime', $datetime['date']);
     }
 
     public function testTicketResult()
@@ -84,14 +84,16 @@ public function testTicketResult()
 
         $this->assertCount(2,$result);
 
-        $this->assertTrue($result[0]['time'] instanceof \DateTime);
-        $this->assertTrue($result[0]['date'] instanceof \DateTime);
-        $this->assertTrue($result[0]['datetime'] instanceof \DateTime);
+        $this->assertInstanceOf('DateTime', $result[0]['time']);
+        $this->assertInstanceOf('DateTime', $result[0]['date']);
+        $this->assertInstanceOf('DateTime', $result[0]['datetime']);
+
         $this->assertEquals('2010-01-01 11:11:11', $result[0]['datetime']->format('Y-m-d G:i:s'));
 
-        $this->assertTrue($result[1]['time'] instanceof \DateTime);
-        $this->assertTrue($result[1]['date'] instanceof \DateTime);
-        $this->assertTrue($result[1]['datetime'] instanceof \DateTime);
+        $this->assertInstanceOf('DateTime', $result[1]['time']);
+        $this->assertInstanceOf('DateTime', $result[1]['date']);
+        $this->assertInstanceOf('DateTime', $result[1]['datetime']);
+
         $this->assertEquals('2010-02-02 12:12:12', $result[1]['datetime']->format('Y-m-d G:i:s'));
     }