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

Update crate for rust-postgres 0.17 & Rust 2018 syntax#14

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

Merged
sfackler merged 3 commits intorust-postgres:masterfromlfittl:postgres-0.17
Jan 1, 2020
Merged
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
4 changes: 2 additions & 2 deletions.travis.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ language: rust
rust:
- nightly
- beta
- 1.26.0
- 1.40.0
addons:
postgresql: 9.4
script:
- cargo test
- cargo test --features "with-time with-chrono"
- cargo test --features "with-chrono-0_4"
13 changes: 6 additions & 7 deletionsCargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,20 +2,19 @@
name = "postgres_range"
version = "0.9.1"
authors = ["Steven Fackler <sfackler@gmail.com>"]
edition = "2018"
license = "MIT"
description = "Range support for rust-postgres"
repository = "https://github.com/sfackler/rust-postgres-range"
documentation = "https://sfackler.github.io/rust-postgres-range/doc/v0.9.0/postgres_range"

[features]
with-time = ["time", "postgres-shared/with-time"]
with-chrono = ["chrono", "postgres-shared/with-chrono"]
with-chrono-0_4 = ["chrono-04", "postgres-types/with-chrono-0_4"]

[dependencies]
time = { version = "0.1", optional = true }
postgres-protocol = "0.3"
chrono = { version = "0.4.0", optional = true }
postgres-shared = "0.4.0"
postgres-protocol = "0.5"
postgres-types = "0.1"
chrono-04 = { version = "0.4", package = "chrono", optional = true }

[dev-dependencies]
postgres = { version = "0.15", features = ["with-time"] }
postgres = { version = "0.17" }
23 changes: 23 additions & 0 deletionssrc/chrono_04.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
use chrono_04::{DateTime, NaiveDateTime, TimeZone};

use crate::{Normalizable, RangeBound, BoundSided};

impl<T> Normalizable for DateTime<T>
where T: TimeZone {
fn normalize<S>(bound: RangeBound<S, DateTime<T>>) -> RangeBound<S, DateTime<T>>
where
S: BoundSided,
{
bound
}
}

impl Normalizable for NaiveDateTime
{
fn normalize<S>(bound: RangeBound<S, NaiveDateTime>) -> RangeBound<S, NaiveDateTime>
where
S: BoundSided,
{
bound
}
}
76 changes: 38 additions & 38 deletionssrc/impls.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
use std::error::Error;
use postgres_shared::types::{FromSql, IsNull, Kind, ToSql, Type};
use postgres_types::{FromSql, IsNull, Kind, ToSql, Type};
use postgres_types::private::BytesMut;
use postgres_protocol::{self as protocol, types};

use {BoundSided, BoundType, Normalizable, Range, RangeBound};
usecrate::{BoundSided, BoundType, Normalizable, Range, RangeBound};

