Merge branch 'release-v0.11.10' into release

sfackler · sfackler · commit 30f11af1a2c2 · 2016-08-05T13:35:55.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,15 @@
 language: rust
+cache: cargo
 sudo: required
 rust:
 - nightly
 - beta
-- 1.7.0
+- 1.9.0
 addons:
   postgresql: 9.4
 before_script:
 - "./.travis/setup.sh"
 script:
 - cargo test
-- cargo update -p bitflags --precise 0.5.0
 - cargo test --features "uuid rustc-serialize time unix_socket serde_json chrono openssl bit-vec eui48"
 - (test $TRAVIS_RUST_VERSION != "nightly" || cargo test --features nightly)
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "postgres"
-version = "0.11.9"
+version = "0.11.10"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 license = "MIT"
 description = "A native PostgreSQL driver"
 repository = "https://github.com/sfackler/rust-postgres"
-documentation = "https://sfackler.github.io/rust-postgres/doc/v0.11.9/postgres"
+documentation = "https://sfackler.github.io/rust-postgres/doc/v0.11.10/postgres"
 readme = "README.md"
 keywords = ["database", "postgres", "postgresql", "sql"]
 include = ["src/*", "Cargo.toml", "LICENSE", "README.md", "THIRD_PARTY"]
@@ -27,9 +27,8 @@ nightly = []
 bufstream = "0.1"
 byteorder = "0.5"
 log = "0.3"
-phf = "=0.7.14"
+phf = "=0.7.15"
 hex = "0.2"
-net2 = "0.2.16"
 rustc-serialize = { version = "0.3", optional = true }
 chrono = { version = "0.2.14", optional = true }
 openssl = { version = ">= 0.6.4, < 0.8", optional = true }
@@ -40,7 +39,6 @@ uuid = { version = ">= 0.1, < 0.3", optional = true }
 security-framework = { version = "0.1.2", optional = true }
 bit-vec = { version = "0.4", optional = true }
 eui48 = { version = "0.1", optional = true }
-clippy = { version = "0.0.61", optional = true }
 
 [dev-dependencies]
 url = "1.0"
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2015 Steven Fackler
+Copyright (c) 2013-2016 Steven Fackler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Rust-Postgres
 A native PostgreSQL driver for Rust.
 
