From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 15 May 2020 07:12:56 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2393692937a57b8b53adee37feb59a5f9d25254a;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79596: MySQL FLOAT truncates to int some locales
---

2393692937a57b8b53adee37feb59a5f9d25254a
diff --cc ext/pdo_mysql/tests/bug79596.phpt
index 0000000000,054e3c1c2e..185b2e60b1
mode 000000,100644..100644
--- a/ext/pdo_mysql/tests/bug79596.phpt
+++ b/ext/pdo_mysql/tests/bug79596.phpt
@@@ -1,0 -1,30 +1,30 @@@
+ --TEST--
+ Bug #79596 (MySQL FLOAT truncates to int some locales)
+ --SKIPIF--
+ <?php
+ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
+ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+ MySQLPDOTest::skip();
+ if (!setlocale(LC_ALL, 'de_DE', 'de-DE')) die('skip German locale not available');
+ ?>
+ --FILE--
+ <?php
+ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+ 
+ setlocale(LC_ALL, 'de_DE', 'de-DE');
+ 
+ $pdo = MySQLPDOTest::factory();
+ $pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
+ $pdo->query('CREATE TABLE bug79596 (broken FLOAT(2,1))');
+ $pdo->query('INSERT INTO bug79596 VALUES(4.9)');
+ var_dump($pdo->query('SELECT broken FROM bug79596')->fetchColumn(0));
+ ?>
+ --CLEAN--
+ <?php
+ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+ 
+ $pdo = MySQLPDOTest::factory();
+ $pdo->exec("DROP TABLE IF EXISTS bug79596");
+ ?>
+ --EXPECT--
 -float(4,9)
++float(4.9)