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

Add derive macros for Encode, Decode and HasSqlType for Transparent types, weak/strong enums and structs #97

Closed
wants to merge 12 commits into from
Closed

Add derive macros for Encode, Decode and HasSqlType for Transparent types, weak/strong enums and structs #97

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5bb5a6a
add derive macros for weak & strong enums and structs
Freax13 Jan 29, 2020
6cf904d
format
Freax13 Jan 29, 2020
18f4d47
fix db type
Freax13 Jan 29, 2020
55ea866
move feature guard from strong_enum to struct
Freax13 Jan 29, 2020
1d2caf7
split derives into different files
Freax13 Jan 30, 2020
b2c759a
move decode_struct_field and encode_struct_field to sqlx-core
Freax13 Feb 10, 2020
dd27f7e
switch from vecs to iterator chains
Freax13 Feb 10, 2020
642e98d
add explanation for size_hint
Freax13 Feb 10, 2020
71a962d
fix error messages
Freax13 Feb 10, 2020
9d0927c
add tests for postgres struct field encoding
Freax13 Feb 10, 2020
5716443
removed unused imports
Freax13 Feb 10, 2020
96f7efc
use iterator change in expand_derive_strong_enum
Freax13 Feb 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sqlx-core/src/mysql/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pub use error::MySqlError;

pub use types::MySqlTypeInfo;

pub use protocol::TypeId;

pub use row::MySqlRow;

/// An alias for [`Pool`], specialized for **MySQL**.
Expand Down
3 changes: 3 additions & 0 deletions sqlx-core/src/mysql/protocol/type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ impl TypeId {
pub const VAR_CHAR: TypeId = TypeId(253); // or VAR_BINARY
pub const TEXT: TypeId = TypeId(252); // or BLOB

// Enum
pub const ENUM: TypeId = TypeId(247);

// More Bytes
pub const TINY_BLOB: TypeId = TypeId(249);
pub const MEDIUM_BLOB: TypeId = TypeId(250);
Expand Down
9 changes: 8 additions & 1 deletion sqlx-core/src/mysql/types/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ impl MySqlTypeInfo {
char_set: def.char_set,
}
}

#[doc(hidden)]
pub fn r#enum() -> Self {
Self::new(TypeId::ENUM)
}
}

impl Display for MySqlTypeInfo {
Expand All @@ -67,14 +72,16 @@ impl TypeInfo for MySqlTypeInfo {
| TypeId::TINY_BLOB
| TypeId::MEDIUM_BLOB
| TypeId::LONG_BLOB
| TypeId::ENUM
if (self.is_binary == other.is_binary)
&& match other.id {
TypeId::VAR_CHAR
| TypeId::TEXT
| TypeId::CHAR
| TypeId::TINY_BLOB
| TypeId::MEDIUM_BLOB
| TypeId::LONG_BLOB => true,
| TypeId::LONG_BLOB
| TypeId::ENUM => true,

_ => false,
} =>
Expand Down
4 changes: 4 additions & 0 deletions sqlx-core/src/postgres/types/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ impl PgTypeInfo {
pub fn with_oid(oid: u32) -> Self {
Self { id: TypeId(oid) }
}

pub fn oid(&self) -> u32 {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd probably rather not expose this in the public API if possible (with custom types we may not always have an OID so this will need to be changed to Option<u32>). Either pub(crate) or #[doc(hidden)].

self.id.0
}
}

impl Display for PgTypeInfo {
Expand Down
88 changes: 0 additions & 88 deletions sqlx-macros/src/derives.rs
View file
Open in desktop

This file was deleted.

Loading