-[Documentation](https://sfackler.github.io/rust-postgres/doc/v0.11.9/postgres)
+[Documentation](https://sfackler.github.io/rust-postgres/doc/v0.11.10/postgres)
 
 [![Build Status](https://travis-ci.org/sfackler/rust-postgres.png?branch=master)](https://travis-ci.org/sfackler/rust-postgres) [![Latest Version](https://img.shields.io/crates/v/postgres.svg)](https://crates.io/crates/postgres)
 
@@ -51,7 +51,7 @@ fn main() {
 ```
 
 ## Requirements
-* **Rust** - Rust-Postgres is developed against the 1.7 release of Rust
+* **Rust** - Rust-Postgres is developed against the 1.9 release of Rust
     available on http://www.rust-lang.org. It should also compile against more
     recent releases.
 
diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml
@@ -4,6 +4,6 @@ version = "0.1.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 
 [dependencies]
-phf_codegen = "=0.7.14"
+phf_codegen = "=0.7.15"
 regex = "0.1"
 marksman_escape = "0.1"
diff --git a/codegen/src/sqlstate.rs b/codegen/src/sqlstate.rs
@@ -98,6 +98,7 @@ pub enum SqlState {{
 "    /// An unknown code
     Other(String),
 }}
+
 "
            ).unwrap();
 }
diff --git a/src/error/sqlstate.rs b/src/error/sqlstate.rs
@@ -479,6 +479,7 @@ pub enum SqlState {
     /// An unknown code
     Other(String),
 }
+
 #[cfg_attr(rustfmt, rustfmt_skip)]
 static SQLSTATE_MAP: phf::Map<&'static str, SqlState> = ::phf::Map {
     key: 1897749892740154578,
diff --git a/src/lib.rs b/src/lib.rs
@@ -38,12 +38,10 @@
 //!     }
 //! }
 //! ```
-#![doc(html_root_url="https://sfackler.github.io/rust-postgres/doc/v0.11.9")]
+#![doc(html_root_url="https://sfackler.github.io/rust-postgres/doc/v0.11.10")]
 #![warn(missing_docs)]
 #![allow(unknown_lints, needless_lifetimes)] // for clippy
 #![cfg_attr(all(unix, feature = "nightly"), feature(unix_socket))]
-#![cfg_attr(feature = "clippy", feature(plugin))]
-#![cfg_attr(feature = "clippy", plugin(clippy))]
 
 extern crate bufstream;
 extern crate byteorder;
@@ -53,7 +51,6 @@ extern crate log;
 extern crate phf;
 #[cfg(feature = "unix_socket")]
 extern crate unix_socket;
-extern crate net2;
 
 use bufstream::BufStream;
 use md5::Md5;
@@ -419,6 +416,19 @@ impl InnerConnection {
                                 ORDER BY enumsortorder") {
             Ok(..) => {}
             Err(Error::Io(e)) => return Err(ConnectError::Io(e)),
+            // Postgres 9.0 doesn't have enumsortorder
+            Err(Error::Db(ref e)) if e.code == SqlState::UndefinedColumn => {
+                match self.raw_prepare(TYPEINFO_ENUM_QUERY,
+                                       "SELECT enumlabel \
+                                        FROM pg_catalog.pg_enum \
+                                        WHERE enumtypid = $1 \
+                                        ORDER BY oid") {
+                    Ok(..) => {}
+                    Err(Error::Io(e)) => return Err(ConnectError::Io(e)),
+                    Err(Error::Db(e)) => return Err(ConnectError::Db(e)),
+                    Err(Error::Conversion(_)) => unreachable!(),
+                }
+            }
             // Old versions of Postgres and things like Redshift don't support enums
             Err(Error::Db(ref e)) if e.code == SqlState::UndefinedTable => {}
             // Some Postgres-like databases are missing a pg_catalog (e.g. Cockroach)
diff --git a/src/priv_io.rs b/src/priv_io.rs
@@ -1,7 +1,4 @@
 use byteorder::ReadBytesExt;
-// this import needs to stay to support pre 1.9 users
-#[allow(unused_imports)]
-use net2::TcpStreamExt;
 use std::error::Error;
 use std::io;
 use std::io::prelude::*;
diff --git a/src/types/chrono.rs b/src/types/chrono.rs
@@ -1,6 +1,5 @@
 extern crate chrono;
 
-use std::error;
 use std::io::prelude::*;
 use byteorder::{ReadBytesExt, WriteBytesExt, BigEndian};
 use self::chrono::{Duration, NaiveDate, NaiveTime, NaiveDateTime, DateTime, UTC, Local,
@@ -31,10 +30,7 @@ impl ToSql for NaiveDateTime {
                                  -> Result<IsNull> {
         let time = match (*self - base()).num_microseconds() {
             Some(time) => time,
-            None => {
-                let err: Box<error::Error + Sync + Send> = "value too large to transmit".into();
-                return Err(Error::Conversion(err));
-            }
+            None => return Err(Error::Conversion("value too large to transmit".into())),
         };
         try!(w.write_i64::<BigEndian>(time));
         Ok(IsNull::No)
@@ -130,8 +126,7 @@ impl ToSql for NaiveDate {
                                  -> Result<IsNull> {
         let jd = (*self - base().date()).num_days();
         if jd > i32::max_value() as i64 || jd < i32::min_value() as i64 {
-            let err: Box<error::Error + Sync + Send> = "value too large to transmit".into();
-            return Err(Error::Conversion(err));
+            return Err(Error::Conversion("value too large to transmit".into()));
         }
 
         try!(w.write_i32::<BigEndian>(jd as i32));
@@ -160,10 +155,7 @@ impl ToSql for NaiveTime {
         let delta = *self - NaiveTime::from_hms(0, 0, 0);
         let time = match delta.num_microseconds() {
             Some(time) => time,
-            None => {
-                let err: Box<error::Error + Sync + Send> = "value too large to transmit".into();
-                return Err(Error::Conversion(err));
-            }
+            None => return Err(Error::Conversion("value too large to transmit".into())),
         };
         try!(w.write_i64::<BigEndian>(time));
         Ok(IsNull::No)
diff --git a/src/types/mod.rs b/src/types/mod.rs
@@ -9,6 +9,7 @@ use byteorder::{ReadBytesExt, WriteBytesExt, BigEndian};
 
 pub use self::slice::Slice;
 pub use self::types::Type;
+pub use self::special::{Date, Timestamp};
 use {Result, SessionInfoNew, InnerConnection, OtherNew, WrongTypeNew, FieldNew};
 use error::Error;
 
@@ -70,6 +71,7 @@ mod chrono;
 #[cfg(feature = "eui48")]
 mod eui48;
 
+mod special;
 mod types;
 
 /// A structure providing information for conversion methods.
@@ -256,41 +258,41 @@ impl WrongTypeNew for WrongType {
 /// The following implementations are provided by this crate, along with the
 /// corresponding Postgres types:
 ///
-/// | Rust type                                     | Postgres type(s)               |
-/// |-----------------------------------------------|--------------------------------|
-/// | `bool`                                        | BOOL                           |
-/// | `i8`                                          | "char"                         |
-/// | `i16`                                         | SMALLINT, SMALLSERIAL          |
-/// | `i32`                                         | INT, SERIAL                    |
-/// | `u32`                                         | OID                            |
-/// | `i64`                                         | BIGINT, BIGSERIAL              |
-/// | `f32`                                         | REAL                           |
-/// | `f64`                                         | DOUBLE PRECISION               |
-/// | `String`                                      | VARCHAR, CHAR(n), TEXT, CITEXT |
-/// | `Vec&lt;u8&gt;`                               | BYTEA                          |
-/// | `HashMap&lt;String, Option&lt;String&gt;&gt;` | HSTORE                         |
+/// | Rust type                         | Postgres type(s)               |
+/// |-----------------------------------|--------------------------------|
+/// | `bool`                            | BOOL                           |
+/// | `i8`                              | "char"                         |
+/// | `i16`                             | SMALLINT, SMALLSERIAL          |
+/// | `i32`                             | INT, SERIAL                    |
+/// | `u32`                             | OID                            |
+/// | `i64`                             | BIGINT, BIGSERIAL              |
+/// | `f32`                             | REAL                           |
+/// | `f64`                             | DOUBLE PRECISION               |
+/// | `String`                          | VARCHAR, CHAR(n), TEXT, CITEXT |
+/// | `Vec<u8>`                         | BYTEA                          |
+/// | `HashMap<String, Option<String>>` | HSTORE                         |
 ///
 /// In addition, some implementations are provided for types in third party
 /// crates. These are disabled by default; to opt into one of these
 /// implementations, activate the Cargo feature corresponding to the crate's
 /// name. For example, the `serde_json` feature enables the implementation for
 /// the `serde_json::Value` type.
 ///
-/// | Rust type                             | Postgres type(s)                    |
-/// |---------------------------------------|-------------------------------------|
-/// | `serialize::json::Json`               | JSON, JSONB                         |
-/// | `serde_json::Value`                   | JSON, JSONB                         |
-/// | `time::Timespec`                      | TIMESTAMP, TIMESTAMP WITH TIME ZONE |
-/// | `chrono::NaiveDateTime`               | TIMESTAMP                           |
-/// | `chrono::DateTime&lt;UTC&gt;`         | TIMESTAMP WITH TIME ZONE            |
-/// | `chrono::DateTime&lt;Local&gt;`       | TIMESTAMP WITH TIME ZONE            |
-/// | `chrono::DateTime&lt;FixedOffset&gt;` | TIMESTAMP WITH TIME ZONE            |
-/// | `chrono::NaiveDate`                   | DATE                                |
-/// | `chrono::NaiveTime`                   | TIME                                |
-/// | `eui48::MacAddress`                   | MACADDR                             |
-/// | `uuid::Uuid`                          | UUID                                |
-/// | `bit_vec::BitVec`                     | BIT, VARBIT                         |
-/// | `eui48::MacAddress`                   | MACADDR                             |
+/// | Rust type                       | Postgres type(s)                    |
+/// |---------------------------------|-------------------------------------|
+/// | `serialize::json::Json`         | JSON, JSONB                         |
+/// | `serde_json::Value`             | JSON, JSONB                         |
+/// | `time::Timespec`                | TIMESTAMP, TIMESTAMP WITH TIME ZONE |
+/// | `chrono::NaiveDateTime`         | TIMESTAMP                           |
+/// | `chrono::DateTime<UTC>`         | TIMESTAMP WITH TIME ZONE            |
+/// | `chrono::DateTime<Local>`       | TIMESTAMP WITH TIME ZONE            |
+/// | `chrono::DateTime<FixedOffset>` | TIMESTAMP WITH TIME ZONE            |
+/// | `chrono::NaiveDate`             | DATE                                |
+/// | `chrono::NaiveTime`             | TIME                                |
+/// | `eui48::MacAddress`             | MACADDR                             |
+/// | `uuid::Uuid`                    | UUID                                |
+/// | `bit_vec::BitVec`               | BIT, VARBIT                         |
+/// | `eui48::MacAddress`             | MACADDR                             |
 ///
 /// # Nullability
 ///
@@ -356,13 +358,18 @@ impl<T: FromSql> FromSql for Vec<T> {
             _ => panic!("expected array type"),
         };
 
-        if try!(raw.read_i32::<BigEndian>()) != 1 {
+        let dimensions = try!(raw.read_i32::<BigEndian>());
+        if dimensions > 1 {
             return Err(Error::Conversion("array contains too many dimensions".into()));
         }
 
         let _has_nulls = try!(raw.read_i32::<BigEndian>());
         let _member_oid = try!(raw.read_u32::<BigEndian>());
 
+        if dimensions == 0 {
+            return Ok(vec![]);
+        }
+
         let count = try!(raw.read_i32::<BigEndian>());
         let _index_offset = try!(raw.read_i32::<BigEndian>());
 
@@ -501,42 +508,42 @@ pub enum IsNull {
 /// The following implementations are provided by this crate, along with the
 /// corresponding Postgres types:
 ///
-/// | Rust type                                     | Postgres type(s)               |
-/// |-----------------------------------------------|--------------------------------|
-/// | `bool`                                        | BOOL                           |
-/// | `i8`                                          | "char"                         |
-/// | `i16`                                         | SMALLINT, SMALLSERIAL          |
-/// | `i32`                                         | INT, SERIAL                    |
-/// | `u32`                                         | OID                            |
-/// | `i64`                                         | BIGINT, BIGSERIAL              |
-/// | `f32`                                         | REAL                           |
-/// | `f64`                                         | DOUBLE PRECISION               |
-/// | `String`                                      | VARCHAR, CHAR(n), TEXT, CITEXT |
-/// | `&str`                                        | VARCHAR, CHAR(n), TEXT, CITEXT |
-/// | `Vec&lt;u8&gt;`                               | BYTEA                          |
-/// | `&[u8]`                                       | BYTEA                          |
-/// | `HashMap&lt;String, Option&lt;String&gt;&gt;` | HSTORE                         |
+/// | Rust type                         | Postgres type(s)               |
+/// |-----------------------------------|--------------------------------|
+/// | `bool`                            | BOOL                           |
+/// | `i8`                              | "char"                         |
+/// | `i16`                             | SMALLINT, SMALLSERIAL          |
+/// | `i32`                             | INT, SERIAL                    |
+/// | `u32`                             | OID                            |
+/// | `i64`                             | BIGINT, BIGSERIAL              |
+/// | `f32`                             | REAL                           |
+/// | `f64`                             | DOUBLE PRECISION               |
+/// | `String`                          | VARCHAR, CHAR(n), TEXT, CITEXT |
+/// | `&str`                            | VARCHAR, CHAR(n), TEXT, CITEXT |
+/// | `Vec<u8>`                         | BYTEA                          |
+/// | `&[u8]`                           | BYTEA                          |
+/// | `HashMap<String, Option<String>>` | HSTORE                         |
 ///
 /// In addition, some implementations are provided for types in third party
 /// crates. These are disabled by default; to opt into one of these
 /// implementations, activate the Cargo feature corresponding to the crate's
 /// name. For example, the `serde_json` feature enables the implementation for
 /// the `serde_json::Value` type.
 ///
-/// | Rust type                             | Postgres type(s)                    |
-/// |---------------------------------------|-------------------------------------|
-/// | `serialize::json::Json`               | JSON, JSONB                         |
-/// | `serde_json::Value`                   | JSON, JSONB                         |
-/// | `time::Timespec`                      | TIMESTAMP, TIMESTAMP WITH TIME ZONE |
-/// | `chrono::NaiveDateTime`               | TIMESTAMP                           |
-/// | `chrono::DateTime&lt;UTC&gt;`         | TIMESTAMP WITH TIME ZONE            |
-/// | `chrono::DateTime&lt;Local&gt;`       | TIMESTAMP WITH TIME ZONE            |
-/// | `chrono::DateTime&lt;FixedOffset&gt;` | TIMESTAMP WITH TIME ZONE            |
-/// | `chrono::NaiveDate`                   | DATE                                |
-/// | `chrono::NaiveTime`                   | TIME                                |
-/// | `uuid::Uuid`                          | UUID                                |
-/// | `bit_vec::BitVec`                     | BIT, VARBIT                         |
-/// | `eui48::MacAddress`                   | MACADDR                             |
+/// | Rust type                       | Postgres type(s)                    |
+/// |---------------------------------|-------------------------------------|
+/// | `serialize::json::Json`         | JSON, JSONB                         |
+/// | `serde_json::Value`             | JSON, JSONB                         |
+/// | `time::Timespec`                | TIMESTAMP, TIMESTAMP WITH TIME ZONE |
+/// | `chrono::NaiveDateTime`         | TIMESTAMP                           |
+/// | `chrono::DateTime<UTC>`         | TIMESTAMP WITH TIME ZONE            |
+/// | `chrono::DateTime<Local>`       | TIMESTAMP WITH TIME ZONE            |
+/// | `chrono::DateTime<FixedOffset>` | TIMESTAMP WITH TIME ZONE            |
+/// | `chrono::NaiveDate`             | DATE                                |
+/// | `chrono::NaiveTime`             | TIME                                |
+/// | `uuid::Uuid`                    | UUID                                |
+/// | `bit_vec::BitVec`               | BIT, VARBIT                         |
+/// | `eui48::MacAddress`             | MACADDR                             |
 ///
 /// # Nullability
 ///
@@ -806,8 +813,7 @@ impl ToSql for HashMap<String, Option<String>> {
 
 fn downcast(len: usize) -> Result<i32> {
     if len > i32::max_value() as usize {
-        let err: Box<error::Error + Sync + Send> = "value too large to transmit".into();
-        Err(Error::Conversion(err))
+        Err(Error::Conversion("value too large to transmit".into()))
     } else {
         Ok(len as i32)
     }
diff --git a/src/types/rustc_serialize.rs b/src/types/rustc_serialize.rs
@@ -1,7 +1,6 @@
 extern crate rustc_serialize;
 
 use self::rustc_serialize::json;
-use std::error;
 use std::io::prelude::*;
 use byteorder::{ReadBytesExt, WriteBytesExt};
 
@@ -14,9 +13,7 @@ impl FromSql for json::Json {
         if let Type::Jsonb = *ty {
             // We only support version 1 of the jsonb binary format
             if try!(raw.read_u8()) != 1 {
-                let err: Box<error::Error + Sync + Send> = "unsupported JSONB encoding version"
-                                                               .into();
-                return Err(Error::Conversion(err));
+                return Err(Error::Conversion("unsupported JSONB encoding version".into()));
             }
         }
         json::Json::from_reader(raw).map_err(|err| Error::Conversion(Box::new(err)))
diff --git a/src/types/serde_json.rs b/src/types/serde_json.rs
diff --git a/src/types/special.rs b/src/types/special.rs
diff --git a/tests/types/chrono.rs b/tests/types/chrono.rs
diff --git a/tests/types/mod.rs b/tests/types/mod.rs
diff --git a/tests/types/time.rs b/tests/types/time.rs

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ pub enum SqlState {{`
`98`	`98`	`" /// An unknown code`
`99`	`99`	`Other(String),`
`100`	`100`	`}}`
	`101`	`+`
`101`	`102`	`"`
`102`	`103`	`).unwrap();`
`103`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -479,6 +479,7 @@ pub enum SqlState {`
`479`	`479`	`/// An unknown code`
`480`	`480`	`Other(String),`
`481`	`481`	`}`
	`482`	`+`
`482`	`483`	`#[cfg_attr(rustfmt, rustfmt_skip)]`
`483`	`484`	`static SQLSTATE_MAP: phf::Map<&'static str, SqlState> = ::phf::Map {`
`484`	`485`	`key: 1897749892740154578,`