Merge pull request #126 from hafidTCM/fix_get_ref_on_nullable_foreign…

…_key Fixing bug when getRef was called on an object with nullable foreign key
thecodingmachine · Nov 2, 2016 · ad659f0 · ad659f0
2 parents 7e8b07f + 131ef08
commit ad659f0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/src/Mouf/Database/TDBM/AbstractTDBMObject.php b/src/Mouf/Database/TDBM/AbstractTDBMObject.php
@@ -284,6 +284,10 @@ protected function getRef($foreignKeyName, $tableName = null)
     {
         $tableName = $this->checkTableName($tableName);
 
+        if (!isset($this->dbRows[$tableName])) {
+            return;
+        }
+
         return $this->dbRows[$tableName]->getRef($foreignKeyName);
     }
 

diff --git a/tests/Mouf/Database/TDBM/TDBMDaoGeneratorTest.php b/tests/Mouf/Database/TDBM/TDBMDaoGeneratorTest.php
@@ -1231,5 +1231,6 @@ public function testGetOnAllNullableValues()
         $allNullable = new AllNullableBean();
         $this->assertNull($allNullable->getId());
         $this->assertNull($allNullable->getLabel());
+        $this->assertNull($allNullable->getCountry());
     }
 }
diff --git a/tests/Mouf/Database/TDBM/TDBMSchemaAnalyzerTest.php b/tests/Mouf/Database/TDBM/TDBMSchemaAnalyzerTest.php
@@ -80,8 +80,10 @@ public function testGetIncomingForeignKeys3()
         $tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer($this->dbConnection, $cache, $schemaAnalyzer);
 
         $fks = $tdbmSchemaAnalyzer->getIncomingForeignKeys('country');
-        $this->assertCount(1, $fks);
-        $this->assertEquals('users', $fks[0]->getLocalTableName());
+        $this->assertCount(2, $fks);
+        $tables = [ $fks[0]->getLocalTableName(), $fks[1]->getLocalTableName() ];
+        $this->assertContains('users', $tables);
+        $this->assertContains('all_nullable', $tables);
     }
 
     public function testGetPivotTableLinkedToTable()

diff --git a/tests/sql/tdbmunittest.sql b/tests/sql/tdbmunittest.sql
@@ -170,6 +170,7 @@ CREATE TABLE IF NOT EXISTS `users` (
 CREATE TABLE IF NOT EXISTS `all_nullable` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `label` varchar(255) NULL,
+  `country_id` int(11) NULL,
   PRIMARY KEY (id)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
@@ -290,6 +291,12 @@ ADD PRIMARY KEY (`role_id`,`right_label`), ADD KEY `right_label` (`right_label`)
 ALTER TABLE `users`
 ADD PRIMARY KEY (`id`), ADD KEY `country_id` (`country_id`);
 
+--
+-- Indexes for table `all_nullable`
+--
+ALTER TABLE `all_nullable`
+ADD KEY `country_id` (`country_id`);
+
 --
 -- Indexes for table `users_roles`
 --
@@ -345,6 +352,12 @@ ALTER TABLE `users`
 ADD CONSTRAINT `users_ibfk_1` FOREIGN KEY (`country_id`) REFERENCES `country` (`id`),
 ADD CONSTRAINT `users_ibfk_2` FOREIGN KEY (`id`) REFERENCES `contact` (`id`);
 
+--
+-- Constraints for table `users`
+--
+ALTER TABLE `all_nullable`
+ADD CONSTRAINT `all_nullable_ibfk_1` FOREIGN KEY (`country_id`) REFERENCES `country` (`id`);
+
 --
 -- Constraints for table `users_roles`
 --