status-im/realm-js
2
0
Fork 0
mirror of https://github.com/status-im/realm-js.git synced 2025-01-11 14:54:33 +00:00
Code Issues Projects Releases Wiki Activity

Use sync 1.4.0 (#918)

Browse Source 
* Use sync 1.4.0

* Use master@OS

* Make normalize_path available for the GN (#932)
This commit is contained in:
Radu Tutueanu 2017-03-23 15:43:02 +01:00 committed by GitHub
parent f551a51acc
commit 479b21c3f8
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dependencies.list
View File

@ -1,5 +1,5 @@
PACKAGE_NAME=realm-js
VERSION=1.1.1
REALM_CORE_VERSION=2.3.3
REALM_SYNC_VERSION=1.3.1
REALM_CORE_VERSION=2.4.0
REALM_SYNC_VERSION=1.4.0
REALM_OBJECT_SERVER_VERSION=1.0.3

38
src/js_realm.hpp
View File

@ -44,6 +44,20 @@
namespace realm {
namespace js {
static std::string normalize_realm_path(std::string path) {
#if defined(WIN32) && WIN32
if (path.size() > 1 && path[0] != '\\' && path[1] != ':') {
path = default_realm_file_directory() + "\\" + path;
}
std::replace(path.begin(), path.end(), '/', '\\');
#else
if (path.size() && path[0] != '/' && path[0] != '.') {
path = default_realm_file_directory() + "/" + path;
}
#endif
return path;
}
template<typename T>
class Realm;
@ -260,20 +274,6 @@ public:
}
return *object_schema;
}
static std::string normalize_path(std::string path) {
#if defined(WIN32) && WIN32
if (path.size() > 1 && path[0] != '\\' && path[1] != ':') {
path = default_realm_file_directory() + "\\" + path;
}
std::replace(path.begin(), path.end(), '/', '\\');
#else
if (path.size() && path[0] != '/' && path[0] != '.') {
path = default_realm_file_directory() + "/" + path;
}
#endif
return path;
}
};
template<typename T>
@ -421,7 +421,7 @@ void RealmClass<T>::constructor(ContextType ctx, ObjectType this_object, size_t
throw std::runtime_error("Invalid arguments when constructing 'Realm'");
}
config.path = normalize_path(config.path);
config.path = normalize_realm_path(config.path);
ensure_directory_exists_for_file(config.path);
auto realm = create_shared_realm(ctx, config, schema_updated, std::move(defaults), std::move(constructors));
@ -462,7 +462,7 @@ void RealmClass<T>::schema_version(ContextType ctx, FunctionType, ObjectType thi
validate_argument_count(argc, 1, 2);
realm::Realm::Config config;
config.path = normalize_path(Value::validated_to_string(ctx, arguments[0]));
config.path = normalize_realm_path(Value::validated_to_string(ctx, arguments[0]));
if (argc == 2) {
auto encryptionKeyValue = arguments[1];
std::string encryptionKey = NativeAccessor::to_binary(ctx, encryptionKeyValue);
@ -534,10 +534,10 @@ void RealmClass<T>::get_sync_session(ContextType ctx, ObjectType object, ReturnV
} else {
return_value.set_null();
}
}
#endif
template<typename T>
void RealmClass<T>::objects(ContextType ctx, FunctionType, ObjectType this_object, size_t argc, const ValueType arguments[], ReturnValue &return_value) {
validate_argument_count(argc, 1);
@ -601,7 +601,7 @@ void RealmClass<T>::delete_one(ContextType ctx, FunctionType, ObjectType this_ob
if (!object->is_valid()) {
throw std::runtime_error("Object is invalid. Either it has been previously deleted or the Realm it belongs to has been closed.");
}
realm::TableRef table = ObjectStore::table_for_object_type(realm->read_group(), object->get_object_schema().name);
table->move_last_over(object->row().get_index());
}

2
src/object-store

@ -1 +1 @@
Subproject commit 63161b1af30100d1a8b89bc9877c67457ca78498
Subproject commit bd9f61b4c3d59dfa094c8ffe9129d5b216343976