Doctrine

Timestamp:

05/10/08 01:03:59 (14 months ago)

Author:

jwage

Message:

fixes #936 - Fixes issue with nested behaviors

Location:

branches/0.11

Files:

• lib/Doctrine/Record/Generator.php (modified) (2 diffs)
• tests/PluginTestCase.php (modified) (3 diffs)
• tests/run.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Record/Generator.php

@@ -113 +113 @@
      * @return void
      */
-    public function addChild(Doctrine_Record_Generator $generator)
+    public function addChild($generator)
     {
         $this->_options['children'][] = $generator;
@@ -228 +228 @@
 
         foreach ($this->_options['children'] as $child) {
-            $this->_table->addGenerator($child, get_class($child));
-
-            $child->setTable($this->_table);
-
-            $child->setUp();
+            if ($child instanceof Doctrine_Template) {
+                if ($child->getPlugin() !== null) {
+                    $this->_table->addGenerator($child->getPlugin(), get_class($child->getPlugin()));
+                }
+
+                $child->setTable($this->_table);
+                $child->setTableDefinition();
+                $child->setUp();
+            } else {
+                $this->_table->addGenerator($child, get_class($child));
+                $child->initialize($this->_table);
+            }
         }
     }

branches/0.11/tests/PluginTestCase.php

@@ -42 +42 @@
     public function testNestedPluginsGetExportedRecursively()
     {
-
-
         $sql = $this->conn->export->exportClassesSql(array('Wiki'));
 
-        $this->assertEqual($sql[0], 'CREATE TABLE wiki_translation_version (title VARCHAR(255), content VARCHAR(2147483647), lang CHAR(2), id INTEGER, version INTEGER, PRIMARY KEY(lang, id, version))');
-        $this->assertEqual($sql[1], 'CREATE TABLE wiki_translation_index (keyword VARCHAR(200), field VARCHAR(50), position INTEGER, lang CHAR(2), id INTEGER, PRIMARY KEY(keyword, field, position, lang, id))');
-        $this->assertEqual($sql[2], 'CREATE TABLE wiki_translation (title VARCHAR(255), content VARCHAR(2147483647), lang CHAR(2), id INTEGER, version INTEGER, PRIMARY KEY(lang, id))');
+        $this->assertEqual($sql[0], 'CREATE TABLE wiki_translation_version (id INTEGER, lang CHAR(2), title VARCHAR(255), content VARCHAR(2147483647), version INTEGER, PRIMARY KEY(id, lang, version))');
+        $this->assertEqual($sql[1], 'CREATE TABLE wiki_translation_index (id INTEGER, lang CHAR(2), keyword VARCHAR(200), field VARCHAR(50), position INTEGER, PRIMARY KEY(id, lang, keyword, field, position))');
+        $this->assertEqual($sql[2], 'CREATE TABLE wiki_translation (id INTEGER, title VARCHAR(255), content VARCHAR(2147483647), lang CHAR(2), version INTEGER, slug VARCHAR(255), PRIMARY KEY(id, lang))');
         $this->assertEqual($sql[3], 'CREATE TABLE wiki (id INTEGER PRIMARY KEY AUTOINCREMENT, created_at DATETIME, updated_at DATETIME)');
 
@@ -86 +84 @@
         $this->assertEqual($wiki->Translation['FI']->version, 2);
     }
+
+    public function testSearchableChildTemplate()
+    {
+          $this->conn->clear();
+
+        $wiki = new Wiki();
+        $wiki->state(Doctrine_Record::STATE_TDIRTY);
+        $wiki->save();
+        $fi = $wiki->Translation['FI'];
+        $fi->title = 'New Title';
+        $fi->content = "Sorry, I'm not able to write a Finish sentence about Michael Jordan...";
+
+        $fi->save();
+
+        $t = Doctrine::getTable('WikiTranslationIndex');
+        $oQuery = new Doctrine_Search_Query($t);
+        $oQuery->query("jordan");
+        $out = $this->conn->fetchAll($oQuery->getSql(), $oQuery->getParams());
+
+        $this->assertEqual($out[0]['relevance'], 2);
+        $this->assertEqual($out[1]['relevance'], 1);
+        $this->assertEqual($out[0]['id'], 1);
+        $this->assertEqual($out[1]['id'], 2);
+    }
+
+    public function testSluggableChildTemplate()
+    {
+          $this->conn->clear();
+
+        $wiki = new Wiki();
+        $wiki->state(Doctrine_Record::STATE_TDIRTY);
+        $wiki->save();
+        $fi = $wiki->Translation['FI'];
+        $fi->title = 'This is the title';
+        $fi->content = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla sed.";
+
+        $fi->save();
+        $this->assertEqual($fi->slug, 'this-is-the-title');
+                }
 }
 
@@ -98 +135 @@
     public function setUp()
     {
-        $options = array('fields' => array('title', 'content'));
+        $options = array('fields' => array('title', 'content'));
         $auditLog = new Doctrine_Template_Versionable($options);
         $search = new Doctrine_Template_Searchable($options);
-        $slug = new Doctrine_Template_Sluggable($options);
+        $slug = new Doctrine_Template_Sluggable(array('fields' => array('title')));
         $i18n = new Doctrine_Template_I18n($options);
 

branches/0.11/tests/run.php

@@ -196 +196 @@
 // Behaviors Testing
 $behaviors = new GroupTest('Behaviors Tests', 'behaviors');
-//$behaviors->addTestCase(new Doctrine_Plugin_TestCase());
+$behaviors->addTestCase(new Doctrine_Plugin_TestCase());
 $behaviors->addTestCase(new Doctrine_View_TestCase());
 $behaviors->addTestCase(new Doctrine_AuditLog_TestCase());