Merge branch 'release-v0.11.10' into release

Author: sfackler

.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)

Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "postgres"
-version = "0.11.9"
+version = "0.11.10"
 authors = ["Steven Fackler <[email protected]>"]
 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"

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

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.
 

codegen/Cargo.toml

@@ -4,6 +4,6 @@ version = "0.1.0"
 authors = ["Steven Fackler <[email protected]>"]
 
 [dependencies]
-phf_codegen = "=0.7.14"
+phf_codegen = "=0.7.15"
 regex = "0.1"
 marksman_escape = "0.1"

codegen/src/sqlstate.rs

@@ -98,6 +98,7 @@ pub enum SqlState {{
 "    /// An unknown code
     Other(String),
 }}
+
 "
            ).unwrap();
 }

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,

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)

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::*;

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)