status-im/realm-js
2
0
Fork 0
mirror of https://github.com/status-im/realm-js.git synced 2025-02-04 10:43:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #892 from realm/al/adapter

Browse Source 
Make Realm creation available extenally, update OS and Sync versions
This commit is contained in:
Ari Lazier 2017-03-06 07:02:40 -08:00 committed by GitHub
commit 0d4d5a54f7
3 changed files with 23 additions and 9 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 PACKAGE_NAME=realm-js
VERSION=1.0.2 VERSION=1.0.2
REALM_CORE_VERSION=2.3.1 REALM_CORE_VERSION=2.3.2
REALM_SYNC_VERSION=1.2.0 REALM_SYNC_VERSION=1.3.0
REALM_OBJECT_SERVER_VERSION=1.0.3 REALM_OBJECT_SERVER_VERSION=1.0.3

26
src/js_realm.hpp
View File

@ -148,6 +148,9 @@ class RealmClass : public ClassDefinition<T, SharedRealm, ObservableClass<T>> {
using NativeAccessor = realm::NativeAccessor<ValueType, ContextType>; using NativeAccessor = realm::NativeAccessor<ValueType, ContextType>;
public: public:
using ObjectDefaultsMap = typename Schema<T>::ObjectDefaultsMap;
using ConstructorMap = typename Schema<T>::ConstructorMap;
static FunctionType create_constructor(ContextType); static FunctionType create_constructor(ContextType);
// methods // methods
@ -173,6 +176,8 @@ public:
// static methods // static methods
static void constructor(ContextType, ObjectType, size_t, const ValueType[]); static void constructor(ContextType, ObjectType, size_t, const ValueType[]);
static SharedRealm create_shared_realm(ContextType, realm::Realm::Config, bool, ObjectDefaultsMap &&, ConstructorMap &&);
static void schema_version(ContextType, FunctionType, ObjectType, size_t, const ValueType[], ReturnValue &); static void schema_version(ContextType, FunctionType, ObjectType, size_t, const ValueType[], ReturnValue &);
static void clear_test_state(ContextType, FunctionType, ObjectType, size_t, const ValueType[], ReturnValue &); static void clear_test_state(ContextType, FunctionType, ObjectType, size_t, const ValueType[], ReturnValue &);
static void copy_bundled_realm_files(ContextType, FunctionType, ObjectType, size_t, const ValueType[], ReturnValue &); static void copy_bundled_realm_files(ContextType, FunctionType, ObjectType, size_t, const ValueType[], ReturnValue &);
@ -318,8 +323,8 @@ static inline void convert_outdated_datetime_columns(const SharedRealm &realm) {
template<typename T> template<typename T>
void RealmClass<T>::constructor(ContextType ctx, ObjectType this_object, size_t argc, const ValueType arguments[]) { void RealmClass<T>::constructor(ContextType ctx, ObjectType this_object, size_t argc, const ValueType arguments[]) {
realm::Realm::Config config; realm::Realm::Config config;
typename Schema<T>::ObjectDefaultsMap defaults; ObjectDefaultsMap defaults;
typename Schema<T>::ConstructorMap constructors; ConstructorMap constructors;
bool schema_updated = false; bool schema_updated = false;
if (argc == 0) { if (argc == 0) {
@ -412,9 +417,21 @@ void RealmClass<T>::constructor(ContextType ctx, ObjectType this_object, size_t
config.path = normalize_path(config.path); config.path = normalize_path(config.path);
ensure_directory_exists_for_file(config.path); ensure_directory_exists_for_file(config.path);
auto realm = create_shared_realm(ctx, config, schema_updated, std::move(defaults), std::move(constructors));
// Fix for datetime -> timestamp conversion
convert_outdated_datetime_columns(realm);
set_internal<T, RealmClass<T>>(this_object, new SharedRealm(realm));
}
template<typename T>
SharedRealm RealmClass<T>::create_shared_realm(ContextType ctx, realm::Realm::Config config, bool schema_updated,
ObjectDefaultsMap && defaults, ConstructorMap && constructors) {
config.execution_context = reinterpret_cast<AbstractExecutionContextID>(Context<T>::get_execution_context_id(ctx)); config.execution_context = reinterpret_cast<AbstractExecutionContextID>(Context<T>::get_execution_context_id(ctx));
SharedRealm realm = realm::Realm::get_shared_realm(config); SharedRealm realm = realm::Realm::get_shared_realm(config);
GlobalContextType global_context = Context<T>::get_global_context(ctx); GlobalContextType global_context = Context<T>::get_global_context(ctx);
if (!realm->m_binding_context) { if (!realm->m_binding_context) {
realm->m_binding_context.reset(new RealmDelegate<T>(realm, global_context)); realm->m_binding_context.reset(new RealmDelegate<T>(realm, global_context));
@ -430,10 +447,7 @@ void RealmClass<T>::constructor(ContextType ctx, ObjectType this_object, size_t
js_binding_context->m_constructors = std::move(constructors); js_binding_context->m_constructors = std::move(constructors);
} }
// Fix for datetime -> timestamp conversion return realm;
convert_outdated_datetime_columns(realm);
set_internal<T, RealmClass<T>>(this_object, new SharedRealm(realm));
} }
template<typename T> template<typename T>

2
src/object-store

@ -1 +1 @@
Subproject commit e464af06104edede94ffd2de4465ab014a6337b9 Subproject commit 5a00a269ffcfbcc4c27b40a6dcf761f9b54fcc02