Skip to content
This repository was archived by the owner on Feb 11, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 27 additions & 12 deletions SQLite3Component/Database.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ namespace SQLite3 {
}

// Need to remember the current thread for later callbacks into JS
CoreDispatcher^ dispatcher = CoreWindow::GetForCurrentThread()->Dispatcher;
CoreDispatcher^ dispatcher = CoreWindow::GetForCurrentThread() ? CoreWindow::GetForCurrentThread()->Dispatcher : nullptr;

return Concurrency::create_async([dbPath, dispatcher]() {
sqlite3* sqlite;
int ret = sqlite3_open16(dbPath->Data(), &sqlite);
Expand Down Expand Up @@ -178,30 +178,45 @@ namespace SQLite3 {
if (insertChangeHandlers) {
ChangeEvent event;
event.RowId = rowId;
event.TableName = ToPlatformString(tableName);
handler = ref new DispatchedHandler([this, event]() {
event.TableName = ToPlatformString(tableName);
if (dispatcher == nullptr) {
_Insert(this, event);
});
return;
} else {
handler = ref new DispatchedHandler([this, event]() {
_Insert(this, event);
});
}
}
break;
case SQLITE_UPDATE:
if (updateChangeHandlers) {
ChangeEvent event;
event.RowId = rowId;
event.TableName = ToPlatformString(tableName);
handler = ref new DispatchedHandler([this, event]() {
event.TableName = ToPlatformString(tableName);
if (dispatcher == nullptr) {
_Update(this, event);
});
return;
} else {
handler = ref new DispatchedHandler([this, event]() {
_Update(this, event);
});
}
}
break;
case SQLITE_DELETE:
if (deleteChangeHandlers) {
ChangeEvent event;
event.RowId = rowId;
event.TableName = ToPlatformString(tableName);
handler = ref new DispatchedHandler([this, event]() {
_Delete(this, event);
});
event.TableName = ToPlatformString(tableName);
if (dispatcher == nullptr) {
_Insert(this, event);
return;
} else {
handler = ref new DispatchedHandler([this, event]() {
_Delete(this, event);
});
}
}
break;
}
Expand Down
18 changes: 11 additions & 7 deletions SQLite3Component/Statement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,17 @@ namespace SQLite3 {
std::wostringstream output;
GetRow(output);
auto row = ref new Platform::String(output.str().c_str());
auto callbackTask = Concurrency::task<void>(
dispatcher->RunAsync(Windows::UI::Core::CoreDispatcherPriority::Normal,
ref new Windows::UI::Core::DispatchedHandler([row, callback]() {
callback(row);
}))
);
callbackTask.get();
if (dispatcher) {
auto callbackTask = Concurrency::task<void>(
dispatcher->RunAsync(Windows::UI::Core::CoreDispatcherPriority::Normal,
ref new Windows::UI::Core::DispatchedHandler([row, callback]() {
callback(row);
}))
);
callbackTask.get();
} else {
callback(row);
}
}
}

Expand Down