Author: jwage
Date: 2008-09-12 21:00:11 +0100 (Fri, 12 Sep 2008)
New Revision: 4957
Modified:
branches/1.0/lib/Doctrine/Collection.php
branches/1.0/lib/Doctrine/Connection.php
branches/1.0/lib/Doctrine/Query.php
branches/1.0/lib/Doctrine/Record.php
branches/1.0/lib/Doctrine/Record/Abstract.php
branches/1.0/lib/Doctrine/Table.php
branches/1.0/tests/RawSqlTestCase.php
branches/1.0/tests/Relation/CircularSavingTestCase.php
Log:
fixes #1450
Modified: branches/1.0/lib/Doctrine/Collection.php
===================================================================
--- branches/1.0/lib/Doctrine/Collection.php 2008-09-12 19:52:06 UTC (rev
4956)
+++ branches/1.0/lib/Doctrine/Collection.php 2008-09-12 20:00:11 UTC (rev
4957)
@@ -665,7 +665,7 @@
}
/**
- * Mimics the result of a $query->execute(array(), Doctrine::FETCH_ARRAY);
+ * Mimics the result of a $query->execute(array(),
Doctrine::HYDRATE_ARRAY);
*
* @param boolean $deep
*/
Modified: branches/1.0/lib/Doctrine/Connection.php
===================================================================
--- branches/1.0/lib/Doctrine/Connection.php 2008-09-12 19:52:06 UTC (rev
4956)
+++ branches/1.0/lib/Doctrine/Connection.php 2008-09-12 20:00:11 UTC (rev
4957)
@@ -884,7 +884,7 @@
*
* @param string $query DQL query
* @param array $params query parameters
- * @param int $hydrationMode Doctrine::FETCH_ARRAY or
Doctrine::FETCH_RECORD
+ * @param int $hydrationMode Doctrine::HYDRATE_ARRAY or
Doctrine::HYDRATE_RECORD
* @see Doctrine_Query
* @return Doctrine_Collection Collection of Doctrine_Record objects
*/
Modified: branches/1.0/lib/Doctrine/Query.php
===================================================================
--- branches/1.0/lib/Doctrine/Query.php 2008-09-12 19:52:06 UTC (rev 4956)
+++ branches/1.0/lib/Doctrine/Query.php 2008-09-12 20:00:11 UTC (rev 4957)
@@ -1899,7 +1899,7 @@
*
* @param string $query DQL query
* @param array $params prepared statement parameters
- * @param int $hydrationMode Doctrine::FETCH_ARRAY or
Doctrine::FETCH_RECORD
+ * @param int $hydrationMode Doctrine::HYDRATE_ARRAY or
Doctrine::HYDRATE_RECORD
* @see Doctrine::FETCH_* constants
* @return mixed
*/
Modified: branches/1.0/lib/Doctrine/Record/Abstract.php
===================================================================
--- branches/1.0/lib/Doctrine/Record/Abstract.php 2008-09-12 19:52:06 UTC
(rev 4956)
+++ branches/1.0/lib/Doctrine/Record/Abstract.php 2008-09-12 20:00:11 UTC
(rev 4957)
@@ -280,7 +280,7 @@
}
if ( ! ($tpl instanceof Doctrine_Template)) {
- throw new Doctrine_Record_Exception('Loaded behavior class is not
an istance of Doctrine_Template.');
+ throw new Doctrine_Record_Exception('Loaded behavior class is not
an instance of Doctrine_Template.');
}
$className = get_class($tpl);
Modified: branches/1.0/lib/Doctrine/Record.php
===================================================================
--- branches/1.0/lib/Doctrine/Record.php 2008-09-12 19:52:06 UTC (rev
4956)
+++ branches/1.0/lib/Doctrine/Record.php 2008-09-12 20:00:11 UTC (rev
4957)
@@ -791,7 +791,7 @@
$this->clearRelated();
$record = $query->fetchOne($id);
} else {
- // Use FETCH_ARRAY to avoid clearing object relations
+ // Use HYDRATE_ARRAY to avoid clearing object relations
$record = $this->getTable()->find($id, Doctrine::HYDRATE_ARRAY);
if ($record) {
$this->hydrate($record);
Modified: branches/1.0/lib/Doctrine/Table.php
===================================================================
--- branches/1.0/lib/Doctrine/Table.php 2008-09-12 19:52:06 UTC (rev 4956)
+++ branches/1.0/lib/Doctrine/Table.php 2008-09-12 20:00:11 UTC (rev 4957)
@@ -1273,7 +1273,7 @@
* findAll
* returns a collection of records
*
- * @param int $hydrationMode Doctrine::FETCH_ARRAY or
Doctrine::FETCH_RECORD
+ * @param int $hydrationMode Doctrine::HYDRATE_ARRAY or
Doctrine::HYDRATE_RECORD
* @return Doctrine_Collection
*/
public function findAll($hydrationMode = null)
@@ -1289,7 +1289,7 @@
*
* @param string $dql DQL after WHERE clause
* @param array $params query parameters
- * @param int $hydrationMode Doctrine::FETCH_ARRAY or
Doctrine::FETCH_RECORD
+ * @param int $hydrationMode Doctrine::HYDRATE_ARRAY or
Doctrine::HYDRATE_RECORD
* @return Doctrine_Collection
*
* @todo This actually takes DQL, not SQL, but it requires column names
@@ -1308,7 +1308,7 @@
*
* @param string $dql DQL after WHERE clause
* @param array $params query parameters
- * @param int $hydrationMode Doctrine::FETCH_ARRAY or
Doctrine::FETCH_RECORD
+ * @param int $hydrationMode Doctrine::HYDRATE_ARRAY or
Doctrine::HYDRATE_RECORD
* @return Doctrine_Collection
*/
public function findByDql($dql, $params = array(), $hydrationMode = null)
Modified: branches/1.0/tests/RawSqlTestCase.php
===================================================================
--- branches/1.0/tests/RawSqlTestCase.php 2008-09-12 19:52:06 UTC (rev
4956)
+++ branches/1.0/tests/RawSqlTestCase.php 2008-09-12 20:00:11 UTC (rev
4957)
@@ -233,7 +233,7 @@
$query->addComponent('entity', 'Entity');
$query->addComponent('phonenumber', 'Entity.Phonenumber');
$this->assertEqual($query->getSql(), 'SELECT entity.name AS
entity__name, entity.id AS entity__id, phonenumber.id AS phonenumber__id,
phonenumber.phonenumber AS phonenumber__phonenumber, phonenumber.entity_id AS
phonenumber__entity_id FROM entity LEFT JOIN phonenumber ON
phonenumber.entity_id = entity.id LIMIT 3');
- $coll = $query->execute(array(), Doctrine::FETCH_ARRAY);
+ $coll = $query->execute(array(), Doctrine::HYDRATE_ARRAY);
$this->assertEqual(count($coll), 3);
}
@@ -246,7 +246,7 @@
$query->addComponent('entity', 'Entity');
$query->addComponent('phonenumber', 'Entity.Phonenumber');
$this->assertEqual($query->getSql(), 'SELECT entity.name AS
entity__name, entity.id AS entity__id, phonenumber.id AS phonenumber__id,
phonenumber.phonenumber AS phonenumber__phonenumber, phonenumber.entity_id AS
phonenumber__entity_id FROM entity LEFT JOIN phonenumber ON
phonenumber.entity_id = entity.id LIMIT 3');
- $coll = $query->execute(array(), Doctrine::FETCH_ARRAY);
+ $coll = $query->execute(array(), Doctrine::HYDRATE_ARRAY);
$this->assertEqual(count($coll), 3);
}
Modified: branches/1.0/tests/Relation/CircularSavingTestCase.php
===================================================================
--- branches/1.0/tests/Relation/CircularSavingTestCase.php 2008-09-12
19:52:06 UTC (rev 4956)
+++ branches/1.0/tests/Relation/CircularSavingTestCase.php 2008-09-12
20:00:11 UTC (rev 4957)
@@ -101,7 +101,7 @@
$n2->save();
$q = new Doctrine_Query();
- $coll = $q->from('NestReference')->execute(array(),
Doctrine::FETCH_ARRAY);
+ $coll = $q->from('NestReference')->execute(array(),
Doctrine::HYDRATE_ARRAY);
$this->assertEqual(count($coll), 1);
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"doctrine-svn" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.co.uk/group/doctrine-svn?hl=en-GB
-~----------~----~----~----~------~----~------~--~---
