diff options
| author | Constantin Michael <constantin@codesynthesis.com> | 2011-10-17 09:13:48 +0200 |
|---|---|---|
| committer | Constantin Michael <constantin@codesynthesis.com> | 2011-10-21 13:29:03 +0200 |
| commit | 8295852a42e7dc178ee9cf94df746a85dda48b05 (patch) | |
| tree | 16088da2d70a2326b08d6d7fc90eb8392c1aa5b6 /libcommon/common | |
| parent | bdeee8eabc02e01f57c2fc43415ef8813ed69814 (diff) | |
Add Oracle create_database code allowing for specification of character sets
Diffstat (limited to 'libcommon/common')
| -rw-r--r-- | libcommon/common/common.cxx | 10 | ||||
| -rw-r--r-- | libcommon/common/common.hxx | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libcommon/common/common.cxx b/libcommon/common/common.cxx index d09c14b..c4cc667 100644 --- a/libcommon/common/common.cxx +++ b/libcommon/common/common.cxx @@ -49,8 +49,16 @@ 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) { @@ -120,7 +128,7 @@ 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, 0, f)); + db.reset (new oracle::database (argc, argv, false, charset, ncharset, 0, f)); #endif return db; diff --git a/libcommon/common/common.hxx b/libcommon/common/common.hxx index 6ae33d4..71715d7 100644 --- a/libcommon/common/common.hxx +++ b/libcommon/common/common.hxx @@ -25,6 +25,8 @@ 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 |