From 54801dded50eab687e68788f73b325545cedca22 Mon Sep 17 00:00:00 2001
From: doctrine <doctrine@625475ce-881a-0410-a577-b389adb331d8>
Date: Wed, 31 May 2006 08:46:44 +0000
Subject: [PATCH]

---
 Doctrine/Record.php            |  5 +++--
 tests/QueryTestCase.class.php  | 18 +++++++++++++++++-
 tests/RecordTestCase.class.php |  2 ++
 tests/run.php                  |  4 ++--
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Doctrine/Record.php b/Doctrine/Record.php
index 39aa8590b..e1f934627 100644
--- a/Doctrine/Record.php
+++ b/Doctrine/Record.php
@@ -1111,11 +1111,12 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
      */
     public function __call($m,$a) {
         if( ! function_exists($m))
-            throw new Doctrine_Record_Exception("unknown callback");
+            throw new Doctrine_Record_Exception("unknown callback '$m'");
             
         if(isset($a[0])) {
             $column = $a[0];
-            $this->data[$column] = $m($this->get($column));
+            $a[0] = $this->get($column);
+            $this->data[$column] = call_user_func_array($m, $a);
         }
         return $this;
     }
diff --git a/tests/QueryTestCase.class.php b/tests/QueryTestCase.class.php
index ff99c20e2..f55d730bb 100644
--- a/tests/QueryTestCase.class.php
+++ b/tests/QueryTestCase.class.php
@@ -7,6 +7,23 @@ class Doctrine_QueryTestCase extends Doctrine_UnitTestCase {
         $this->tables[] = "Forum_Thread";
         parent::prepareTables();
     }
+    public function testImmediateFetching() {
+        $count = $this->dbh->count();
+        $this->session->getTable('User')->clear();
+        $this->session->getTable('Email')->clear();
+        $this->session->getTable('Phonenumber')->clear();
+
+        $users = $this->query->from("User-i.Email-i")->execute();
+        $this->assertEqual(($count + 1),$this->dbh->count());
+        $this->assertEqual(count($users), 8);
+        
+        $this->assertEqual(get_class($users[0]->Email), 'Email');
+        $this->assertEqual(($count + 1),$this->dbh->count());
+
+        $this->assertEqual($users[0]->Email->address, 'zYne@example.com');
+        $this->assertEqual(($count + 1),$this->dbh->count());
+    }
+
     public function testLazyPropertyFetchingWithMultipleColumns() {
 
         $q = new Doctrine_Query($this->session);
@@ -52,7 +69,6 @@ class Doctrine_QueryTestCase extends Doctrine_UnitTestCase {
         $this->assertEqual($count, count($this->dbh));
         $this->assertTrue(is_numeric($users[2]->email_id));
         $this->assertEqual($count, count($this->dbh));
-
     }
 
     public function testMultipleFetching() {
diff --git a/tests/RecordTestCase.class.php b/tests/RecordTestCase.class.php
index 5bda33b7a..740487923 100644
--- a/tests/RecordTestCase.class.php
+++ b/tests/RecordTestCase.class.php
@@ -7,6 +7,8 @@ class Doctrine_RecordTestCase extends Doctrine_UnitTestCase {
         $user->name = " zYne ";
         $user->trim('name');
         $this->assertEqual($user->name, 'zYne');
+        $user->substr('name',0,1);
+        $this->assertEqual($user->name, 'z');
     }
     public function testJoinTableSelfReferencing() {
         $e = new Entity();
diff --git a/tests/run.php b/tests/run.php
index c0f10a6a4..892fd0e96 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -25,7 +25,7 @@ $test = new GroupTest("Doctrine Framework Unit Tests");
 //$test->addTestCase(new Sensei_UnitTestCase());
 
 $test->addTestCase(new Doctrine_RecordTestCase());
-/**
+
 $test->addTestCase(new Doctrine_SessionTestCase());
 
 $test->addTestCase(new Doctrine_TableTestCase());
@@ -47,7 +47,7 @@ $test->addTestCase(new Doctrine_Collection_OffsetTestCase());
 $test->addTestCase(new Doctrine_CollectionTestCase());
 
 $test->addTestCase(new Doctrine_QueryTestCase());
-*/
+
 //$test->addTestCase(new Doctrine_Cache_FileTestCase());
 //$test->addTestCase(new Doctrine_Cache_SqliteTestCase());