Upgrade to new postgres version

Author: sfackler

Cargo.toml

@@ -9,9 +9,10 @@ repository = "https://github.com/sfackler/rust-postgres-array"
 documentation = "https://docs.rs/postgres_array/0.9.0/postgres_array"
 
 [dependencies]
-fallible-iterator = "0.1"
-postgres-shared = "0.4"
-postgres-protocol = "0.3"
+bytes = "0.5"
+fallible-iterator = "0.2"
+postgres-types = "0.1"
+postgres-protocol = "0.5"
 
 [dev-dependencies]
-postgres = "0.15"
+postgres = "0.17"

circle.yml

@@ -1,10 +1,9 @@
 version: 2
 jobs:
 build:
-working_directory: ~/build
 docker:
- - image: jimmycuadra/rust:1.19.0
- - image: postgres:9.6
+ - image: rust:1.40.0
+ - image: postgres:12
 environment:
 POSTGRES_PASSWORD: password
 steps:
@@ -15,12 +14,12 @@ jobs:
  - save_cache:
 key: registry-{{epoch }}
 paths:
- - ~/.cargo/registry/index
+ - /usr/local/cargo/registry/index
  - restore_cache:
-key: dependencies-1.19-{{checksum "Cargo.lock" }}
+key: dependencies-1.40-{{checksum "Cargo.lock" }}
  - run: cargo test
  - save_cache:
-key: dependencies-1.19-{{checksum "Cargo.lock" }}
+key: dependencies-1.40-{{checksum "Cargo.lock" }}
 paths:
  - target
- - ~/.cargo/registry/cache
+ - /usr/local/cargo/registry/cache

src/impls.rs

@@ -1,17 +1,17 @@
 use fallible_iterator::FallibleIterator;
 use postgres_protocol;
 use postgres_protocol::types;
-use postgres_shared::to_sql_checked;
-use postgres_shared::types::{FromSql,IsNull,Kind,ToSql,Type};
+use postgres_types::{to_sql_checked,FromSql,IsNull,Kind,ToSql,Type};
 use std::error::Error;
 
 usecrate::{Array,Dimension};
+use postgres_types::private::BytesMut;
 
-impl<T>FromSqlforArray<T>
+impl<'de,T>FromSql<'de>forArray<T>
 where
-T:FromSql,
+T:FromSql<'de>,
 {
-fnfrom_sql(ty:&Type,raw:&[u8]) -> Result<Array<T>,Box<dynError + Sync + Send>>{
+fnfrom_sql(ty:&Type,raw:&'de[u8]) -> Result<Array<T>,Box<dynError + Sync + Send>>{
 let element_type = match*ty.kind(){
 Kind::Array(ref ty) => ty,
  _ => unreachable!(),
@@ -21,15 +21,17 @@ where
 
 let dimensions = array
 .dimensions()
-.map(|d| Dimension{
-len: d.len,
-lower_bound: d.lower_bound,
+.map(|d| {
+Ok(Dimension{
+len: d.len,
+lower_bound: d.lower_bound,
+})
 })
 .collect()?;
 
 let elements = array
 .values()
-.and_then(|v| FromSql::from_sql_nullable(element_type, v))
+.map(|v| FromSql::from_sql_nullable(element_type, v))
 .collect()?;
 
 Ok(Array::from_parts(elements, dimensions))
@@ -47,7 +49,7 @@ impl<T> ToSql for Array<T>
 where
 T:ToSql,
 {
-fnto_sql(&self,ty:&Type,w:&mutVec<u8>) -> Result<IsNull,Box<dynError + Sync + Send>>{
+fnto_sql(&self,ty:&Type,w:&mutBytesMut) -> Result<IsNull,Box<dynError + Sync + Send>>{
 let element_type = match ty.kind(){
 &Kind::Array(ref ty) => ty,
  _ => unreachable!(),
@@ -61,7 +63,6 @@ where
 
  types::array_to_sql(
  dimensions,
-true,
  element_type.oid(),
  elements,
  |v, w| match v.to_sql(element_type, w){
@@ -90,24 +91,25 @@ mod test{
 use std::fmt;
 
 usecrate::Array;
-use postgres::types::{FromSql,ToSql};
-use postgres::{Connection,TlsMode};
+use postgres::types::{FromSqlOwned,ToSql};
+use postgres::{Client,NoTls};
 
-fntest_type<T:PartialEq + FromSql + ToSql,S: fmt::Display>(
+fntest_type<T:PartialEq + FromSqlOwned + ToSql + Sync,S: fmt::Display>(
 sql_type:&str,
 checks:&[(T,S)],
 ){
-let conn =
-Connection::connect("postgres://postgres:password@localhost",TlsMode::None).unwrap();
+letmut conn = Client::connect("postgres://postgres:password@localhost",NoTls).unwrap();
 for&(ref val,ref repr)in checks.iter(){
-letstmt = conn
-.prepare(&format!("SELECT{}::{}",*repr, sql_type))
-.unwrap();
-let result = stmt.query(&[]).unwrap().iter().next().unwrap().get(0);
+letresult = conn
+.query(&*format!("SELECT{}::{}",*repr, sql_type),&[])
+.unwrap()[0]
+.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(&*format!("SELECT $1::{}", sql_type),&[val])
+.unwrap()[0]
+.get(0);
 assert!(val == &result);
 }
 }
@@ -235,13 +237,7 @@ mod test{
 
 #[test]
 fntest_empty_array(){
-let conn = Connection::connect("postgres://postgres@localhost",TlsMode::None).unwrap();
-let stmt = conn.prepare("SELECT '{}'::INT4[]").unwrap();
- stmt.query(&[])
-.unwrap()
-.iter()
-.next()
-.unwrap()
-.get::<_,Array<i32>>(0);
+letmut conn = Client::connect("postgres://postgres@localhost",NoTls).unwrap();
+ conn.query("SELECT '{}'::INT4[]",&[]).unwrap()[0].get::<_,Array<i32>>(0);
 }
 }