fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 4759 fixing sql server

Browse Source 
charset, now we expecting utf8 from freetds, and we obtain utf8 in propel, so we dont need to do anything to show international unicode characters
This commit is contained in:
Fernando Ontiveros
2011-05-20 19:29:28 -04:00
parent 4aec62825b
commit dbb94e78e6
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gulliver/thirdparty/creole/drivers/mssql/MSSQLResultSet.php vendored
View File

@@ -120,17 +120,17 @@ class MSSQLResultSet extends ResultSetCommon implements ResultSet {
return false; return false;
} }
} }
else { //else {
if (is_array($this->fields)) { // if (is_array($this->fields)) {
foreach ($this->fields as $sKey => $sValue) { // foreach ($this->fields as $sKey => $sValue) {
if (function_exists('mb_detect_encoding')) { // if (function_exists('mb_detect_encoding')) {
if (strtoupper(mb_detect_encoding($sValue)) == 'UTF-8') { // if (strtoupper(mb_detect_encoding($sValue)) == 'UTF-8') {
$this->fields[$sKey] = utf8_encode($sValue); // $this->fields[$sKey] = utf8_encode($sValue);
} // }
} // }
} // }
} // }
} //}
if ($this->fetchmode === ResultSet::FETCHMODE_ASSOC && $this->lowerAssocCase) { if ($this->fetchmode === ResultSet::FETCHMODE_ASSOC && $this->lowerAssocCase) {
$this->fields = array_change_key_case($this->fields, CASE_LOWER); $this->fields = array_change_key_case($this->fields, CASE_LOWER);

6
gulliver/thirdparty/propel-generator/classes/propel/engine/platform/MssqlPlatform.php vendored
View File

@@ -42,8 +42,8 @@ class MssqlPlatform extends DefaultPlatform {
$this->setSchemaDomainMapping(new Domain(PropelTypes::INTEGER, "INT")); $this->setSchemaDomainMapping(new Domain(PropelTypes::INTEGER, "INT"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::BOOLEAN, "INT")); $this->setSchemaDomainMapping(new Domain(PropelTypes::BOOLEAN, "INT"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::DOUBLE, "FLOAT")); $this->setSchemaDomainMapping(new Domain(PropelTypes::DOUBLE, "FLOAT"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "NTEXT")); $this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "NVARCHAR(MAX)"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "NTEXT")); $this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "NVARCHAR(MAX)"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::DATE, "CHAR(19)")); $this->setSchemaDomainMapping(new Domain(PropelTypes::DATE, "CHAR(19)"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::BU_DATE, "CHAR(19)")); $this->setSchemaDomainMapping(new Domain(PropelTypes::BU_DATE, "CHAR(19)"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::TIME, "CHAR(19)")); $this->setSchemaDomainMapping(new Domain(PropelTypes::TIME, "CHAR(19)"));
@@ -53,7 +53,7 @@ class MssqlPlatform extends DefaultPlatform {
$this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "IMAGE")); $this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "IMAGE"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "IMAGE")); $this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "IMAGE"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::BLOB, "IMAGE")); $this->setSchemaDomainMapping(new Domain(PropelTypes::BLOB, "IMAGE"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::VARCHAR, "NVARCHAR")); $this->setSchemaDomainMapping(new Domain(PropelTypes::VARCHAR, "VARCHAR"));
} }
/* /*