Changeset 5027

Timestamp:

10/02/08 02:51:45 (3 months ago)

Author:

jwage

Message:

[1.1] fixes #1307 Added ability to set default charset/collate options at manager, connection and record level.

Location:

branches/1.1

Files:

• lib/Doctrine.php (modified) (1 diff)
• lib/Doctrine/Configurable.php (modified) (2 diffs)
• lib/Doctrine/Connection.php (modified) (1 diff)
• lib/Doctrine/Table.php (modified) (1 diff)
• tests/run.php (modified) (1 diff)
• tests/Ticket/1307TestCase.php (added)
• UPGRADE_TO_1_1 (modified) (2 diffs)

branches/1.1/lib/Doctrine.php

@@ -198 +198 @@
     const ATTR_AUTO_ACCESSOR_OVERRIDE   = 165;
     const ATTR_AUTO_FREE_QUERY_OBJECTS  = 166;
+    const ATTR_DEFAULT_TABLE_CHARSET    = 167;
+    const ATTR_DEFAULT_TABLE_COLLATE    = 168;
 
     /**

branches/1.1/lib/Doctrine/Configurable.php

@@ -184 +184 @@
             case Doctrine::ATTR_AUTO_ACCESSOR_OVERRIDE;
             case Doctrine::ATTR_AUTO_FREE_QUERY_OBJECTS;
+            case Doctrine::ATTR_DEFAULT_TABLE_CHARSET;
+            case Doctrine::ATTR_DEFAULT_TABLE_COLLATE;
 
                 break;
@@ -462 +464 @@
 
     /**
+     * Set the charset
+     *
+     * @param string $charset
+     */
+    public function setCharset($charset)
+    {
+        $this->setAttribute(Doctrine::ATTR_DEFAULT_TABLE_CHARSET, $charset);
+    }
+
+    /**
+     * Get the charset
+     *
+     * @return mixed
+     */
+    public function getCharset()
+    {
+        return $this->getAttribute(Doctrine::ATTR_DEFAULT_TABLE_CHARSET);
+    }
+
+    /**
+     * Set the collate
+     *
+     * @param string $collate
+     */
+    public function setCollate($collate)
+    {
+        $this->setAttribute(Doctrine::ATTR_DEFAULT_TABLE_COLLATE, $collate);
+    }
+
+    /**
+     * Get the collate
+     *
+     * @return mixed $collate
+     */
+    public function getCollate()
+    {
+        return $this->getAttribute(Doctrine::ATTR_DEFAULT_TABLE_COLLATE);
+    }
+
+    /**
      * sets a parent for this configurable component
      * the parent must be configurable component itself

branches/1.1/lib/Doctrine/Connection.php

@@ -675 +675 @@
 
     /**
-     * Set the charset on the current connection
-     *
-     * @param string    charset
-     */
-    public function setCharset($charset)
-    {
-
-    }
-
-    /**
      * Quote a string so it can be safely used as a table or column name
      *

branches/1.1/lib/Doctrine/Table.php

@@ -243 +243 @@
         $this->_filters[]  = new Doctrine_Record_Filter_Standard();
         $this->_repository = new Doctrine_Table_Repository($this);
-        
+
+        if ($charset = $this->getAttribute(Doctrine::ATTR_DEFAULT_TABLE_CHARSET)) {
+            $this->_options['charset'] = $charset;
+        }
+        if ($collate = $this->getAttribute(Doctrine::ATTR_DEFAULT_TABLE_COLLATE)) {
+            $this->_options['collate'] = $collate;
+        }
+
         $this->construct();
     }

branches/1.1/tests/run.php

@@ -124 +124 @@
 $tickets->addTestCase(new Doctrine_Ticket_1304_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1305_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1307_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1315_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1323_TestCase());

branches/1.1/UPGRADE_TO_1_1

@@ -21 +21 @@
     $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
+[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.
 
     // Does not link until save()
@@ -31 +31 @@
     $user = Doctrine::getTable('User')->find(1);
     $user->link('Groups', array(1, 2, 3), true);
+
+    $user = Doctrine::getTable('User')->find(1);
+    $userArray = array(
+        'Group' => array(
+            '_identifiers' => array(
+                1 => true,
+                2 => true,
+                3 => false)
+        ));
+
+    $user->synchronizeWithArray($userArray);
+    $user->save();