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

Adding better support for nvarchar(MAX) in SQLServer

Browse source 
Newer versions of SQLServer perfer to use nvarchar(max) for
text columns.
This commit is contained in:
Mark Story 2011-06-22 08:59:51 -07:00
parent 936d068eec
commit 0c1472ee44
2 changed files with 42 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,10 +213,10 @@ class Sqlserver extends DboSource {
foreach ($cols as $column) {
$field = $column->Field;
$fields[$field] = array(
'type' => $this->column($column->Type),
'type' => $this->column($column),
'null' => ($column->Null === 'YES' ? true : false),
'default' => preg_replace("/^[(]{1,2}'?([^')]*)?'?[)]{1,2}$/", "$1", $column->Default),
'length' => intval($column->Length),
'length' => $this->length($column),
'key' => ($column->Key == '1') ? 'primary' : false
);
@ -385,22 +385,16 @@ class Sqlserver extends DboSource {
/**
* Converts database-layer column types to basic types
*
* @param string $real Real database-layer column type (i.e. "varchar(255)")
* @param mixed $real Either the string value of the fields type.
* or the Result object from Sqlserver::describe()
* @return string Abstract column type (i.e. "string")
*/
public function column($real) {
if (is_array($real)) {
$col = $real['name'];
if (isset($real['limit'])) {
$col .= '(' . $real['limit'] . ')';
}
return $col;
}
$col = str_replace(')', '', $real);
$limit = null;
if (strpos($col, '(') !== false) {
list($col, $limit) = explode('(', $col);
$col = $real;
if (is_object($real) && isset($real->Field)) {
$limit = $real->Length;
$col = $real->Type;
}
if (in_array($col, array('date', 'time', 'datetime', 'timestamp'))) {
@ -412,6 +406,9 @@ class Sqlserver extends DboSource {
if (strpos($col, 'int') !== false) {
return 'integer';
}
if (strpos($col, 'char') !== false && $limit === -1) {
return 'text';
}
if (strpos($col, 'char') !== false) {
return 'string';
}
@ -427,6 +424,23 @@ class Sqlserver extends DboSource {
return 'text';
}
/**
* Handle SQLServer specific length properties.
* SQLServer handles text types as nvarchar/varchar with a length of -1.
*
* @param mixed $length Either the length as a string, or a Column descriptor object.
* @return mixed null|integer with length of column.
*/
public function length($length) {
if (is_object($length) && isset($length->Length)) {
if ($length->Length === -1 && strpos($length->Type, 'char') !== false) {
return null;
}
return $length->Length;
}
return parent::length($length);
}
/**
* Builds a map of the columns contained in a result
*

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

@ -394,6 +394,14 @@ class SqlserverTest extends CakeTestCase {
'Length' => '4',
'Null' => 'NO',
'Type' => 'integer'
),
(object) array(
'Default' => '',
'Field' => 'body',
'Key' => 0,
'Length' => -1,
'Null' => 'YES',
'Type' => 'nvarchar'
)
));
$this->db->executeResultsStack = array($SqlserverTableDescription);
@ -405,6 +413,12 @@ class SqlserverTest extends CakeTestCase {
'null' => false,
'default' => '0',
'length' => 4
),
'body' => array(
'type' => 'text',
'null' => true,
'default' => null,
'length' => null
)
);
$this->assertEqual($expected, $result);