Merge pull request #4314 from tremani/improve-fixture-loading-with-exceptions

Improve error/exception details when loading fixtures

Author: marcovtwout

CHANGELOG

@@ -11,6 +11,8 @@ Version 1.1.23 under development
 - Bug: Fix CFileHelper::findFiles() to use correct directory separator under Windows (samdark)
 - Enh #4305: PHP 7.3 compatibility: Support giving cookies a SameSite=None attribute value (tomfotherby)
 - Enh #4308: PHP 7.3 compatibility: Add `samesite` as a session cookie option (tomfotherby)
+- Enh #4314: Exceptions thrown while loading fixtures now contain details about the error location (BBoom)
+- Enh #4314: Missing fixture files now throw exceptions (BBoom)
 - Enh #4315: Added change triggers to clickable checkbox rows in grid views, allowing other script to react to the changed checkbox states (BBoom)
 - Enh #4317: Added special option 'encode' to `$htmlOptions` argument in `CHtml::errorSummary` and `CHtml::error` (shidenko97)
 - Enh #4323: Add PostgreSQL 12 support (bio, d4rkstar, marcovtwout)

framework/test/CDbFixtureManager.php

@@ -161,7 +161,7 @@ public function loadFixture($tableName)
 	{
 		$fileName=$this->basePath.DIRECTORY_SEPARATOR.$tableName.'.php';
 		if(!is_file($fileName))
-			return false;
+			throw new CException('Could not load fixture file ' . $fileName);
 
 		$rows=array();
 		$schema=$this->getDbConnection()->getSchema();
@@ -170,7 +170,11 @@ public function loadFixture($tableName)
 
 		foreach(require($fileName) as $alias=>$row)
 		{
-			$builder->createInsertCommand($table,$row)->execute();
+			try {
+				$builder->createInsertCommand($table,$row)->execute();
+			} catch (CException $e) {
+				throw new CException('Exception loading row ' . $alias . ' in fixture ' . $fileName, $e->getCode(), $e);
+			}
 			$primaryKey=$table->primaryKey;
 			if($table->sequenceName!==null)
 			{