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 #2961 from ovidiupruteanu/patch-3

Browse source 
Sqlserver->describe failing for models with a schemaName
This commit is contained in:
Mark Story 2014-03-11 21:03:54 -04:00
commit fda242f000
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -201,7 +201,8 @@ class Sqlserver extends DboSource {
return $cache; return $cache;
} }
$fields = array(); $fields = array();
$table = $this->fullTableName($model, false); $table = $this->fullTableName($model, false, false);
$schema = $model->schemaName;
$cols = $this->_execute( $cols = $this->_execute(
"SELECT "SELECT
COLUMN_NAME as Field, COLUMN_NAME as Field,
@ -212,7 +213,7 @@ class Sqlserver extends DboSource {
COLUMNPROPERTY(OBJECT_ID('" . $table . "'), COLUMN_NAME, 'IsIdentity') as [Key], COLUMNPROPERTY(OBJECT_ID('" . $table . "'), COLUMN_NAME, 'IsIdentity') as [Key],
NUMERIC_SCALE as Size NUMERIC_SCALE as Size
FROM INFORMATION_SCHEMA.COLUMNS FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_NAME = '" . $table . "'" WHERE TABLE_NAME = '" . $table . "'" . ($schema ? " AND TABLE_SCHEMA = '" . $schema . "'" : '')
); );
if (!$cols) { if (!$cols) {
throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $table)); throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $table));