Fixes after #3604

prisma · Jan 18, 2023 · 709c831 · 709c831
1 parent d57824e
commit 709c831
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/query-engine/core/src/interactive_transactions/error.rs b/query-engine/core/src/interactive_transactions/error.rs
@@ -1,5 +1,10 @@
 use thiserror::Error;
 
+use crate::{
+    response_ir::{Item, Map},
+    CoreError,
+};
+
 #[derive(Debug, Error, PartialEq)]
 pub enum TransactionError {
     #[error("Unable to start a transaction in the given time.")]
@@ -24,17 +29,17 @@ pub struct ExtendedTransactionUserFacingError {
     user_facing_error: user_facing_errors::Error,
 
     #[serde(skip_serializing_if = "indexmap::IndexMap::is_empty")]
-    extensions: crate::Map,
+    extensions: Map,
 }
 
 impl ExtendedTransactionUserFacingError {
     pub fn set_extension(&mut self, key: String, val: serde_json::Value) {
-        self.extensions.entry(key).or_insert(crate::Item::Json(val));
+        self.extensions.entry(key).or_insert(Item::Json(val));
     }
 }
 
-impl From<crate::CoreError> for ExtendedTransactionUserFacingError {
-    fn from(error: crate::CoreError) -> Self {
+impl From<CoreError> for ExtendedTransactionUserFacingError {
+    fn from(error: CoreError) -> Self {
         ExtendedTransactionUserFacingError {
             user_facing_error: error.into(),
             extensions: Default::default(),

diff --git a/query-engine/core/src/lib.rs b/query-engine/core/src/lib.rs
@@ -15,8 +15,8 @@ pub mod telemetry;
 
 pub use self::{
     error::{CoreError, FieldConversionError},
-    executor::QueryExecutor,
-    interactive_transactions::{TransactionError, TxId},
+    executor::{QueryExecutor, TransactionOptions},
+    interactive_transactions::{ExtendedTransactionUserFacingError, TransactionError, TxId},
     query_document::*,
     telemetry::*,
 };