summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/SqlDB/SqlDB.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/SqlDB/SqlDB.cpp')
-rw-r--r--cpp/src/IceGrid/SqlDB/SqlDB.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/SqlDB/SqlDB.cpp b/cpp/src/IceGrid/SqlDB/SqlDB.cpp
index 5405655d7d0..ac84041e365 100644
--- a/cpp/src/IceGrid/SqlDB/SqlDB.cpp
+++ b/cpp/src/IceGrid/SqlDB/SqlDB.cpp
@@ -94,8 +94,10 @@ SqlDatabaseCache::SqlDatabaseCache(const Ice::CommunicatorPtr& communicator,
int port,
const string& username,
const string& password,
- const string& tablePrefix) :
- SqlDB::DatabaseCache(communicator, databaseType, databaseName, hostname, port, username, password, true)
+ const string& tablePrefix,
+ const string& encoding) :
+ SqlDB::DatabaseCache(communicator, databaseType, databaseName, hostname, port, username, password, true,
+ Ice::stringToEncodingVersion(encoding))
{
IceDB::DatabaseConnectionPtr connection = getConnection();
IceDB::TransactionHolder txn(connection);
@@ -219,7 +221,8 @@ SqlDBPlugin::initialize()
properties->getPropertyAsInt("IceGrid.SQL.Port"),
properties->getProperty("IceGrid.SQL.UserName"),
properties->getProperty("IceGrid.SQL.Password"),
- tablePrefix);
+ tablePrefix,
+ properties->getProperty("IceGrid.SQL.EncodingVersion"));
SqlDB::ThreadHookPtr threadHook =
SqlDB::ThreadHookPtr::dynamicCast(IceInternal::getInstance(_communicator)->initializationData().threadHook);