Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

qe-wasm: Fix consistent now() value #4650

Merged
merged 3 commits into from Jan 17, 2024
Merged

qe-wasm: Fix consistent now() value #4650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7388d5e
qe-wasm: Fix consistent `now()` value
SevInf Jan 16, 2024
28f8e56
Fix formatting
SevInf Jan 16, 2024
a0414be
Reword comment
SevInf Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/prisma_12572.rs
View file
Open in desktop
Expand Up @@ -26,11 +26,7 @@ mod prisma_12572 {
.to_owned()
}

#[connector_test(exclude(
Postgres("pg.js.wasm", "neon.js.wasm"),
Sqlite("libsql.js.wasm"),
Vitess("planetscale.js.wasm")
))]
#[connector_test]
async fn all_generated_timestamps_are_the_same(runner: Runner) -> TestResult<()> {
runner
.query(r#"mutation { createOneTest1(data: {id:"one", test2s: { create: {id: "two"}}}) { id }}"#)
Expand Down
17 changes: 9 additions & 8 deletions query-engine/core/src/executor/request_context.rs
View file
Open in desktop
Expand Up @@ -18,14 +18,15 @@ tokio::task_local! {
///
/// If we had a query context we carry for the entire lifetime of the query, it would belong there.
pub(crate) fn get_request_now() -> PrismaValue {
// FIXME: we want to bypass task locals if this code is executed outside of a tokio context. As
// of this writing, it happens only in the query validation test suite.
//
// Eventually, this will go away when we have a plain query context reference we pass around.
if tokio::runtime::Handle::try_current().is_err() {
SevInf marked this conversation as resolved.
Show resolved Hide resolved
return PrismaValue::DateTime(chrono::Utc::now().into());
}
REQUEST_CONTEXT.with(|rc| rc.request_now.clone())
REQUEST_CONTEXT.try_with(|rc| rc.request_now.clone()).unwrap_or_else(|_|
// Task local might not be set in some cases.
// At the moment of writing, this happens only in query validation test suite.
// In that case, we want to fall back to realtime value. On the other hand, if task local is
// set, we want to use it, even if we are not running inside of tokio runtime (for example,
// in WASM case)
//
// Eventually, this will go away when we have a plain query context reference we pass around.
PrismaValue::DateTime(chrono::Utc::now().into()))
}

/// The engine protocol used for the whole duration of a request.
Expand Down