itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-12-29 21:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): require that RawValue::Database == other database associated types

Browse Source
This commit is contained in:
Ryan Leckey 2021-02-26 00:02:14 -08:00
parent 149313fe00
commit a92925a045
No known key found for this signature in database
GPG Key ID: F8AA68C235AB08C9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sqlx-core/src/database.rs
View File

@ -1,7 +1,7 @@
use std::fmt::Debug;
use std::hash::Hash;
use crate::{Column, QueryResult, Row, TypeInfo};
use crate::{Column, QueryResult, RawValue, Row, TypeInfo};
/// A database driver.
///
@ -10,7 +10,7 @@ use crate::{Column, QueryResult, Row, TypeInfo};
/// have multiple concrete `Connection` implementations.
///
pub trait Database:
'static + Sized + Debug + for<'x> HasOutput<'x> + for<'r> HasRawValue<'r>
'static + Sized + Debug + for<'x> HasOutput<'x> + for<'r> HasRawValue<'r, Database = Self>
{
/// The concrete [`Column`] implementation for this database.
type Column: Column<Database = Self>;
@ -25,7 +25,7 @@ pub trait Database:
type TypeInfo: TypeInfo<Database = Self>;
/// The concrete [`TypeId`] implementation for this database.
type TypeId: PartialEq + Hash + Clone + Copy;
type TypeId: 'static + PartialEq + Hash + Clone + Copy + Send + Sync;
}
/// Associates [`Database`] with an `Output` of a generic lifetime.
@ -38,6 +38,8 @@ pub trait HasOutput<'x> {
/// Associates [`Database`] with a `RawValue` of a generic lifetime.
// 'r: row
pub trait HasRawValue<'r> {
type Database: Database;
/// The concrete type to hold the input for [`Decode`] for this database.
type RawValue;
type RawValue: RawValue<'r, Database = Self::Database>;
}