Merge remote-tracking branch 'dimtion/pginterval'

launchbadge · Jul 3, 2020 · 4c5ea7a · 4c5ea7a
2 parents 0b2844b + 523f650
commit 4c5ea7a
Show file tree

Hide file tree

Showing 5 changed files with 454 additions and 7 deletions.
diff --git a/sqlx-core/src/postgres/type_info.rs b/sqlx-core/src/postgres/type_info.rs
@@ -83,6 +83,8 @@ pub enum PgType {
     TimeArray,
     Timestamptz,
     TimestamptzArray,
+    Interval,
+    IntervalArray,
     NumericArray,
     Timetz,
     TimetzArray,
@@ -92,7 +94,6 @@ pub enum PgType {
     VarbitArray,
     Numeric,
     Record,
-    Interval,
     RecordArray,
     Uuid,
     UuidArray,
@@ -285,6 +286,8 @@ impl PgType {
             1183 => PgType::TimeArray,
             1184 => PgType::Timestamptz,
             1185 => PgType::TimestamptzArray,
+            1186 => PgType::Interval,
+            1187 => PgType::IntervalArray,
             1231 => PgType::NumericArray,
             1266 => PgType::Timetz,
             1270 => PgType::TimetzArray,
@@ -294,7 +297,6 @@ impl PgType {
             1563 => PgType::VarbitArray,
             1700 => PgType::Numeric,
             2249 => PgType::Record,
-            2281 => PgType::Interval,
             2287 => PgType::RecordArray,
             2950 => PgType::Uuid,
             2951 => PgType::UuidArray,
@@ -389,6 +391,8 @@ impl PgType {
             PgType::TimeArray => 1183,
             PgType::Timestamptz => 1184,
             PgType::TimestamptzArray => 1185,
+            PgType::Interval => 1186,
+            PgType::IntervalArray => 1187,
             PgType::NumericArray => 1231,
             PgType::Timetz => 1266,
             PgType::TimetzArray => 1270,
@@ -398,7 +402,6 @@ impl PgType {
             PgType::VarbitArray => 1563,
             PgType::Numeric => 1700,
             PgType::Record => 2249,
-            PgType::Interval => 2281,
             PgType::RecordArray => 2287,
             PgType::Uuid => 2950,
             PgType::UuidArray => 2951,
@@ -488,6 +491,8 @@ impl PgType {
             PgType::TimeArray => "TIME[]",
             PgType::Timestamptz => "TIMESTAMPTZ",
             PgType::TimestamptzArray => "TIMESTAMPTZ[]",
+            PgType::Interval => "INTERVAL",
+            PgType::IntervalArray => "INTERVAL[]",
             PgType::NumericArray => "NUMERIC[]",
             PgType::Timetz => "TIMETZ",
             PgType::TimetzArray => "TIMETZ[]",
@@ -497,7 +502,6 @@ impl PgType {
             PgType::VarbitArray => "VARBIT[]",
             PgType::Numeric => "NUMERIC",
             PgType::Record => "RECORD",
-            PgType::Interval => "INTERVAL",
             PgType::RecordArray => "RECORD[]",
             PgType::Uuid => "UUID",
             PgType::UuidArray => "UUID[]",
@@ -584,6 +588,8 @@ impl PgType {
             PgType::TimeArray => "_time",
             PgType::Timestamptz => "timestamptz",
             PgType::TimestamptzArray => "_timestamptz",
+            PgType::Interval => "interval",
+            PgType::IntervalArray => "_interval",
             PgType::NumericArray => "_numeric",
             PgType::Timetz => "timetz",
             PgType::TimetzArray => "_timetz",
@@ -593,7 +599,6 @@ impl PgType {
             PgType::VarbitArray => "_varbit",
             PgType::Numeric => "numeric",
             PgType::Record => "record",
-            PgType::Interval => "interval",
             PgType::RecordArray => "_record",
             PgType::Uuid => "uuid",
             PgType::UuidArray => "_uuid",
@@ -680,6 +685,8 @@ impl PgType {
             PgType::TimeArray => &PgTypeKind::Array(PgTypeInfo(PgType::Time)),
             PgType::Timestamptz => &PgTypeKind::Simple,
             PgType::TimestamptzArray => &PgTypeKind::Array(PgTypeInfo(PgType::Timestamptz)),
+            PgType::Interval => &PgTypeKind::Simple,
+            PgType::IntervalArray => &PgTypeKind::Array(PgTypeInfo(PgType::Interval)),
             PgType::NumericArray => &PgTypeKind::Array(PgTypeInfo(PgType::Numeric)),
             PgType::Timetz => &PgTypeKind::Simple,
             PgType::TimetzArray => &PgTypeKind::Array(PgTypeInfo(PgType::Timetz)),
@@ -689,7 +696,6 @@ impl PgType {
             PgType::VarbitArray => &PgTypeKind::Array(PgTypeInfo(PgType::Varbit)),
             PgType::Numeric => &PgTypeKind::Simple,
             PgType::Record => &PgTypeKind::Simple,
-            PgType::Interval => &PgTypeKind::Simple,
             PgType::RecordArray => &PgTypeKind::Array(PgTypeInfo(PgType::Record)),
             PgType::Uuid => &PgTypeKind::Simple,
             PgType::UuidArray => &PgTypeKind::Array(PgTypeInfo(PgType::Uuid)),
@@ -866,6 +872,7 @@ impl PgTypeInfo {
 
     // time interval
     pub(crate) const INTERVAL: Self = Self(PgType::Interval);
+    pub(crate) const INTERVAL_ARRAY: Self = Self(PgType::IntervalArray);
 
     //
     // geometric types