Merge pull request #302 from K-Phoen/fix-issue-301

Fix: issue #301
propelorm · Aug 31, 2012 · 4656d45 · 4656d45
2 parents c8dcbc9 + 8b84a20
commit 4656d45
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Propel/Generator/Model/Database.php b/src/Propel/Generator/Model/Database.php
@@ -416,11 +416,12 @@ public function addTable($table)
             return $this->addTable($tbl);
         }
 
+        $table->setDatabase($this);
+
         if (isset($this->tablesByName[$table->getName()])) {
             throw new EngineException(sprintf('Table "%s" declared twice', $table->getName()));
         }
 
-        $table->setDatabase($this);
         if (null === $table->getSchema()) {
             $table->setSchema($this->getSchema());
         }

diff --git a/tests/Propel/Tests/Generator/Model/DatabaseTest.php b/tests/Propel/Tests/Generator/Model/DatabaseTest.php
@@ -11,6 +11,8 @@
 namespace Propel\Tests\Generator\Model;
 
 use Propel\Generator\Model\Database;
+use Propel\Generator\Model\Table;
+use Propel\Generator\Platform\PgsqlPlatform;
 
 /**
  * Unit test suite for Database model class.
@@ -418,4 +420,19 @@ public function testSetDefaultPhpNamingMethodStrategy()
 
         $this->assertSame('foo', $database->getDefaultPhpNamingMethod());
     }
+
+    public function testAddTableWithSameNameOnDifferentSchema()
+    {
+        $db = new Database();
+        $db->setPlatform(new PgsqlPlatform());
+
+        $t1 = new Table('t1');
+        $db->addTable($t1);
+        $this->assertEquals('t1', $t1->getName());
+
+        $t1b = new Table('t1');
+        $t1b->setSchema('bis');
+        $db->addTable($t1b);
+        $this->assertEquals('bis.t1', $t1b->getName());
+    }
 }