diff --git a/gulliver/thirdparty/creole/drivers/mssql/MSSQLResultSet.php b/gulliver/thirdparty/creole/drivers/mssql/MSSQLResultSet.php
index ea04639a2..79cc7ab3d 100644
--- a/gulliver/thirdparty/creole/drivers/mssql/MSSQLResultSet.php
+++ b/gulliver/thirdparty/creole/drivers/mssql/MSSQLResultSet.php
@@ -120,17 +120,17 @@ class MSSQLResultSet extends ResultSetCommon implements ResultSet {
return false;
}
}
- else {
- if (is_array($this->fields)) {
- foreach ($this->fields as $sKey => $sValue) {
- if (function_exists('mb_detect_encoding')) {
- if (strtoupper(mb_detect_encoding($sValue)) == 'UTF-8') {
- $this->fields[$sKey] = utf8_encode($sValue);
- }
- }
- }
- }
- }
+ //else {
+ // if (is_array($this->fields)) {
+ // foreach ($this->fields as $sKey => $sValue) {
+ // if (function_exists('mb_detect_encoding')) {
+ // if (strtoupper(mb_detect_encoding($sValue)) == 'UTF-8') {
+ // $this->fields[$sKey] = utf8_encode($sValue);
+ // }
+ // }
+ // }
+ // }
+ //}
if ($this->fetchmode === ResultSet::FETCHMODE_ASSOC && $this->lowerAssocCase) {
$this->fields = array_change_key_case($this->fields, CASE_LOWER);
diff --git a/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/MssqlPlatform.php b/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/MssqlPlatform.php
index 1e3e8e0f9..afa0419d9 100644
--- a/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/MssqlPlatform.php
+++ b/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/MssqlPlatform.php
@@ -42,8 +42,8 @@ class MssqlPlatform extends DefaultPlatform {
$this->setSchemaDomainMapping(new Domain(PropelTypes::INTEGER, "INT"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::BOOLEAN, "INT"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::DOUBLE, "FLOAT"));
- $this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "NTEXT"));
- $this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "NTEXT"));
+ $this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "NVARCHAR(MAX)"));
+ $this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "NVARCHAR(MAX)"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::DATE, "CHAR(19)"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::BU_DATE, "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::LONGVARBINARY, "IMAGE"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::BLOB, "IMAGE"));
- $this->setSchemaDomainMapping(new Domain(PropelTypes::VARCHAR, "NVARCHAR"));
+ $this->setSchemaDomainMapping(new Domain(PropelTypes::VARCHAR, "VARCHAR"));
}
/*
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 7344a199c..811d38ccb 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -17,7 +17,7 @@
-
+