impl<T> FromSql for Range<T>
impl<'a,T> FromSql<'a> for Range<T>
where
T: PartialOrd + Normalizable + FromSql,
T: PartialOrd + Normalizable + FromSql<'a>,
{
fn from_sql(ty: &Type, raw: &[u8]) -> Result<Range<T>, Box<Error + Sync + Send>> {
let element_type = match ty.kind() {
&Kind::Range(ref ty) => ty,
fn from_sql(ty: &Type, raw: &'a[u8]) -> Result<Range<T>, Box<dynError + Sync + Send>> {
let element_type = match*ty.kind() {
Kind::Range(ref ty) => ty,
_ => panic!("unexpected type {:?}", ty),
};

Expand All@@ -25,16 +26,16 @@ where
}

fn accepts(ty: &Type) -> bool {
match ty.kind() {
&Kind::Range(ref inner) => <T as FromSql>::accepts(inner),
match*ty.kind() {
Kind::Range(ref inner) => <T as FromSql>::accepts(inner),
_ => false,
}
}
}

fn bound_from_sql<T, S>(bound: types::RangeBound<Option<&[u8]>>, ty: &Type) -> Result<Option<RangeBound<S, T>>, Box<Error + Sync + Send>>
fn bound_from_sql<'a,T, S>(bound: types::RangeBound<Option<&'a[u8]>>, ty: &Type) -> Result<Option<RangeBound<S, T>>, Box<dynError + Sync + Send>>
where
T: PartialOrd + Normalizable + FromSql,
T: PartialOrd + Normalizable + FromSql<'a>,
S: BoundSided,
{
match bound {
Expand All@@ -60,9 +61,9 @@ impl<T> ToSql for Range<T>
where
T: PartialOrd + Normalizable + ToSql,
{
fn to_sql(&self, ty: &Type, buf: &mutVec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {
let element_type = match ty.kind() {
&Kind::Range(ref ty) => ty,
fn to_sql(&self, ty: &Type, buf: &mutBytesMut) -> Result<IsNull, Box<dynError + Sync + Send>> {
let element_type = match*ty.kind() {
Kind::Range(ref ty) => ty,
_ => panic!("unexpected type {:?}", ty),
};

Expand All@@ -80,16 +81,16 @@ where
}

fn accepts(ty: &Type) -> bool {
match ty.kind() {
&Kind::Range(ref inner) => <T as ToSql>::accepts(inner),
match*ty.kind() {
Kind::Range(ref inner) => <T as ToSql>::accepts(inner),
_ => false,
}
}

to_sql_checked!();
}

fn bound_to_sql<S, T>(bound: Option<&RangeBound<S, T>>, ty: &Type, buf: &mutVec<u8>) -> Result<types::RangeBound<protocol::IsNull>, Box<Error + Sync + Send>>
fn bound_to_sql<S, T>(bound: Option<&RangeBound<S, T>>, ty: &Type, buf: &mutBytesMut) -> Result<types::RangeBound<protocol::IsNull>, Box<dynError + Sync + Send>>
where
S: BoundSided,
T: ToSql,
Expand All@@ -114,10 +115,10 @@ where
mod test {
use std::fmt;

use postgres::{Connection, TlsMode};
use postgres::{Client, NoTls};
use postgres::types::{FromSql, ToSql};
#[cfg(feature = "with-time")]
usetime::{self, Timespec};
#[cfg(feature = "with-chrono-0_4")]
usechrono_04::{TimeZone, Utc, Duration};

macro_rules! test_range {
($name:expr, $t:ty, $low:expr, $low_str:expr, $high:expr, $high_str:expr) => ({
Expand All@@ -140,16 +141,21 @@ mod test {
})
}

fn test_type<T: PartialEq + FromSql + ToSql, S: fmt::Display>(sql_type: &str, checks: &[(T, S)]) {
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();

fn test_type<T, S>(sql_type: &str, checks: &[(T, S)])
where for<'a>
T: Sync + PartialEq + FromSql<'a> + ToSql,
S: fmt::Display
{
let mut conn = Client::connect("postgres://postgres@localhost", NoTls).unwrap();
for &(ref val, ref repr) in checks {
let stmt = conn.prepare(&*format!("SELECT {}::{}", *repr, sql_type))
.unwrap();
let result =stmt.query(&[]).unwrap().iter().next().unwrap().get(0);
let result =conn.query(&stmt,&[]).unwrap().iter().next().unwrap().get(0);
assert!(val == &result);

let stmt = conn.prepare(&*format!("SELECT $1::{}", sql_type)).unwrap();
let result =stmt.query(&[val]).unwrap().iter().next().unwrap().get(0);
let result =conn.query(&stmt,&[val]).unwrap().iter().next().unwrap().get(0);
assert!(val == &result);
}
}
Expand All@@ -164,25 +170,19 @@ mod test {
test_range!("INT8RANGE", i64, 100i64, "100", 200i64, "200")
}

#[cfg(feature = "with-time")]
fn test_timespec_range_params(sql_type: &str) {
fn t(time: &str) -> Timespec {
time::strptime(time, "%Y-%m-%d").unwrap().to_timespec()
}
let low = "1970-01-01";
let high = "1980-01-01";
test_range!(sql_type, Timespec, t(low), low, t(high), high);
}

#[test]
#[cfg(feature = "with-time")]
#[cfg(feature = "with-chrono-0_4")]
fn test_tsrange_params() {
test_timespec_range_params("TSRANGE");
let low = Utc.timestamp(0, 0);
let high = low + Duration::days(10);
test_range!("TSRANGE", NaiveDateTime, low.naive_utc(), "1970-01-01", high.naive_utc(), "1970-01-11");
}

#[test]
#[cfg(feature = "with-time")]
#[cfg(feature = "with-chrono-0_4")]
fn test_tstzrange_params() {
test_timespec_range_params("TSTZRANGE");
let low = Utc.timestamp(0, 0);
let high = low + Duration::days(10);
test_range!("TSTZRANGE", DateTime<Utc>, low, "1970-01-01", high, "1970-01-11");
}
}
79 changes: 19 additions & 60 deletionssrc/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,18 @@
//! Types dealing with ranges of values
#![doc(html_root_url = "https://sfackler.github.io/rust-postgres-range/doc/v0.9")]
#![warn(clippy::all, rust_2018_idioms, missing_docs)]

extern crate postgres_protocol;
#[macro_use(to_sql_checked)]
extern cratepostgres_shared;
extern cratepostgres_types;

#[cfg(feature = "with-time")]
extern crate time;
#[cfg(feature = "with-chrono")]
extern crate chrono;
#[cfg(feature = "with-chrono-0_4")]
mod chrono_04;

#[cfg(test)]
extern crate postgres;

#[cfg(feature = "with-chrono")]
use chrono::{DateTime, NaiveDateTime, TimeZone};
use std::cmp::Ordering;
use std::fmt;
use std::i32;
use std::i64;
use std::marker::PhantomData;
#[cfg(feature = "with-time")]
use time::Timespec;

use BoundSide::{Lower, Upper};
use BoundType::{Exclusive, Inclusive};
Expand DownExpand Up@@ -155,38 +146,6 @@ macro_rules! bounded_normalizable {
bounded_normalizable!(i32);
bounded_normalizable!(i64);

#[cfg(feature = "with-time")]
impl Normalizable for Timespec {
fn normalize<S>(bound: RangeBound<S, Timespec>) -> RangeBound<S, Timespec>
where
S: BoundSided,
{
bound
}
}

#[cfg(feature = "with-chrono")]
impl<T> Normalizable for DateTime<T>
where T: TimeZone {
fn normalize<S>(bound: RangeBound<S, DateTime<T>>) -> RangeBound<S, DateTime<T>>
where
S: BoundSided,
{
bound
}
}

#[cfg(feature = "with-chrono")]
impl Normalizable for NaiveDateTime
{
fn normalize<S>(bound: RangeBound<S, NaiveDateTime>) -> RangeBound<S, NaiveDateTime>
where
S: BoundSided,
{
bound
}
}

/// The possible sides of a bound.
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
pub enum BoundSide {
Expand DownExpand Up@@ -260,7 +219,7 @@ where
fn clone(&self) -> RangeBound<S, T> {
RangeBound {
value: self.value.clone(),
type_: self.type_.clone(),
type_: self.type_,
_m: PhantomData,
}
}
Expand All@@ -271,7 +230,7 @@ where
S: BoundSided,
T: fmt::Debug,
{
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt.debug_struct("RangeBound")
.field("value", &self.value)
.field("type_", &self.type_)
Expand All@@ -284,7 +243,7 @@ where
S: BoundSided,
T: fmt::Display,
{
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
let (lower, upper) = match self.type_ {
Inclusive => ('[', ']'),
Exclusive => ('(', ')'),
Expand All@@ -306,9 +265,9 @@ where
self.value == other.value && self.type_ == other.type_
}

fn ne(&self, other: &RangeBound<S, T>) -> bool {
/*fn ne(&self, other: &RangeBound<S, T>) -> bool {
self.value != other.value || self.type_ != other.type_
}
}*/
}

impl<S, T> Eq for RangeBound<S, T>
Expand DownExpand Up@@ -364,8 +323,8 @@ where
/// Constructs a new range bound
pub fn new(value: T, type_: BoundType) -> RangeBound<S, T> {
RangeBound {
value: value,
type_: type_,
value,
type_,
_m: PhantomData,
}
}
Expand All@@ -381,7 +340,7 @@ where
}
}

struct OptBound<'a, S:'a +BoundSided, T: 'a>(Option<&'a RangeBound<S, T>>);
struct OptBound<'a, S: BoundSided, T>(Option<&'a RangeBound<S, T>>);

impl<'a, S, T> PartialEq for OptBound<'a, S, T>
where
Expand All@@ -393,10 +352,10 @@ where
self_ == other
}

fn ne(&self, &OptBound(ref other): &OptBound<'a, S, T>) -> bool {
/*fn ne(&self, &OptBound(ref other): &OptBound<'a, S, T>) -> bool {
let &OptBound(ref self_) = self;
self_ != other
}
}*/
}

impl<'a, S, T> PartialOrd for OptBound<'a, S, T>
Expand DownExpand Up@@ -433,7 +392,7 @@ impl<T> fmt::Display for Range<T>
where
T: fmt::Display,
{
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
match self.inner {
Empty => write!(fmt, "empty"),
Normal(ref lower, ref upper) => {
Expand DownExpand Up@@ -558,7 +517,7 @@ where
let (_, OptBound(lower)) = order(OptBound(self.lower()), OptBound(other.lower()));
let (OptBound(upper), _) = order(OptBound(self.upper()), OptBound(other.upper()));

Range::new(lower.map(|v| v.clone()), upper.map(|v| v.clone()))
Range::new(lower.cloned(), upper.cloned())
}

/// Returns the union of this range with another if it is contiguous.
Expand DownExpand Up@@ -595,8 +554,8 @@ where
None
} else {
Some(Range::new(
l_lower.map(|v| v.clone()),
u_upper.map(|v| v.clone()),
l_lower.cloned(),
u_upper.cloned(),
))
}
}
Expand DownExpand Up@@ -758,7 +717,7 @@ mod test {
assert_eq!(r1, (range!('(',; ')')).intersect(&r1));

let r2 = range!('(' 10i32,; ')');
let exp = Range::new(r2.lower().map(|v| v.clone()), r1.upper().map(|v| v.clone()));
let exp = Range::new(r2.lower().copied(), r1.upper().copied());
assert_eq!(exp, r1.intersect(&r2));
assert_eq!(exp, r2.intersect(&r1));

Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp