chore: replace awkward "super::super::" with "crate::..."

prisma · Nov 15, 2023 · 76816fd · 76816fd
1 parent 2ffe394
commit 76816fd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/query-engine/connectors/sql-query-connector/src/database/native/mssql.rs b/query-engine/connectors/sql-query-connector/src/database/native/mssql.rs
@@ -1,4 +1,4 @@
-use super::super::connection::SqlConnection;
+use crate::database::{catch, connection::SqlConnection};
 use crate::{FromSource, SqlError};
 use async_trait::async_trait;
 use connector_interface::{
@@ -60,7 +60,7 @@ impl FromSource for Mssql {
 #[async_trait]
 impl Connector for Mssql {
     async fn get_connection<'a>(&'a self) -> connector::Result<Box<dyn Connection + Send + Sync + 'static>> {
-        super::super::catch(self.connection_info.clone(), async move {
+        catch(self.connection_info.clone(), async move {
             let conn = self.pool.check_out().await.map_err(SqlError::from)?;
             let conn = SqlConnection::new(conn, &self.connection_info, self.features);
 

diff --git a/query-engine/connectors/sql-query-connector/src/database/native/mysql.rs b/query-engine/connectors/sql-query-connector/src/database/native/mysql.rs
@@ -1,4 +1,4 @@
-use super::super::connection::SqlConnection;
+use crate::database::{catch, connection::SqlConnection};
 use crate::{FromSource, SqlError};
 use async_trait::async_trait;
 use connector_interface::{
@@ -65,7 +65,7 @@ impl FromSource for Mysql {
 #[async_trait]
 impl Connector for Mysql {
     async fn get_connection<'a>(&'a self) -> connector::Result<Box<dyn Connection + Send + Sync + 'static>> {
-        super::super::catch(self.connection_info.clone(), async move {
+        catch(self.connection_info.clone(), async move {
             let runtime_conn = self.pool.check_out().await?;
 
             // Note: `runtime_conn` must be `Sized`, as that's required by `TransactionCapable`

diff --git a/query-engine/connectors/sql-query-connector/src/database/native/postgresql.rs b/query-engine/connectors/sql-query-connector/src/database/native/postgresql.rs
@@ -1,4 +1,4 @@
-use super::super::connection::SqlConnection;
+use crate::database::{catch, connection::SqlConnection};
 use crate::{FromSource, SqlError};
 use async_trait::async_trait;
 use connector_interface::{
@@ -67,7 +67,7 @@ impl FromSource for PostgreSql {
 #[async_trait]
 impl Connector for PostgreSql {
     async fn get_connection<'a>(&'a self) -> connector_interface::Result<Box<dyn Connection + Send + Sync + 'static>> {
-        super::super::catch(self.connection_info.clone(), async move {
+        catch(self.connection_info.clone(), async move {
             let conn = self.pool.check_out().await.map_err(SqlError::from)?;
             let conn = SqlConnection::new(conn, &self.connection_info, self.features);
             Ok(Box::new(conn) as Box<dyn Connection + Send + Sync + 'static>)

diff --git a/query-engine/connectors/sql-query-connector/src/database/native/sqlite.rs b/query-engine/connectors/sql-query-connector/src/database/native/sqlite.rs
@@ -1,4 +1,4 @@
-use super::super::connection::SqlConnection;
+use crate::database::{catch, connection::SqlConnection};
 use crate::{FromSource, SqlError};
 use async_trait::async_trait;
 use connector_interface::{
@@ -80,7 +80,7 @@ fn invalid_file_path_error(file_path: &str, connection_info: &ConnectionInfo) ->
 #[async_trait]
 impl Connector for Sqlite {
     async fn get_connection<'a>(&'a self) -> connector::Result<Box<dyn Connection + Send + Sync + 'static>> {
-        super::super::catch(self.connection_info().clone(), async move {
+        catch(self.connection_info().clone(), async move {
             let conn = self.pool.check_out().await.map_err(SqlError::from)?;
             let conn = SqlConnection::new(conn, self.connection_info(), self.features);
 

diff --git a/...ors/sql-schema-connector/src/sql_schema_calculator/sql_schema_calculator_flavour/mssql.rs b/...ors/sql-schema-connector/src/sql_schema_calculator/sql_schema_calculator_flavour/mssql.rs
@@ -23,7 +23,7 @@ impl SqlSchemaCalculatorFlavour for MssqlFlavour {
         }
     }
 
-    fn push_connector_data(&self, context: &mut super::super::Context<'_>) {
+    fn push_connector_data(&self, context: &mut crate::sql_schema_calculator::Context<'_>) {
         let mut data = MssqlSchemaExt::default();
 
         for model in context.datamodel.db.walk_models() {

diff --git a/.../sql-schema-connector/src/sql_schema_calculator/sql_schema_calculator_flavour/postgres.rs b/.../sql-schema-connector/src/sql_schema_calculator/sql_schema_calculator_flavour/postgres.rs
@@ -37,7 +37,7 @@ impl SqlSchemaCalculatorFlavour for PostgresFlavour {
         }
     }
 
-    fn push_connector_data(&self, context: &mut super::super::Context<'_>) {
+    fn push_connector_data(&self, context: &mut crate::sql_schema_calculator::Context<'_>) {
         let mut postgres_ext = PostgresSchemaExt::default();
         let db = &context.datamodel.db;