Merge branch 'trunk' into 2.0

matsuo · Oct 3, 2012 · 5786045 · 5786045
2 parents 35bf5d6 + bc06170
commit 5786045
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/Filemaker.php b/Filemaker.php
@@ -438,7 +438,15 @@ public function create(&$model, $fields = null, $values = null) {
 		}
 
 		foreach($fields as $index => $field) {
-			$this->connection->AddDBParam($field, $values[$index]);
+			if (is_array($values[$index])) {
+				$this->connection->AddDBParam($field, implode("\r", $values[$index]));
+			} else {
+				if (function_exists("mb_ereg_replace")) {
+					$this->connection->AddDBParam($field, mb_ereg_replace("\n", "\r" , mb_ereg_replace("\r\n", "\r" , $values[$index])));
+				} else {
+					$this->connection->AddDBParam($field, str_replace("\n", "\r", str_replace("\r\n", "\r" ,$values[$index])));
+				}
+			}
 		}
 
 		// perform creation
@@ -518,9 +526,13 @@ public function update(Model $model, $fields = array(), $values = null, $conditi
 				$model->setInsertID($values[$index]);
 			}
 			if (is_array($values[$index])) {
-				$this->connection->AddDBParam($field, implode("\r\n", $values[$index]));
+				$this->connection->AddDBParam($field, implode("\r", $values[$index]));
 			} else {
-				$this->connection->AddDBParam($field, $values[$index]);
+				if (function_exists("mb_ereg_replace")) {
+					$this->connection->AddDBParam($field, mb_ereg_replace("\n", "\r" , mb_ereg_replace("\r\n", "\r" , $values[$index])));
+				} else {
+					$this->connection->AddDBParam($field, str_replace("\n", "\r", str_replace("\r\n", "\r" ,$values[$index])));
+				}
 			}
 		}
 
@@ -726,9 +738,11 @@ public function queryAssociation(& $model, & $linkModel, $type, $association, $a
 
 			$associatedData = $this->readAssociated($linkModel, $queryData, 0);
 
-			foreach($associatedData as $assocIndex => $relatedModel) {
-				$modelName = key($relatedModel);
-				$resultSet[$projIndex][$modelName][$assocIndex] = $relatedModel[$modelName];
+			if (is_array($associatedData)) {
+				foreach($associatedData as $assocIndex => $relatedModel) {
+					$modelName = key($relatedModel);
+					$resultSet[$projIndex][$modelName][$assocIndex] = $relatedModel[$modelName];
+				}
 			}
 		}
 	}

diff --git a/User Guide (Japanese).pdf b/User Guide (Japanese).pdf
diff --git a/User Guide.pdf b/User Guide.pdf
diff --git a/unit_testing/Case/Model/Datasource/Database/FilemakerTest.php b/unit_testing/Case/Model/Datasource/Database/FilemakerTest.php
@@ -494,13 +494,16 @@ public function testCreateUpdate() {
 		$model =& new TestArticle();
 		$_data = array(
 			'TestArticle' => array(
-				'Title' => 'UT CU Title',
-				'Body' => 'UT CU Body'
+				'Title' => 'UT CU Title' . "\r\n" . 'UT CU Title Line 2' . "\n" . 'UT CU Title Line 3' . "\r" . 'UT CU Title Line 4',
+				'Body' => array('UT CU Body', 'UT CU Body 2')
 			)
 		);
 		$model->create();
 		$saveResult = $model->save($_data);
 
+		$this->assertEqual($saveResult['TestArticle']['Title'], 'UT CU Title' . "\n" . 'UT CU Title Line 2' . "\n" . 'UT CU Title Line 3' . "\n" . 'UT CU Title Line 4');
+		$this->assertEqual($saveResult['TestArticle']['Body'], 'UT CU Body' . "\n" . 'UT CU Body 2');
+
 		$primaryKeyID = $model->id;
 
 		$_data = array(
@@ -522,7 +525,7 @@ public function testCreateUpdate() {
 		$this->assertEqual($saveResult['TestArticle']['-recid'], $findResult['TestArticle']['-recid']);
 		$this->assertEqual($findResult['TestArticle']['id'], $primaryKeyID);
 		$this->assertEqual($findResult['TestArticle']['Title'], 'UT CU Title Updated');
-		$this->assertEqual($findResult['TestArticle']['Body'], 'UT CU Body Updated' . PHP_EOL . 'UT CU Body Updated2');
+		$this->assertEqual($findResult['TestArticle']['Body'], 'UT CU Body Updated' . "\n" . 'UT CU Body Updated2');
 	}
 
 /**