Fixing failing tests in DboMysql and DboPostgres related to localized…

… floats. Refs #1029
cakephp · Aug 21, 2010 · 12d4b52 · 12d4b52
1 parent eb96d8a
commit 12d4b52
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -658,16 +658,19 @@ function value($data, $column = null, $safe = false) {
 				if ($data === '') {
 					return 'NULL';
 				}
-				if ((is_int($data) || is_float($data) || $data === '0') || (
+				if (is_float($data)) {
+					return sprintf('%F', $data);
+				}
+				if ((is_int($data) || $data === '0') || (
 					is_numeric($data) && strpos($data, ',') === false &&
-					$data[0] != '0' && strpos($data, 'e') === false)) {
-						return $data;
-					}
+					$data[0] != '0' && strpos($data, 'e') === false)
+				) {
+					return $data;
+				}
 			default:
-				$data = "'" . mysql_real_escape_string($data, $this->connection) . "'";
+				return "'" . mysql_real_escape_string($data, $this->connection) . "'";
 			break;
 		}
-		return $data;
 	}
 
 /**

diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -299,8 +299,11 @@ function value($data, $column = null, $read = true) {
 		}
 
 		switch($column) {
-			case 'inet':
 			case 'float':
+				if (is_float($data)) {
+					$data = sprintf('%F', $data);
+				}
+			case 'inet':
 			case 'integer':
 			case 'date':
 			case 'datetime':