Skip to content

sqlsrv UTF-8 changes #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ianchanning wants to merge 6 commits into
base: master
Choose a base branch
from
Open

sqlsrv UTF-8 changes #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe02acc
Code to handle UTF-8 characters. Changed $columns['string'] to defaul…
ianchanning Oct 8, 2011
b2dc42d
whitespace change
ianchanning Oct 8, 2011
ecbf306
Remove check to force integer, float and binary empty quotes ('') to …
ianchanning Oct 12, 2011
f3f6158
Added note about sqlsrv UTF-8 and CakePHP 1.2
ianchanning Oct 12, 2011
5e0c9ad
Put back in the code to make this file CakePHP v1.3 compatible
ianchanning Oct 12, 2011
b8353e8
Convert DateTime objects to strings in the fetchResult function. Fix …
ianchanning Oct 12, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions models/datasources/dbo/dbo_sqlsrv.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class DboSqlsrv extends DboSource {
*/
var $columns = array(
'primary_key' => array('name' => 'IDENTITY (1, 1) NOT NULL'),
'string' => array('name' => 'varchar', 'limit' => '255'),
'string' => array('name' => 'nvarchar', 'limit' => '6000'), // ICC this limit doesn't seem to matter, I set it to 6000 anyway which is equivalent to nvarchar(3000)
'text' => array('name' => 'text'),
'integer' => array('name' => 'int', 'formatter' => 'intval'),
'float' => array('name' => 'numeric', 'formatter' => 'floatval'),
Expand Down Expand Up @@ -296,6 +296,9 @@ function value($data, $column = null, $safe = false) {

if (in_array($column, array('integer', 'float', 'binary')) && is_numeric($data)) {
return $data;
} else if ($column == 'string') {
// ICC we are assuming all string data is unicode now
return "N'" . $data . "'";
}
return "'" . $data . "'";
}
Expand Down Expand Up @@ -680,15 +683,20 @@ function fetchResult() {
if ($row = sqlsrv_fetch_array($this->results, SQLSRV_FETCH_NUMERIC)) {
$resultRow = array();
$i = 0;

foreach ($row as $index => $field) {
$a = $this->map[$index];
list($table, $column) = $a;
list($table, $column) = $this->map[$index];
if (is_a($row[$index], 'DateTime')) {
$dateTimeObj = $row[$index];
$row[$index] = $dateTimeObj->format('Y-m-d H:i:s');
}
$resultRow[$table][$column] = $row[$index];
$i++;
}
return $resultRow;
} else {
return false;
}
return false;
}

/**
Expand Down
2 changes: 2 additions & 0 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
This plugin contains various datasources contributed by the core CakePHP team and the community.
The datasources plugin is compatible with CakePHP 1.3+.

ICC - for this plugin I have modifed the sqlsrv driver to allow UTF-8 characters and make it more compatible with CakePHP v1.2.

### Using the datasources plugin

First download the repository and place it in `app/plugins/datasources` or on one of your plugin paths. You can then import and use the datasources in your App classes.
Expand Down