Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

FromSql for type record, closes #310#1261

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Draft
myypo wants to merge3 commits intorust-postgres:master
base:master
Choose a base branch
Loading
frommyypo:records
Draft
Show file tree
Hide file tree
Changes fromall commits
Commits
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
1 change: 1 addition & 0 deletionspostgres-derive-test/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use std::fmt;
mod composites;
mod domains;
mod enums;
mod records;
mod transparent;

pub fn test_type<T, S>(conn: &mut Client, sql_type: &str, checks: &[(T, S)])
Expand Down
209 changes: 209 additions & 0 deletionspostgres-derive-test/src/records.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
use postgres::{Client, NoTls};
use postgres_types::{FromSql, ToSql, WrongType};
use std::error::Error;

#[test]
fn basic() {
#[derive(FromSql, ToSql, Debug, PartialEq)]
struct InventoryItem {
name: String,
supplier_id: i32,
price: Option<f64>,
}

let mut conn = Client::connect("user=postgres host=localhost port=5433", NoTls).unwrap();

let expected = InventoryItem {
name: "foobar".to_owned(),
supplier_id: 100,
price: Some(15.50),
};

let got = conn
.query_one("SELECT ('foobar', 100, 15.50::double precision)", &[])
.unwrap()
.try_get::<_, InventoryItem>(0)
.unwrap();

assert_eq!(got, expected);
}

#[test]
fn field_count_mismatch() {
#[derive(FromSql, Debug, PartialEq)]
struct InventoryItem {
name: String,
supplier_id: i32,
price: Option<f64>,
}

let mut conn = Client::connect("user=postgres host=localhost port=5433", NoTls).unwrap();

let err = conn
.query_one("SELECT ('foobar', 100)", &[])
.unwrap()
.try_get::<_, InventoryItem>(0)
.unwrap_err();
err.source().unwrap().is::<WrongType>();

let err = conn
.query_one("SELECT ('foobar', 100, 15.50, 'extra')", &[])
.unwrap()
.try_get::<_, InventoryItem>(0)
.unwrap_err();
err.source().unwrap().is::<WrongType>();
}

#[test]
fn wrong_type() {
#[derive(FromSql, Debug, PartialEq)]
struct InventoryItem {
name: String,
supplier_id: i32,
price: Option<f64>,
}

let mut conn = Client::connect("user=postgres host=localhost port=5433", NoTls).unwrap();

let err = conn
.query_one("SELECT ('foobar', 'not_an_int', 15.50)", &[])
.unwrap()
.try_get::<_, InventoryItem>(0)
.unwrap_err();
assert!(err.source().unwrap().is::<WrongType>());

let err = conn
.query_one("SELECT (123, 100, 15.50)", &[])
.unwrap()
.try_get::<_, InventoryItem>(0)
.unwrap_err();
assert!(err.source().unwrap().is::<WrongType>());
}

#[test]
fn nested_structs() {
#[derive(FromSql, Debug, PartialEq)]
struct Address {
street: String,
city: Option<String>,
}

#[derive(FromSql, Debug, PartialEq)]
struct Person {
name: String,
age: Option<i32>,
address: Address,
}

let mut conn = Client::connect("user=postgres host=localhost port=5433", NoTls).unwrap();

let result: Person = conn
.query_one(
"SELECT ('John', 30, ROW('123 Main St', 'Springfield'))",
&[],
)
.unwrap()
.get(0);

let expected = Person {
name: "John".to_owned(),
age: Some(30),
address: Address {
street: "123 Main St".to_owned(),
city: Some("Springfield".to_owned()),
},
};

assert_eq!(result, expected);
}

#[test]
fn domains() {
#[derive(FromSql, Debug, PartialEq)]
struct SpecialId(i32);

#[derive(FromSql, Debug, PartialEq)]
struct Person {
name: String,
age: Option<i32>,
id: SpecialId,
}

let mut conn = Client::connect("user=postgres host=localhost port=5433", NoTls).unwrap();
conn.execute("CREATE DOMAIN pg_temp.\"special_id\" AS integer;", &[])
.unwrap();

let result: Person = conn
.query_one("SELECT ('John', 30, 42::special_id)", &[])
.unwrap()
.get(0);

let expected = Person {
name: "John".to_owned(),
age: Some(30),
id: SpecialId(42),
};

assert_eq!(result, expected);
}

