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

Fixing SELECT DISTINCT queries for SQL Server + misc schema fixes, closes #4352

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6693 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2008-04-18 06:27:58 +00:00
parent fc92ea039a
commit 0793138c6c
2 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cake/libs/model/datasources/dbo/dbo_mssql.php
View file

@ -174,7 +174,6 @@ class DboMssql extends DboSource {
if ($cache != null) {
return $cache;
}
$result = $this->fetchAll('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES');
if (!$result || empty($result)) {
@ -213,6 +212,9 @@ class DboMssql extends DboSource {
'default' => $column[0]['Default'],
'length' => intval($column[0]['Length']),
);
if ($fields[$column[0]['Field']]['default'] == '(null)') {
$fields[$column[0]['Field']]['default'] = null;
}
}
$this->__cacheDescription($this->fullTableName($model, false), $fields);
return $fields;
@ -278,6 +280,12 @@ class DboMssql extends DboSource {
if ($count >= 1 && $fields[0] != '*' && strpos($fields[0], 'COUNT(*)') === false) {
for ($i = 0; $i < $count; $i++) {
$prepend = '';
if (strpos($fields[$i], 'DISTINCT') !== false) {
$prepend = 'DISTINCT ';
$fields[$i] = trim(str_replace('DISTINCT', '', $fields[$i]));
}
$dot = strrpos($fields[$i], '.');
$fieldAlias = count($this->__fieldMappings);
@ -289,6 +297,7 @@ class DboMssql extends DboSource {
$this->__fieldMappings[$build[0] . '__' . $fieldAlias] = $build[0] . '.' . $build[1];
$fields[$i] = $this->name($build[0]) . '.' . $this->name($build[1]) . ' AS ' . $this->name($build[0] . '__' . $fieldAlias);
}
$fields[$i] = $prepend . $fields[$i];
}
}
return $fields;
@ -477,9 +486,8 @@ class DboMssql extends DboSource {
* @return string
*/
function renderStatement($type, $data) {
extract($data);
if (strtolower($type) == 'select') {
extract($data);
if (preg_match('/offset\s+([0-9]+)/i', $limit, $offset)) {
$limit = preg_replace('/\s*offset.*$/i', '', $limit);
preg_match('/top\s+([0-9]+)/i', $limit, $limitVal);
@ -567,6 +575,20 @@ class DboMssql extends DboSource {
function insertMulti($table, $fields, $values) {
parent::__insertMulti($table, $fields, $values);
}
/**
* Generate a database-native column schema string
*
* @param array $column An array structured like the following: array('name'=>'value', 'type'=>'value'[, options]),
* where options can be 'default', 'length', or 'key'.
* @return string
*/
function buildColumn($column) {
$result = preg_replace('/(int|integer)\([0-9]+\)/i', '$1', parent::buildColumn($column));
if (isset($column['null']) && $column['null'] == true) {
$result .= " NULL";
}
return $result;
}
}
?>

15
cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
View file

@ -116,6 +116,7 @@ class DboMssqlTest extends CakeTestCase {
* @access public
*/
function skip() {
$this->_initDb();
$db =& ConnectionManager::getDataSource('test_suite');
$this->skipif ($db->config['driver'] != 'mssql', 'SQL Server connection not available');
}
@ -168,5 +169,19 @@ class DboMssqlTest extends CakeTestCase {
$result = $this->db->value('1,2', 'float');
$this->assertIdentical($expected, $result);
}
function testDistinctFields() {
$result = $this->db->fields($this->model, null, array('DISTINCT Car.country_code'));
$expected = array('DISTINCT [Car].[country_code] AS [Car__0]');
$this->assertEqual($result, $expected);
$result = $this->db->fields($this->model, null, 'DISTINCT Car.country_code');
$expected = array('DISTINCT [Car].[country_code] AS [Car__1]');
$this->assertEqual($result, $expected);
}
function tearDown() {
unset($this->model);
}
}
?>