diff --git a/sqlx-core/src/column.rs b/sqlx-core/src/column.rs
index b583e480d1..9f45819ed6 100644
--- a/sqlx-core/src/column.rs
+++ b/sqlx-core/src/column.rs
@@ -4,7 +4,7 @@ use crate::error::Error;
 use std::fmt::Debug;
 
 pub trait Column: 'static + Send + Sync + Debug {
-    type Database: Database;
+    type Database: Database<Column = Self>;
 
     /// Gets the column ordinal.
     ///
diff --git a/sqlx-core/src/connection.rs b/sqlx-core/src/connection.rs
index 584e5c4756..802e05fb27 100644
--- a/sqlx-core/src/connection.rs
+++ b/sqlx-core/src/connection.rs
@@ -11,7 +11,7 @@ use url::Url;
 
 /// Represents a single database connection.
 pub trait Connection: Send {
-    type Database: Database;
+    type Database: Database<Connection = Self>;
 
     type Options: ConnectOptions<Connection = Self>;
 
@@ -184,7 +184,7 @@ impl LogSettings {
 }
 
 pub trait ConnectOptions: 'static + Send + Sync + FromStr<Err = Error> + Debug + Clone {
-    type Connection: Connection + ?Sized;
+    type Connection: Connection<Options = Self> + ?Sized;
 
     /// Parse the `ConnectOptions` from a URL.
     fn from_url(url: &Url) -> Result<Self, Error>;
diff --git a/sqlx-core/src/row.rs b/sqlx-core/src/row.rs
index 5923e25c03..4c96ced048 100644
--- a/sqlx-core/src/row.rs
+++ b/sqlx-core/src/row.rs
@@ -12,7 +12,7 @@ use crate::value::ValueRef;
 /// [`FromRow`]: crate::row::FromRow
 /// [`Query::fetch`]: crate::query::Query::fetch
 pub trait Row: Unpin + Send + Sync + 'static {
-    type Database: Database;
+    type Database: Database<Row = Self>;
 
     /// Returns `true` if this row has no columns.
     #[inline]
diff --git a/sqlx-core/src/value.rs b/sqlx-core/src/value.rs
index d7996561b7..94e8b7b16a 100644
--- a/sqlx-core/src/value.rs
+++ b/sqlx-core/src/value.rs
@@ -7,7 +7,7 @@ use std::borrow::Cow;
 
 /// An owned value from the database.
 pub trait Value {
-    type Database: Database;
+    type Database: Database<Value = Self>;
 
     /// Get this value as a reference.
     fn as_ref(&self) -> <Self::Database as Database>::ValueRef<'_>;