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

Merge pull request #185 from jellehenkens/scientific-notation

Browse source 
Patch for ticket #1965 - Scientific notation in queries
This commit is contained in:
Mark Story 2011-09-05 01:55:37 -07:00
commit 37e32e9af5
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/datasources/dbo/dbo_mysql.php
View file

@ -672,7 +672,7 @@ class DboMysql extends DboMysqlBase {
return 'NULL'; return 'NULL';
} }
if (is_float($data)) { if (is_float($data)) {
return sprintf('%F', $data); return str_replace(',', '.', sprintf('%G', $data));
} }
if ((is_int($data) || $data === '0') || ( if ((is_int($data) || $data === '0') || (
is_numeric($data) && strpos($data, ',') === false && is_numeric($data) && strpos($data, ',') === false &&

23
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
View file

@ -239,14 +239,33 @@ class DboMysqlTest extends CakeTestCase {
setlocale(LC_ALL, 'de_DE'); setlocale(LC_ALL, 'de_DE');
$result = $this->db->value(3.141593, 'float'); $result = $this->db->value(3.141593, 'float');
$this->assertEqual((string)$result, '3.141593'); $this->assertTrue(strpos((string)$result, ',') === false);
$result = $this->db->value(3.141593); $result = $this->db->value(3.141593);
$this->assertEqual((string)$result, '3.141593'); $this->assertTrue(strpos((string)$result, ',') === false);
$result = $this->db->value(2.2E-54, 'float');
$this->assertEqual('2.2E-54', (string)$result);
$result = $this->db->value(2.2E-54);
$this->assertEqual('2.2E-54', (string)$result);
setlocale(LC_ALL, $restore); setlocale(LC_ALL, $restore);
} }
/**
* test that scientific notations are working correctly
*
* @return void
*/
function testScientificNotation() {
$result = $this->db->value(2.2E-54, 'float');
$this->assertEqual('2.2E-54', (string)$result);
$result = $this->db->value(2.2E-54);
$this->assertEqual('2.2E-54', (string)$result);
}
/** /**
* testTinyintCasting method * testTinyintCasting method
* *