Merge remote-tracking branch 'upstream/master' into sortable_scope

rozwell · Sep 5, 2012 · 811d0f0 · 811d0f0
2 parents ed54050 + 6234fec
commit 811d0f0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/generator/lib/model/Database.php b/generator/lib/model/Database.php
@@ -379,10 +379,10 @@ public function addTable($data)
     {
         if ($data instanceof Table) {
             $tbl = $data; // alias
+            $tbl->setDatabase($this);
             if (isset($this->tablesByName[$tbl->getName()])) {
                 throw new EngineException(sprintf('Table "%s" declared twice', $tbl->getName()));
             }
-            $tbl->setDatabase($this);
             if ($tbl->getSchema() === null) {
                 $tbl->setSchema($this->getSchema());
             }

diff --git a/test/testsuite/generator/model/DatabaseTest.php b/test/testsuite/generator/model/DatabaseTest.php
@@ -128,4 +128,19 @@ public function testAddTableSkipsDatabaseNamespaceWhenTableNamespaceIsAbsolute()
         $this->assertEquals('Bar', $t1->getNamespace());
     }
 
+    public function testAddTableWithSameNameOnDifferentSchema()
+    {
+        $db = new Database();
+        $db->setPlatform(new SchemaPlatform());
+
+        $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());
+    }
+
 }