#[test]
fn enums() {
#[derive(FromSql, Debug, PartialEq)]
enum Employment {
Salaried,
Hourly,
Unemployed,
}

#[derive(FromSql, Debug, PartialEq)]
struct Person {
name: String,
age: Option<i32>,
employment: Employment,
}

let mut conn = Client::connect("user=postgres host=localhost port=5433", NoTls).unwrap();
conn.execute(
"CREATE TYPE pg_temp.employment AS ENUM ('Salaried', 'Hourly', 'Unemployed')",
&[],
)
.unwrap();

let result: Person = conn
.query_one("SELECT ('John', 30, 'Hourly'::employment)", &[])
.unwrap()
.get(0);

let expected = Person {
name: "John".to_owned(),
age: Some(30),
employment: Employment::Hourly,
};

assert_eq!(result, expected);
}

#[test]
fn generics() {
#[derive(FromSql, ToSql, Debug, PartialEq)]
struct GenericItem<T, U> {
first: T,
second: U,
}

let mut conn = Client::connect("user=postgres host=localhost port=5433", NoTls).unwrap();

let expected = GenericItem {
first: "test".to_owned(),
second: 42,
};

let got = conn
.query_one("SELECT ('test', 42)", &[])
.unwrap()
.try_get::<_, GenericItem<String, i32>>(0)
.unwrap();

assert_eq!(got, expected);
}
42 changes: 36 additions & 6 deletionspostgres-derive/src/accepts.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,9 @@ pub fn enum_body(name: &str, variants: &[Variant], allow_mismatch: bool) -> Toke
}
} else {
quote! {
if *type_ == postgres_types::Type::UNKNOWN {
return true;
}
if type_.name() != #name {
return false;
}
Expand All@@ -66,20 +69,47 @@ pub fn enum_body(name: &str, variants: &[Variant], allow_mismatch: bool) -> Toke
}
}

pub fncomposite_body(name: &str, trait_: &str, fields: &[Field]) -> TokenStream {
pub fncomposite_body_from_sql(name: &str, fields: &[Field]) -> TokenStream {
let num_fields = fields.len();
let trait_ = Ident::new(trait_, Span::call_site());
let trait_ = Ident::new("FromSql", Span::call_site());
let traits = iter::repeat(&trait_);
let field_names = fields.iter().map(|f| &f.name);
let field_types = fields.iter().map(|f| &f.type_);

quote! {
if type_.name() != #name {
return false;
match *type_.kind() {
::postgres_types::Kind::Composite(ref fields) if type_.name() == #name => {
if fields.len() != #num_fields {
return false;
}

fields.iter().all(|f| {
match f.name() {
#(
#field_names => {
<#field_types as ::postgres_types::#traits>::accepts(f.type_())
}
)*
_ => false,
}
})
},
::postgres_types::Kind::Pseudo => true,
_ => false,
}
}
}

pub fn composite_body_to_sql(name: &str, fields: &[Field]) -> TokenStream {
let num_fields = fields.len();
let trait_ = Ident::new("ToSql", Span::call_site());
let traits = iter::repeat(&trait_);
let field_names = fields.iter().map(|f| &f.name);
let field_types = fields.iter().map(|f| &f.type_);

quote! {
match *type_.kind() {
::postgres_types::Kind::Composite(ref fields) => {
::postgres_types::Kind::Composite(ref fields)if type_.name() == #name=> {
if fields.len() != #num_fields {
return false;
}
Expand All@@ -94,7 +124,7 @@ pub fn composite_body(name: &str, trait_: &str, fields: &[Field]) -> TokenStream
_ => false,
}
})
}
},
_ => false,
}
}
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp