Remove fixmes in Type builder

Author: sfackler

codegen/src/types.rs

@@ -71,14 +71,6 @@ fn parse_types(ranges: &BTreeMap<u32, u32>) -> BTreeMap<u32, Type> {
 
         let variant = match name {
             "anyarray" => "AnyArray".to_owned(),
-            // FIXME remove following overrides for 0.12
-            "anyrange" => "Anyrange".to_owned(),
-            "tsvector" => "Tsvector".to_owned(),
-            "gtsvector" => "Gtsvector".to_owned(),
-            "_tsvector" => "TsvectorArray".to_owned(),
-            "_gtsvector" => "GtsvectorArray".to_owned(),
-            "timestamptz" => "TimestampTZ".to_owned(),
-            "_timestamptz" => "TimestampTZArray".to_owned(),
             name => {
                 let variant = range_vector_re.replace(name, "_$1");
                 let variant = array_re.replace(&variant, "$1_array");
@@ -88,13 +80,10 @@ fn parse_types(ranges: &BTreeMap<u32, u32>) -> BTreeMap<u32, Type> {
 
         let kind = split[11];
 
-        // FIXME enable for 0.12
-        /*
         // we need to be able to pull composite fields and enum variants at runtime
         if kind == "C" || kind == "E" {
             continue;
         }
-        */
 
         let element = if let Some(&element) = ranges.get(&oid) {
             element

src/types/chrono.rs

@@ -46,7 +46,7 @@ impl FromSql for DateTime<UTC> {
         Ok(DateTime::from_utc(naive, UTC))
     }
 
-    accepts!(Type::TimestampTZ);
+    accepts!(Type::Timestamptz);
 }
 
 impl ToSql for DateTime<UTC> {
@@ -58,7 +58,7 @@ impl ToSql for DateTime<UTC> {
         self.naive_utc().to_sql(type_, w, info)
     }
 
-    accepts!(Type::TimestampTZ);
+    accepts!(Type::Timestamptz);
     to_sql_checked!();
 }
 
@@ -68,7 +68,7 @@ impl FromSql for DateTime<Local> {
         Ok(utc.with_timezone(&Local))
     }
 
-    accepts!(Type::TimestampTZ);
+    accepts!(Type::Timestamptz);
 }
 
 impl ToSql for DateTime<Local> {
@@ -80,7 +80,7 @@ impl ToSql for DateTime<Local> {
         self.with_timezone(&UTC).to_sql(type_, w, info)
     }
 
-    accepts!(Type::TimestampTZ);
+    accepts!(Type::Timestamptz);
     to_sql_checked!();
 }
 
@@ -93,7 +93,7 @@ impl FromSql for DateTime<FixedOffset> {
         Ok(utc.with_timezone(&FixedOffset::east(0)))
     }
 
-    accepts!(Type::TimestampTZ);
+    accepts!(Type::Timestamptz);
 }
 
 impl ToSql for DateTime<FixedOffset> {
@@ -105,7 +105,7 @@ impl ToSql for DateTime<FixedOffset> {
         self.with_timezone(&UTC).to_sql(type_, w, info)
     }
 
-    accepts!(Type::TimestampTZ);
+    accepts!(Type::Timestamptz);
     to_sql_checked!();
 }
 

src/types/special.rs

@@ -61,7 +61,7 @@ impl<T: ToSql> ToSql for Date<T> {
     to_sql_checked!();
 }
 
-/// A wrapper that can be used to represent infinity with `Type::Timestamp` and `Type::TimestampTZ`
+/// A wrapper that can be used to represent infinity with `Type::Timestamp` and `Type::Timestamptz`
 /// types.
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Timestamp<T> {
@@ -75,7 +75,7 @@ pub enum Timestamp<T> {
 
 impl<T: FromSql> FromSql for Timestamp<T> {
     fn from_sql<R: Read>(ty: &Type, raw: &mut R, ctx: &SessionInfo) -> Result<Self> {
-        if *ty != Type::Timestamp && *ty != Type::TimestampTZ {
+        if *ty != Type::Timestamp && *ty != Type::Timestamptz {
             return Err(Error::Conversion("expected timestamp or timestamptz type".into()));
         }
 
@@ -90,13 +90,13 @@ impl<T: FromSql> FromSql for Timestamp<T> {
     }
 
     fn accepts(ty: &Type) -> bool {
-        (*ty == Type::Timestamp || *ty == Type::TimestampTZ) && T::accepts(ty)
+        (*ty == Type::Timestamp || *ty == Type::Timestamptz) && T::accepts(ty)
     }
 }
 
 impl<T: ToSql> ToSql for Timestamp<T> {
     fn to_sql<W: Write+?Sized>(&self, ty: &Type, out: &mut W, ctx: &SessionInfo) -> Result<IsNull> {
-        if *ty != Type::Timestamp && *ty != Type::TimestampTZ {
+        if *ty != Type::Timestamp && *ty != Type::Timestamptz {
             return Err(Error::Conversion("expected timestamp or timestamptz type".into()));
         }
 
@@ -111,7 +111,7 @@ impl<T: ToSql> ToSql for Timestamp<T> {
     }
 
     fn accepts(ty: &Type) -> bool {
-        (*ty == Type::Timestamp || *ty == Type::TimestampTZ) && T::accepts(ty)
+        (*ty == Type::Timestamp || *ty == Type::Timestamptz) && T::accepts(ty)
     }
 
     to_sql_checked!();

src/types/time.rs

@@ -27,7 +27,7 @@ impl FromSql for Timespec {
         Ok(Timespec::new(sec, (usec * NSEC_PER_USEC) as i32))
     }
 
-    accepts!(Type::Timestamp, Type::TimestampTZ);
+    accepts!(Type::Timestamp, Type::Timestamptz);
 }
 
 impl ToSql for Timespec {
@@ -41,6 +41,6 @@ impl ToSql for Timespec {
         Ok(IsNull::No)
     }
 
-    accepts!(Type::Timestamp, Type::TimestampTZ);
+    accepts!(Type::Timestamp, Type::Timestamptz);
     to_sql_checked!();
 }