status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #86 from realm/tg/config-error-path 

Add the path of the Realm file to the config mismatch exception message
This commit is contained in:
Thomas Goyne 2016-06-06 16:05:45 -07:00
parent af8e8dd0ef 5054bbc1a2
commit 789e7d3c1b
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/impl/realm_coordinator.cpp
View File

@ -75,16 +75,16 @@ std::shared_ptr<Realm> RealmCoordinator::get_realm(Realm::Config config)
} }
else { else {
if (m_config.read_only != config.read_only) { if (m_config.read_only != config.read_only) {
throw MismatchedConfigException("Realm at path already opened with different read permissions."); throw MismatchedConfigException("Realm at path '%1' already opened with different read permissions.", config.path);
} }
if (m_config.in_memory != config.in_memory) { if (m_config.in_memory != config.in_memory) {
throw MismatchedConfigException("Realm at path already opened with different inMemory settings."); throw MismatchedConfigException("Realm at path '%1' already opened with different inMemory settings.", config.path);
} }
if (m_config.encryption_key != config.encryption_key) { if (m_config.encryption_key != config.encryption_key) {
throw MismatchedConfigException("Realm at path already opened with a different encryption key."); throw MismatchedConfigException("Realm at path '%1' already opened with a different encryption key.", config.path);
} }
if (m_config.schema_version != config.schema_version && config.schema_version != ObjectStore::NotVersioned) { if (m_config.schema_version != config.schema_version && config.schema_version != ObjectStore::NotVersioned) {
throw MismatchedConfigException("Realm at path already opened with different schema version."); throw MismatchedConfigException("Realm at path '%1' already opened with different schema version.", config.path);
} }
// FIXME: verify that schema is compatible // FIXME: verify that schema is compatible
// Needs to verify that all tables present in both are identical, and // Needs to verify that all tables present in both are identical, and
@ -93,7 +93,7 @@ std::shared_ptr<Realm> RealmCoordinator::get_realm(Realm::Config config)
// Public API currently doesn't make it possible to have non-matching // Public API currently doesn't make it possible to have non-matching
// schemata so it's not a huge issue // schemata so it's not a huge issue
if ((false) && m_config.schema != config.schema) { if ((false) && m_config.schema != config.schema) {
throw MismatchedConfigException("Realm at path already opened with different schema"); throw MismatchedConfigException("Realm at path '%1' already opened with different schema", config.path);
} }
} }

3
src/shared_realm.cpp
View File

@ -492,3 +492,6 @@ void Realm::close()
m_binding_context = nullptr; m_binding_context = nullptr;
m_coordinator = nullptr; m_coordinator = nullptr;
} }
MismatchedConfigException::MismatchedConfigException(StringData message, StringData path)
: std::runtime_error(util::format(message.data(), path)) { }

2
src/shared_realm.hpp
View File

@ -217,7 +217,7 @@ namespace realm {
class MismatchedConfigException : public std::runtime_error { class MismatchedConfigException : public std::runtime_error {
public: public:
MismatchedConfigException(std::string message) : std::runtime_error(move(message)) {} MismatchedConfigException(StringData message, StringData path);
}; };
class InvalidTransactionException : public std::runtime_error { class InvalidTransactionException : public std::runtime_error {