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

Fix issues with SQLServer + boolean columns.

Browse source 
SQLServer should not have lengths applied to BIT column types.
Remove any length that could have been provided.

Fixes #2439
This commit is contained in:
mark_story 2012-04-01 22:10:05 -04:00
parent ee7a224639
commit 4e67698506
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -656,12 +656,15 @@ class Sqlserver extends DboSource {
/** /**
* Generate a database-native column schema string * Generate a database-native column schema string
* *
* @param array $column An array structured like the following: array('name'=>'value', 'type'=>'value'[, options]), * @param array $column An array structured like the
* following: array('name'=>'value', 'type'=>'value'[, options]),
* where options can be 'default', 'length', or 'key'. * where options can be 'default', 'length', or 'key'.
* @return string * @return string
*/ */
public function buildColumn($column) { public function buildColumn($column) {
$result = preg_replace('/(int|integer)\([0-9]+\)/i', '$1', parent::buildColumn($column)); $result = parent::buildColumn($column);
$result = preg_replace('/(int|integer)\([0-9]+\)/i', '$1', $result);
$result = preg_replace('/(bit)\([0-9]+\)/i', '$1', $result);
if (strpos($result, 'DEFAULT NULL') !== false) { if (strpos($result, 'DEFAULT NULL') !== false) {
if (isset($column['default']) && $column['default'] === '') { if (isset($column['default']) && $column['default'] === '') {
$result = str_replace('DEFAULT NULL', "DEFAULT ''", $result); $result = str_replace('DEFAULT NULL', "DEFAULT ''", $result);

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

@ -543,6 +543,16 @@ class SqlserverTest extends CakeTestCase {
$result = $this->db->buildColumn($column); $result = $this->db->buildColumn($column);
$expected = '[body] nvarchar(MAX)'; $expected = '[body] nvarchar(MAX)';
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$column = array(
'name' => 'checked',
'type' => 'boolean',
'length' => 10,
'default' => '1'
);
$result = $this->db->buildColumn($column);
$expected = "[checked] bit DEFAULT '1'";
$this->assertEquals($expected, $result);
} }
/** /**