Restored c4eac53 (merge error)

FIX: Instead of CsvBulkLoader->findExistingRecord out right failing (i.e. no duplicate found) when the duplicate check field is empty, it will now continue on to check other duplicateCheck fields.
Added extra testing data to CSVBulkLoaderTest so that it fails.

Author: jedateach

dev/CsvBulkLoader.php

@@ -94,22 +94,22 @@ protected function processRecord($record, $columnMap, &$results, $preview = fals
 				$obj->{"{$relationName}ID"} = $relationObj->ID;
 				//write if we are not previewing
 				if (!$preview) {
-				$obj->write();
-				$obj->flushCache(); // avoid relation caching confusion
+					$obj->write();
+					$obj->flushCache(); // avoid relation caching confusion
 				}
 
 			} elseif(strpos($fieldName, '.') !== false) {
 				// we have a relation column with dot notation
-				list($relationName,$columnName) = explode('.', $fieldName);
+				list($relationName, $columnName) = explode('.', $fieldName);
 				// always gives us an component (either empty or existing)
 				$relationObj = $obj->getComponent($relationName);
 				if (!$preview) $relationObj->write();
 				$obj->{"{$relationName}ID"} = $relationObj->ID;
 				//write if we are not previewing
 				if (!$preview) {
-				$obj->write();
-				$obj->flushCache(); // avoid relation caching confusion
-			}
+					$obj->write();
+					$obj->flushCache(); // avoid relation caching confusion
+				}
 			}
 
 		}
@@ -166,10 +166,8 @@ public function findExistingObject($record) {
 		foreach($this->duplicateChecks as $fieldName => $duplicateCheck) {
 			if(is_string($duplicateCheck)) {
 				$SQL_fieldName = Convert::raw2sql($duplicateCheck); 
-				if(!isset($record[$SQL_fieldName])) {
-					return false;
-					//user_error("CsvBulkLoader:processRecord: Couldn't find duplicate identifier '{$fieldName}'
-					//in columns", E_USER_ERROR);
+				if(!isset($record[$SQL_fieldName]) || empty($record[$SQL_fieldName])) { //skip current duplicate check if field value is empty
+					continue;
 				}
 				$SQL_fieldValue = Convert::raw2sql($record[$SQL_fieldName]);
 				$existingRecord = DataObject::get_one($this->objectClass, "\"$SQL_fieldName\" = '{$SQL_fieldValue}'");

tests/dev/CsvBulkLoaderTest.php

@@ -152,7 +152,9 @@ public function testLoadWithIdentifiers() {
 		$filepath = $this->getCurrentAbsolutePath() . '/CsvBulkLoaderTest_PlayersWithId.csv';
 		$loader->duplicateChecks = array(
 			'ExternalIdentifier' => 'ExternalIdentifier',
+			'NonExistantIdentifier' => 'ExternalIdentifier',
 			'ExternalIdentifier' => 'ExternalIdentifier',
+			'AdditionalIdentifier' => 'ExternalIdentifier'
 		);
 		$results = $loader->load($filepath);
 		$createdPlayers = $results->Created();