Changeset 5032

Timestamp:

10/02/08 07:07:05 (3 months ago)

Author:

jwage

Message:

[1.1] fixes #1138 Added Doctrine_Collection::toKeyValueArray()

Location:

branches/1.1

Files:

• lib/Doctrine/Collection.php (modified) (1 diff)
• tests/run.php (modified) (1 diff)
• tests/Ticket/1338TestCase.php (added)
• UPGRADE_TO_1_1 (modified) (3 diffs)

branches/1.1/lib/Doctrine/Collection.php

@@ -684 +684 @@
 
     /**
+     * Build an array made up of the values from the 2 specified columns
+     *
+     * @param string $key 
+     * @param string $value 
+     * @return array $result
+     */
+    public function toKeyValueArray($key, $value)
+    {
+        $result = array();
+        foreach ($this as $record) {
+            $result[$record->$key] = $record->$value;
+        }
+        return $result;
+    }
+
+    /**
      * Populate a Doctrine_Collection from an array of data
      *

branches/1.1/tests/run.php

@@ -132 +132 @@
 $tickets->addTestCase(new Doctrine_Ticket_1326_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1335_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1338_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1351_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1365_TestCase());

branches/1.1/UPGRADE_TO_1_1

@@ -13 +13 @@
       ->where('u.id IN ?', array(1, 2, 3));
     $users = $q->execute();
-
-[r5018](http://trac.doctrine-project.org/changeset/5018) - Added `Doctrine::ATTR_AUTO_FREE_QUERY_OBJECTS` for auto freeing query objects after execution 
-
-    $manager->setAttribute('auto_free_query_objects');
-    $q = Doctrine_Query::create()
-      ->from('User u')
-    $users = $q->execute(); // $q->free() is triggered
 
 [r5019](http://trac.doctrine-project.org/changeset/5019) - `unlink()` and `link()` have been changed to not delete references until `save()` is called on the object. Also, fixed synchronizeWithArray() to synchronize many to many relationships.
@@ -43 +36 @@
     $user->synchronizeWithArray($userArray);
     $user->save();
+
+Default Options
+---------------
 
 [r5027](http://trac.doctrine-project.org/changeset/5039) - Added support for setting default charset and collate for tables.
@@ -86 +82 @@
     $q->select();
     $user = $q->fetchOne();
+
+[r5018](http://trac.doctrine-project.org/changeset/5018) - Added `Doctrine::ATTR_AUTO_FREE_QUERY_OBJECTS` for auto freeing query objects after execution 
+
+    $manager->setAttribute('auto_free_query_objects');
+    $q = Doctrine_Query::create()
+      ->from('User u')
+    $users = $q->execute(); // $q->free() is triggered
+
+Doctrine Collection
+-------------------
+
+You can now convert a Doctrine_Collection in to a key value array made up of the values from the two specified columns.
+
+    $q = Doctrine_Query::create()
+        ->from('User u');
+    $users = $q->execute();
+
+    $array = $users->toKeyValueArray('id', 'name');
+    print_r($array);
+
+    /*
+    array(
+      4 => 'zYne',
+      5 => 'Arnold Schwarzenegger',
+      6 => 'Michael Caine',
+      7 => 'Takeshi Kitano',
+      8 => 'Sylvester Stallone',
+      9 => 'Kurt Russell',
+      10 => 'Jean Reno',
+      11 => 'Edward Furlong',
+    )
+    */