Removing Sqlserver::value() as it is already abstracted in DboSource

cakephp · Jun 21, 2011 · 97e51f1 · 97e51f1
1 parent f79fc74
commit 97e51f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 50 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php
@@ -232,54 +232,6 @@ public function describe($model) {
 		return $fields;
 	}
 
-/**
- * Returns a quoted and escaped string of $data for use in an SQL statement.
- *
- * @param string $data String to be prepared for use in an SQL statement
- * @param string $column The column into which this data will be inserted
- * @param boolean $safe Whether or not numeric data should be handled automagically if no column data is provided
- * @return string Quoted and escaped data
- */
-	public function value($data, $column = null, $safe = false) {
-		$parent = parent::value($data, $column, $safe);
-
-		if ($column === 'float' && strpos($data, '.') !== false) {
-			return rtrim($data, '0');
-		}
-		if ($parent === "''" && ($column === null || $column !== 'string')) {
-			return 'NULL';
-		}
-		if ($parent != null) {
-			return $parent;
-		}
-		if ($data === null) {
-			return 'NULL';
-		}
-		if (in_array($column, array('integer', 'float', 'binary')) && $data === '') {
-			return 'NULL';
-		}
-		if ($data === '') {
-			return "''";
-		}
-
-		switch ($column) {
-			case 'boolean':
-				$data = $this->boolean((bool)$data);
-			break;
-			default:
-				if (get_magic_quotes_gpc()) {
-					$data = stripslashes(str_replace("'", "''", $data));
-				} else {
-					$data = str_replace("'", "''", $data);
-				}
-			break;
-		}
-
-		if (in_array($column, array('integer', 'float', 'binary')) && is_numeric($data)) {
-			return $data;
-		}
-		return "'" . $data . "'";
-	}
 
 /**
  * Generates the fields list of an SQL query.

diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
@@ -277,7 +277,7 @@ public function tearDown() {
  * @return void
  */
 	public function testQuoting() {
-		$expected = "1.2";
+		$expected = "1.200000";
 		$result = $this->db->value(1.2, 'float');
 		$this->assertIdentical($expected, $result);
 
@@ -293,7 +293,7 @@ public function testQuoting() {
 		$result = $this->db->value('', 'float');
 		$this->assertIdentical($expected, $result);
 
-		$expected = 'NULL';
+		$expected = "''";
 		$result = $this->db->value('', 'binary');
 		$this->assertIdentical($expected, $result);
 	}