diff options
| author | Matthieu Aubry <matt@piwik.org> | 2015-11-02 03:46:46 +0300 |
|---|---|---|
| committer | Matthieu Aubry <matt@piwik.org> | 2015-11-02 03:46:46 +0300 |
| commit | f888b0852a4c76681a12a4cfcf4a24f488f249f9 (patch) | |
| tree | 2ff2cac822758f259e8abf6a2a07ee246bd41fad | |
| parent | 74babf2f2a546292f99c780d261bb0dd9421bbf3 (diff) | |
| parent | a13652b5e94c3c17cafa908465d1dd7a4a90f12b (diff) | |
Merge pull request #9137 from Joey3000/sql_mode_mysql4_1
Make sql_mode compatibile with MySQL 4.1
| -rw-r--r-- | core/Db.php | 2 | ||||
| -rw-r--r-- | tests/PHPUnit/Integration/DbTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/Db.php b/core/Db.php index 12798d2ff5..f7eae8c8b2 100644 --- a/core/Db.php +++ b/core/Db.php @@ -33,7 +33,7 @@ use Piwik\Db\Adapter; */ class Db { - const SQL_MODE = 'ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_AUTO_VALUE_ON_ZERO,NO_ZERO_DATE,NO_ZERO_IN_DATE'; + const SQL_MODE = 'NO_AUTO_VALUE_ON_ZERO'; private static $connection = null; diff --git a/tests/PHPUnit/Integration/DbTest.php b/tests/PHPUnit/Integration/DbTest.php index c21a277061..9a5595e29a 100644 --- a/tests/PHPUnit/Integration/DbTest.php +++ b/tests/PHPUnit/Integration/DbTest.php @@ -52,7 +52,7 @@ class DbTest extends IntegrationTestCase $this->assertInstanceOf($expectedClass, $db); $result = $db->fetchOne('SELECT @@SESSION.sql_mode'); - $expected = 'NO_AUTO_VALUE_ON_ZERO,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER'; + $expected = 'NO_AUTO_VALUE_ON_ZERO'; $this->assertSame($expected, $result); } |