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

Resolving merge conflict.

Browse source
This commit is contained in:
Renan Gonçalves 2011-05-18 19:58:12 +02:00
commit d1a984cde9
2 changed files with 101 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

258
lib/Cake/Model/Datasource/Database/Mssql.php
View file

@ -17,6 +17,8 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('DboSource', 'Model/Datasource');
/** /**
* MS SQL layer for DBO * MS SQL layer for DBO
* *
@ -24,7 +26,7 @@
* *
* @package cake.libs.model.datasources.dbo * @package cake.libs.model.datasources.dbo
*/ */
class DboMssql extends DboSource { class Mssql extends DboSource {
/** /**
* Driver description * Driver description
@ -53,7 +55,7 @@ class DboMssql extends DboSource {
* *
* @var array * @var array
*/ */
private $__fieldMappings = array(); protected $_fieldMappings = array();
/** /**
* Base configuration settings for MS SQL driver * Base configuration settings for MS SQL driver
@ -62,11 +64,10 @@ class DboMssql extends DboSource {
*/ */
protected $_baseConfig = array( protected $_baseConfig = array(
'persistent' => true, 'persistent' => true,
'host' => 'localhost', 'host' => '(local)\sqlexpress',
'login' => 'root', 'login' => '',
'password' => '', 'password' => '',
'database' => 'cake', 'database' => 'cake'
'port' => '1433',
); );
/** /**
@ -107,22 +108,6 @@ class DboMssql extends DboSource {
* @access private * @access private
*/ */
private $__lastQueryHadError = false; private $__lastQueryHadError = false;
/**
* MS SQL DBO driver constructor; sets SQL Server error reporting defaults
*
* @param array $config Configuration data from app/config/databases.php
* @return boolean True if connected successfully, false on error
*/
function __construct($config, $autoConnect = true) {
if ($autoConnect) {
if (!function_exists('mssql_min_message_severity')) {
trigger_error(__d('cake_dev', "PHP SQL Server interface is not installed, cannot continue. For troubleshooting information, see http://php.net/mssql/"), E_USER_WARNING);
}
mssql_min_message_severity(15);
mssql_min_error_severity(2);
}
return parent::__construct($config, $autoConnect);
}
/** /**
* Connects to the database using options in the given configuration array. * Connects to the database using options in the given configuration array.
@ -131,65 +116,34 @@ class DboMssql extends DboSource {
*/ */
function connect() { function connect() {
$config = $this->config; $config = $this->config;
$os = env('OS');
if (!empty($os) && strpos($os, 'Windows') !== false) {
$sep = ',';
} else {
$sep = ':';
}
$this->connected = false; $this->connected = false;
try {
if (is_numeric($config['port'])) { $flags = array(PDO::ATTR_PERSISTENT => $config['persistent']);
$port = $sep . $config['port']; // Port number if (!empty($config['encoding'])) {
} elseif ($config['port'] === null) { $flags[PDO::SQLSRV_ATTR_ENCODING] = $config['encoding'];
$port = ''; // No port - SQL Server 2005
} else {
$port = '\\' . $config['port']; // Named pipe
} }
$this->_connection = new PDO(
if (!$config['persistent']) { "sqlsrv:server={$config['host']};Database={$config['database']}",
$this->connection = mssql_connect($config['host'] . $port, $config['login'], $config['password'], true); $config['login'],
} else { $config['password'],
$this->connection = mssql_pconnect($config['host'] . $port, $config['login'], $config['password']); $flags
} );
if (mssql_select_db($config['database'], $this->connection)) {
$this->_execute("SET DATEFORMAT ymd");
$this->connected = true; $this->connected = true;
} catch (PDOException $e) {
throw new MissingConnectionException(array('class' => $e->getMessage()));
} }
// $this->_execute("SET DATEFORMAT ymd");
return $this->connected; return $this->connected;
} }
/** /**
* Check that MsSQL is installed/loaded * Check that PDO SQL Server is installed/loaded
* *
* @return boolean * @return boolean
*/ */
function enabled() { public function enabled() {
return extension_loaded('mssql'); return in_array('sqlsrv', PDO::getAvailableDrivers());
}
/**
* Disconnects from database.
*
* @return boolean True if the database could be disconnected, else false
*/
function disconnect() {
@mssql_free_result($this->results);
$this->connected = !@mssql_close($this->connection);
return !$this->connected;
}
/**
* Executes given SQL statement.
*
* @param string $sql SQL statement
* @return resource Result resource identifier
*/
protected function _execute($sql) {
$result = @mssql_query($sql, $this->connection);
$this->__lastQueryHadError = ($result === false);
return $result;
} }
/** /**
@ -197,27 +151,27 @@ class DboMssql extends DboSource {
* *
* @return array Array of tablenames in the database * @return array Array of tablenames in the database
*/ */
function listSources() { public function listSources() {
$cache = parent::listSources(); $cache = parent::listSources();
if ($cache !== null) {
if ($cache != null) {
return $cache; return $cache;
} }
$result = $this->fetchAll('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES', false); $result = $this->_execute("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE='BASE TABLE'");
if (!$result || empty($result)) { if (!$result) {
$result->closeCursor();
return array(); return array();
} else {
$tables = array();
foreach ($result as $table) {
$tables[] = $table[0]['TABLE_NAME'];
} }
$tables = array();
while ($line = $result->fetch(PDO::FETCH_ASSOC)) {
$tables[] = $line['TABLE_NAME'];
}
$result->closeCursor();
parent::listSources($tables); parent::listSources($tables);
return $tables; return $tables;
} }
}
/** /**
* Returns an array of the fields in given table name. * Returns an array of the fields in given table name.
@ -227,40 +181,43 @@ class DboMssql extends DboSource {
*/ */
function describe($model) { function describe($model) {
$cache = parent::describe($model); $cache = parent::describe($model);
if ($cache != null) { if ($cache != null) {
return $cache; return $cache;
} }
$table = $this->fullTableName($model, false);
$cols = $this->fetchAll("SELECT COLUMN_NAME as Field, DATA_TYPE as Type, COL_LENGTH('" . $table . "', COLUMN_NAME) as Length, IS_NULLABLE As [Null], COLUMN_DEFAULT as [Default], COLUMNPROPERTY(OBJECT_ID('" . $table . "'), COLUMN_NAME, 'IsIdentity') as [Key], NUMERIC_SCALE as Size FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" . $table . "'", false);
$fields = false; $fields = false;
$table = $this->fullTableName($model, false);
$cols = $this->_execute("SELECT COLUMN_NAME as Field, DATA_TYPE as Type, COL_LENGTH('" . $table . "', COLUMN_NAME) as Length, IS_NULLABLE As [Null], COLUMN_DEFAULT as [Default], COLUMNPROPERTY(OBJECT_ID('" . $table . "'), COLUMN_NAME, 'IsIdentity') as [Key], NUMERIC_SCALE as Size FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" . $table . "'");
if (!$cols) {
throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $model->name));
}
foreach ($cols as $column) { foreach ($cols as $column) {
$field = $column[0]['Field']; $field = $column->Field;
$fields[$field] = array( $fields[$field] = array(
'type' => $this->column($column[0]['Type']), 'type' => $this->column($column->Type),
'null' => (strtoupper($column[0]['Null']) == 'YES'), 'null' => ($column->Null === 'YES' ? true : false),
'default' => preg_replace("/^[(]{1,2}'?([^')]*)?'?[)]{1,2}$/", "$1", $column[0]['Default']), 'default' => preg_replace("/^[(]{1,2}'?([^')]*)?'?[)]{1,2}$/", "$1", $column->Default),
'length' => intval($column[0]['Length']), 'length' => intval($column->Type),
'key' => ($column[0]['Key'] == '1') ? 'primary' : false 'key' => ($column->Key == '1') ? 'primary' : false
); );
if ($fields[$field]['default'] === 'null') { if ($fields[$field]['default'] === 'null') {
$fields[$field]['default'] = null; $fields[$field]['default'] = null;
} else { } else {
$this->value($fields[$field]['default'], $fields[$field]['type']); $this->value($fields[$field]['default'], $fields[$field]['type']);
} }
if ($fields[$field]['key'] && $fields[$field]['type'] == 'integer') { if ($fields[$field]['key'] !== false && $fields[$field]['type'] == 'integer') {
$fields[$field]['length'] = 11; $fields[$field]['length'] = 11;
} elseif (!$fields[$field]['key']) { } elseif ($fields[$field]['key'] === false) {
unset($fields[$field]['key']); unset($fields[$field]['key']);
} }
if (in_array($fields[$field]['type'], array('date', 'time', 'datetime', 'timestamp'))) { if (in_array($fields[$field]['type'], array('date', 'time', 'datetime', 'timestamp'))) {
$fields[$field]['length'] = null; $fields[$field]['length'] = null;
} }
} }
$this->__cacheDescription($this->fullTableName($model, false), $fields); $this->__cacheDescription($table, $fields);
$cols->closeCursor();
return $fields; return $fields;
} }
@ -275,6 +232,12 @@ class DboMssql extends DboSource {
function value($data, $column = null, $safe = false) { function value($data, $column = null, $safe = false) {
$parent = parent::value($data, $column, $safe); $parent = parent::value($data, $column, $safe);
if ($column === 'float' && strpos($data, '.') !== false) {
return rtrim($data, '0');
}
if ($parent === "''") {
return 'NULL';
}
if ($parent != null) { if ($parent != null) {
return $parent; return $parent;
} }
@ -331,7 +294,7 @@ class DboMssql extends DboSource {
$prepend = 'DISTINCT '; $prepend = 'DISTINCT ';
$fields[$i] = trim(str_replace('DISTINCT', '', $fields[$i])); $fields[$i] = trim(str_replace('DISTINCT', '', $fields[$i]));
} }
$fieldAlias = count($this->__fieldMappings); $fieldAlias = count($this->_fieldMappings);
if (!preg_match('/\s+AS\s+/i', $fields[$i])) { if (!preg_match('/\s+AS\s+/i', $fields[$i])) {
if (substr($fields[$i], -1) == '*') { if (substr($fields[$i], -1) == '*') {
@ -348,12 +311,12 @@ class DboMssql extends DboSource {
} }
if (strpos($fields[$i], '.') === false) { if (strpos($fields[$i], '.') === false) {
$this->__fieldMappings[$alias . '__' . $fieldAlias] = $alias . '.' . $fields[$i]; $this->_fieldMappings[$alias . '__' . $fieldAlias] = $alias . '.' . $fields[$i];
$fieldName = $this->name($alias . '.' . $fields[$i]); $fieldName = $this->name($alias . '.' . $fields[$i]);
$fieldAlias = $this->name($alias . '__' . $fieldAlias); $fieldAlias = $this->name($alias . '__' . $fieldAlias);
} else { } else {
$build = explode('.', $fields[$i]); $build = explode('.', $fields[$i]);
$this->__fieldMappings[$build[0] . '__' . $fieldAlias] = $fields[$i]; $this->_fieldMappings[$build[0] . '__' . $fieldAlias] = $fields[$i];
$fieldName = $this->name($build[0] . '.' . $build[1]); $fieldName = $this->name($build[0] . '.' . $build[1]);
$fieldAlias = $this->name(preg_replace("/^\[(.+)\]$/", "$1", $build[0]) . '__' . $fieldAlias); $fieldAlias = $this->name(preg_replace("/^\[(.+)\]$/", "$1", $build[0]) . '__' . $fieldAlias);
} }
@ -424,58 +387,6 @@ class DboMssql extends DboSource {
return parent::update($model, array_keys($fields), array_values($fields), $conditions); return parent::update($model, array_keys($fields), array_values($fields), $conditions);
} }
/**
* Returns a formatted error message from previous database operation.
*
* @return string Error message with error number
*/
function lastError() {
if ($this->__lastQueryHadError) {
$error = mssql_get_last_message();
if ($error && !preg_match('/contexto de la base de datos a|contesto di database|changed database|contexte de la base de don|datenbankkontext/i', $error)) {
return $error;
}
}
return null;
}
/**
* Returns number of affected rows in previous database operation. If no previous operation exists,
* this returns false.
*
* @return integer Number of affected rows
*/
function lastAffected() {
if ($this->_result) {
return mssql_rows_affected($this->connection);
}
return null;
}
/**
* Returns number of rows in previous resultset. If no previous resultset exists,
* this returns false.
*
* @return integer Number of rows in resultset
*/
function lastNumRows() {
if ($this->_result) {
return @mssql_num_rows($this->_result);
}
return null;
}
/**
* Returns the ID generated from the previous INSERT operation.
*
* @param unknown_type $source
* @return in
*/
function lastInsertId($source = null) {
$id = $this->fetchRow('SELECT SCOPE_IDENTITY() AS insertID', false);
return $id[0]['insertID'];
}
/** /**
* Returns a limit statement in the correct format for the particular database. * Returns a limit statement in the correct format for the particular database.
* *
@ -544,25 +455,24 @@ class DboMssql extends DboSource {
} }
/** /**
* Enter description here... * Builds a map of the columns contained in a result
* *
* @param unknown_type $results * @param PDOStatement $results
*/ */
function resultSet(&$results) { function resultSet($results) {
$this->results =& $results;
$this->map = array(); $this->map = array();
$numFields = mssql_num_fields($results); $numFields = $results->columnCount();
$index = 0; $index = 0;
$j = 0; $j = 0;
while ($j < $numFields) { while ($numFields-- > 0) {
$column = mssql_field_name($results, $j); $column = $results->getColumnMeta($index);
if (strpos($column, '__')) { if (strpos($column, '__')) {
if (isset($this->__fieldMappings[$column]) && strpos($this->__fieldMappings[$column], '.')) { if (isset($this->_fieldMappings[$column]) && strpos($this->_fieldMappings[$column], '.')) {
$map = explode('.', $this->__fieldMappings[$column]); $map = explode('.', $this->_fieldMappings[$column]);
} elseif (isset($this->__fieldMappings[$column])) { } elseif (isset($this->_fieldMappings[$column])) {
$map = array(0, $this->__fieldMappings[$column]); $map = array(0, $this->_fieldMappings[$column]);
} else { } else {
$map = array(0, $column); $map = array(0, $column);
} }
@ -647,10 +557,10 @@ class DboMssql extends DboSource {
* @access private * @access private
*/ */
function __mapFields($sql) { function __mapFields($sql) {
if (empty($sql) || empty($this->__fieldMappings)) { if (empty($sql) || empty($this->_fieldMappings)) {
return $sql; return $sql;
} }
foreach ($this->__fieldMappings as $key => $val) { foreach ($this->_fieldMappings as $key => $val) {
$sql = preg_replace('/' . preg_quote($val) . '/', $this->name($key), $sql); $sql = preg_replace('/' . preg_quote($val) . '/', $this->name($key), $sql);
$sql = preg_replace('/' . preg_quote($this->name($val)) . '/', $this->name($key), $sql); $sql = preg_replace('/' . preg_quote($this->name($val)) . '/', $this->name($key), $sql);
} }
@ -667,29 +577,29 @@ class DboMssql extends DboSource {
*/ */
function read($model, $queryData = array(), $recursive = null) { function read($model, $queryData = array(), $recursive = null) {
$results = parent::read($model, $queryData, $recursive); $results = parent::read($model, $queryData, $recursive);
$this->__fieldMappings = array(); $this->_fieldMappings = array();
return $results; return $results;
} }
/** /**
* Fetches the next row from the current result set * Fetches the next row from the current result set
* *
* @return unknown * @return mixed
*/ */
function fetchResult() { function fetchResult() {
if ($row = mssql_fetch_row($this->results)) { if ($row = $this->_result->fetch()) {
$resultRow = array(); $resultRow = array();
$i = 0; foreach ($this->map as $col => $meta) {
list($table, $column, $type) = $meta;
foreach ($row as $index => $field) { $resultRow[$table][$column] = $row[$col];
list($table, $column) = $this->map[$index]; if ($type === 'boolean' && !is_null($row[$col])) {
$resultRow[$table][$column] = $row[$index]; $resultRow[$table][$column] = $this->boolean($resultRow[$table][$column]);
$i++; }
} }
return $resultRow; return $resultRow;
} else {
return false;
} }
$this->_result->closeCursor();
return false;
} }
/** /**

33
lib/Cake/Test/Case/Model/Datasource/Database/MssqlTest.php
View file

@ -1,6 +1,6 @@
<?php <?php
/** /**
* DboMssqlTest file * MssqlTest file
* *
* PHP 5 * PHP 5
* *
@ -17,17 +17,15 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
require_once CAKE.'Model'.DS.'Model.php'; App::uses('Model', 'Model');
require_once CAKE.'Model'.DS.'Datasource'.DS.'DataSource.php'; App::uses('Mssql', 'Model/Datasource/Database');
require_once CAKE.'Model'.DS.'Datasource'.DS.'DboSource.php';
require_once CAKE.'Model'.DS.'Datasource'.DS.'Database'.DS.'Mssql.php';
/** /**
* DboMssqlTestDb class * MssqlTestDb class
* *
* @package cake.tests.cases.libs.model.datasources.dbo * @package cake.tests.cases.libs.model.datasources.dbo
*/ */
class DboMssqlTestDb extends DboMssql { class MssqlTestDb extends Mssql {
/** /**
* simulated property * simulated property
@ -121,7 +119,7 @@ class DboMssqlTestDb extends DboMssql {
* @return void * @return void
*/ */
function clearFieldMappings() { function clearFieldMappings() {
$this->__fieldMappings = array(); $this->_fieldMappings = array();
} }
} }
@ -261,11 +259,11 @@ class MssqlClientTestModel extends Model {
); );
} }
/** /**
* DboMssqlTest class * MssqlTest class
* *
* @package cake.tests.cases.libs.model.datasources.dbo * @package cake.tests.cases.libs.model.datasources.dbo
*/ */
class DboMssqlTest extends CakeTestCase { class MssqlTest extends CakeTestCase {
/** /**
* The Dbo instance to be tested * The Dbo instance to be tested
@ -289,14 +287,6 @@ class DboMssqlTest extends CakeTestCase {
* @access public * @access public
*/ */
public $fixtures = array('core.category'); public $fixtures = array('core.category');
/**
* Skip if cannot connect to mssql
*
*/
public function skip() {
$this->_initDb();
$this->skipUnless($this->db->config['driver'] == 'mssql', '%s SQL Server connection not available');
}
/** /**
* Make sure all fixtures tables are being created * Make sure all fixtures tables are being created
@ -321,8 +311,11 @@ class DboMssqlTest extends CakeTestCase {
* *
*/ */
public function setUp() { public function setUp() {
$db = ConnectionManager::getDataSource('test'); $this->Dbo = ConnectionManager::getDataSource('test');
$this->db = new DboMssqlTestDb($db->config); if (!($this->Dbo instanceof Mssql)) {
$this->markTestSkipped('Please configure the test datasource to use SQL Server.');
}
$this->db = new MssqlTestDb($this->Dbo->config);
$this->model = new MssqlTestModel(); $this->model = new MssqlTestModel();
} }