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

move exception message creation to exception constructors

This commit is contained in:
Ari Lazier 2015-07-30 12:22:01 -07:00
parent 136f9a4640
commit 6ef8e214f3
2 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
object_store.cpp
View File

@ -179,26 +179,25 @@ std::vector<ObjectSchemaValidationException> ObjectStore::verify_object_schema(G
// check object_type existence
if (current_prop.object_type.length() && schema.find(current_prop.object_type) == schema.end()) {
exceptions.emplace_back(InvalidPropertyException(table_schema.name, current_prop,
"Target type '" + current_prop.object_type + "' doesn't exist for property '" + current_prop.name + "'."));
exceptions.emplace_back(MissingObjectTypeException(table_schema.name, current_prop));
}
// check nullablity
if (current_prop.is_nullable) {
if (current_prop.type != PropertyTypeObject) {
exceptions.emplace_back(InvalidPropertyException(table_schema.name, current_prop,
"Only 'Object' property types are nullable"));
if (current_prop.type == PropertyTypeObject) {
if (!current_prop.is_nullable) {
exceptions.emplace_back(InvalidNullabilityException(table_schema.name, current_prop));
}
}
else if (current_prop.type == PropertyTypeObject) {
exceptions.emplace_back(InvalidPropertyException(table_schema.name, current_prop,
"'Object' property '" + current_prop.name + "' must be nullable."));
else {
if (current_prop.is_nullable) {
exceptions.emplace_back(InvalidNullabilityException(table_schema.name, current_prop));
}
}
// check primary keys
if (current_prop.is_primary) {
if (primary) {
exceptions.emplace_back(InvalidPropertyException(table_schema.name, current_prop, "Duplicate primary keys."));
exceptions.emplace_back(DuplicatePrimaryKeysException(table_schema.name));
}
primary = &current_prop;
}
@ -494,6 +493,27 @@ MissingPropertyException::MissingPropertyException(std::string object_type, Prop
m_what = "Property '" + property.name + "' is missing from latest object model.";
}
InvalidNullabilityException::InvalidNullabilityException(std::string object_type, Property &property) :
ObjectSchemaPropertyException(object_type, property)
{
if (property.type == PropertyTypeObject) {
if (!property.is_nullable) {
m_what = "'Object' property '" + property.name + "' must be nullable.";
}
}
else {
if (property.is_nullable) {
m_what = "Only 'Object' property types are nullable";
}
}
}
MissingObjectTypeException::MissingObjectTypeException(std::string object_type, Property &property) :
ObjectSchemaPropertyException(object_type, property)
{
m_what = "Target type '" + property.object_type + "' doesn't exist for property '" + property.name + "'.";
}
MismatchedPropertiesException::MismatchedPropertiesException(std::string object_type, Property &old_property, Property &new_property) :
ObjectSchemaValidationException(object_type), m_old_property(old_property), m_new_property(new_property)
{
@ -524,3 +544,9 @@ InvalidPrimaryKeyException::InvalidPrimaryKeyException(std::string object_type,
{
m_what = "Specified primary key property '" + primary + "' does not exist.";
}
DuplicatePrimaryKeysException::DuplicatePrimaryKeysException(std::string object_type) : ObjectSchemaValidationException(object_type)
{
m_what = "Duplicate primary keys for object '" + object_type + "'.";
}

15
object_store.hpp
View File

@ -192,10 +192,19 @@ namespace realm {
MissingPropertyException(std::string object_type, Property &property);
};
class InvalidPropertyException : public ObjectSchemaPropertyException {
class InvalidNullabilityException : public ObjectSchemaPropertyException {
public:
InvalidPropertyException(std::string object_type, Property &property, std::string message) :
ObjectSchemaPropertyException(object_type, property) { m_what = message; }
InvalidNullabilityException(std::string object_type, Property &property);
};
class MissingObjectTypeException : public ObjectSchemaPropertyException {
public:
MissingObjectTypeException(std::string object_type, Property &property);
};
class DuplicatePrimaryKeysException : public ObjectSchemaValidationException {
public:
DuplicatePrimaryKeysException(std::string object_type);
};
class MismatchedPropertiesException : public ObjectSchemaValidationException {