adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-06-21 18:07:05 -04:30
parent f79fc74aad
commit 97e51f1d94
2 changed files with 2 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lib/Cake/Model/Datasource/Database/Sqlserver.php
View file

@ -232,54 +232,6 @@ class Sqlserver extends DboSource {
return $fields; 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. * Generates the fields list of an SQL query.

4
lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
View file

@ -277,7 +277,7 @@ class SqlserverTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testQuoting() { public function testQuoting() {
$expected = "1.2"; $expected = "1.200000";
$result = $this->db->value(1.2, 'float'); $result = $this->db->value(1.2, 'float');
$this->assertIdentical($expected, $result); $this->assertIdentical($expected, $result);
@ -293,7 +293,7 @@ class SqlserverTest extends CakeTestCase {
$result = $this->db->value('', 'float'); $result = $this->db->value('', 'float');
$this->assertIdentical($expected, $result); $this->assertIdentical($expected, $result);
$expected = 'NULL'; $expected = "''";
$result = $this->db->value('', 'binary'); $result = $this->db->value('', 'binary');
$this->assertIdentical($expected, $result); $this->assertIdentical($expected, $result);
} }