diff options
| author | Constantin Michael <constantin@codesynthesis.com> | 2011-10-20 11:02:34 +0200 |
|---|---|---|
| committer | Constantin Michael <constantin@codesynthesis.com> | 2011-10-21 13:29:10 +0200 |
| commit | 621a91328ba7f552ddcd05f3680184cd56357830 (patch) | |
| tree | fbb375d97aabee6e2e051279a7d9813b3a7c7b4e /libcommon | |
| parent | 049aa1e88958815a61e779f65e4c601fec104a10 (diff) | |
Correct create_database implementation for Oracle
Diffstat (limited to 'libcommon')
| -rw-r--r-- | libcommon/common/common.cxx | 13 | ||||
| -rw-r--r-- | libcommon/common/common.hxx | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/libcommon/common/common.cxx b/libcommon/common/common.cxx index c4cc667..285ef68 100644 --- a/libcommon/common/common.cxx +++ b/libcommon/common/common.cxx @@ -49,16 +49,8 @@ create_database (int& argc, char* argv[], #if defined(DATABASE_SQLITE) bool schema, - unsigned short, - unsigned short, -#elif defined(DATABASE_ORACLE) - bool, - unsigned short charset, - unsigned short ncharset, #else bool, - unsigned short, - unsigned short, #endif size_t max_connections) { @@ -128,7 +120,10 @@ create_database (int& argc, if (max_connections != 0) f.reset (new oracle::connection_pool_factory (max_connections)); - db.reset (new oracle::database (argc, argv, false, charset, ncharset, 0, f)); + // Set client database character set and client national character set + // to UTF-8. + // + db.reset (new oracle::database (argc, argv, false, 873, 873, 0, f)); #endif return db; diff --git a/libcommon/common/common.hxx b/libcommon/common/common.hxx index 71715d7..6ae33d4 100644 --- a/libcommon/common/common.hxx +++ b/libcommon/common/common.hxx @@ -25,8 +25,6 @@ LIBCOMMON_EXPORT std::auto_ptr<odb::database> create_database (int& argc, char* argv[], bool create_schema = true, - unsigned short charset = 0, - unsigned short ncharset = 0, std::size_t max_connections = 0); // This function returns an accurate result only if the result iterator |