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

Merge pull request #12554 from bancer/patch-1

Browse source 
Improve handling of CURRENT_TIMESTAMP default value
This commit is contained in:
Mark Story 2018-09-13 09:34:17 -04:00 committed by GitHub
commit 2273428dca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Model/Datasource/DboSource.php
View file

@ -3539,7 +3539,7 @@ class DboSource extends DataSource {
} elseif (isset($column['null']) && $column['null'] === false) {
$out .= ' NOT NULL';
}
if ($type === 'timestamp' && isset($column['default']) && strtolower($column['default']) === 'current_timestamp') {
if (in_array($type, array('timestamp', 'datetime')) && isset($column['default']) && strtolower($column['default']) === 'current_timestamp') {
$out = str_replace(array("'CURRENT_TIMESTAMP'", "'current_timestamp'"), 'CURRENT_TIMESTAMP', $out);
}
return $this->_buildFieldParameters($out, $column, 'afterDefault');

1
lib/Cake/Test/Case/Model/ModelReadTest.php
View file

@ -6559,7 +6559,6 @@ class ModelReadTest extends BaseModelTest {
public function testBuildQueryCountI18nConditions() {
$this->skipIf(!$this->db instanceof Mysql, 'This test is only compatible with Mysql.');
$dbName = $this->db->config['database'];
j
$this->loadFixtures('TranslateArticle', 'TranslatedArticle', 'User');
$TestModel = new TranslatedArticle();
$TestModel->cacheQueries = false;

2
lib/Cake/View/Helper/FormHelper.php
View file

@ -1061,7 +1061,7 @@ class FormHelper extends AppHelper {
$radioOptions = (array)$options['options'];
unset($options['options']);
} else {
$radioOptions = [];
$radioOptions = array();
}
$label = $this->_getLabel($fieldName, $options);