Index: tests/Template/TaggableTestCase.php
===================================================================
--- tests/Template/TaggableTestCase.php	(révision 6976)
+++ tests/Template/TaggableTestCase.php	(copie de travail)
@@ -80,6 +80,23 @@
         $this->assertEqual($relation->getType(), Doctrine_Relation::MANY);
     }
 
+    public function testArticleTaggableTestTaggableTagHasRelations()
+    {
+        $test = Doctrine::getTable('ArticleTaggableTestTaggableTag');
+
+        $this->assertTrue($test->hasRelation('ArticleTaggableTest'));
+        $relation = $test->getRelation('ArticleTaggableTest');
+        $this->assertEqual($relation->getType(), Doctrine_Relation::ONE);
+        $this->assertEqual($relation['onDelete'], 'CASCADE');
+        $this->assertEqual($relation['onUpdate'], 'CASCADE');
+
+        $this->assertTrue($test->hasRelation('TaggableTag'));
+        $relation = $test->getRelation('TaggableTag');
+        $this->assertEqual($relation->getType(), Doctrine_Relation::ONE);
+        $this->assertEqual($relation['onDelete'], 'CASCADE');
+        $this->assertEqual($relation['onUpdate'], 'CASCADE');
+    }
+
     public function testTaggableTagHasRelations()
     {
         $test = Doctrine::getTable('TaggableTag');
Index: lib/Doctrine/Taggable.php
===================================================================
--- lib/Doctrine/Taggable.php	(révision 6976)
+++ lib/Doctrine/Taggable.php	(copie de travail)
@@ -33,11 +33,9 @@
  */
 class Doctrine_Taggable extends Doctrine_Record_Generator
 {
-    protected $_options = array();
-
     public function __construct(array $options = array())
     {
-        $this->_options = $options;
+        $this->_options = Doctrine_Lib::arrayDeepMerge($this->_options, $options);
     }
 
     public function setTableDefinition()