Range and array types

Signed-off-by: itowlson <[email protected]>

Author: itowlson

crates/factor-outbound-pg/src/client.rs

@@ -192,6 +192,9 @@ fn to_sql_parameter(value: &ParameterValue) -> Result<Box<dyn ToSql + Send + Syn
             let r = postgres_range::Range::new(lbound, ubound);
             Ok(Box::new(r))
         }
+        ParameterValue::ArrayInt32(vs) => Ok(Box::new(vs.to_owned())),
+        ParameterValue::ArrayInt64(vs) => Ok(Box::new(vs.to_owned())),
+        ParameterValue::ArrayStr(vs) => Ok(Box::new(vs.to_owned())),
         ParameterValue::DbNull => Ok(Box::new(PgNull)),
     }
 }
@@ -236,6 +239,9 @@ fn convert_data_type(pg_type: &Type) -> DbDataType {
         Type::NUMERIC => DbDataType::Decimal,
         Type::INT4_RANGE => DbDataType::Range32,
         Type::INT8_RANGE => DbDataType::Range64,
+        Type::INT4_ARRAY => DbDataType::ArrayInt32,
+        Type::INT8_ARRAY => DbDataType::ArrayInt64,
+        Type::TEXT_ARRAY | Type::VARCHAR_ARRAY | Type::BPCHAR_ARRAY => DbDataType::ArrayStr,
         _ => {
             tracing::debug!("Couldn't convert Postgres type {} to WIT", pg_type.name(),);
             DbDataType::Other
@@ -359,7 +365,7 @@ fn convert_entry(row: &Row, index: usize) -> anyhow::Result<DbValue> {
             match value {
                 Some(v) => {
                     let lower = v.lower().map(tuplify_range_bound);
-                    let upper = v.lower().map(tuplify_range_bound);
+                    let upper = v.upper().map(tuplify_range_bound);
                     DbValue::Range32((lower, upper))
                 }
                 None => DbValue::DbNull,
@@ -370,12 +376,33 @@ fn convert_entry(row: &Row, index: usize) -> anyhow::Result<DbValue> {
             match value {
                 Some(v) => {
                     let lower = v.lower().map(tuplify_range_bound);
-                    let upper = v.lower().map(tuplify_range_bound);
+                    let upper = v.upper().map(tuplify_range_bound);
                     DbValue::Range64((lower, upper))
                 }
                 None => DbValue::DbNull,
             }
         }
+        &Type::INT4_ARRAY => {
+            let value: Option<Vec<Option<i32>>> = row.try_get(index)?;
+            match value {
+                Some(v) => DbValue::ArrayInt32(v),
+                None => DbValue::DbNull,
+            }
+        }
+        &Type::INT8_ARRAY => {
+            let value: Option<Vec<Option<i64>>> = row.try_get(index)?;
+            match value {
+                Some(v) => DbValue::ArrayInt64(v),
+                None => DbValue::DbNull,
+            }
+        }
+        &Type::TEXT_ARRAY | &Type::VARCHAR_ARRAY | &Type::BPCHAR_ARRAY => {
+            let value: Option<Vec<Option<String>>> = row.try_get(index)?;
+            match value {
+                Some(v) => DbValue::ArrayStr(v),
+                None => DbValue::DbNull,
+            }
+        }
         t => {
             tracing::debug!(
                 "Couldn't convert Postgres type {} in column {}",

crates/world/src/conversions.rs

@@ -122,6 +122,9 @@ mod rdbms_types {
                 pg4::DbValue::Decimal(_) => pg3::DbValue::Unsupported,
                 pg4::DbValue::Range32(_) => pg3::DbValue::Unsupported,
                 pg4::DbValue::Range64(_) => pg3::DbValue::Unsupported,
+                pg4::DbValue::ArrayInt32(_) => pg3::DbValue::Unsupported,
+                pg4::DbValue::ArrayInt64(_) => pg3::DbValue::Unsupported,
+                pg4::DbValue::ArrayStr(_) => pg3::DbValue::Unsupported,
                 pg4::DbValue::DbNull => pg3::DbValue::DbNull,
                 pg4::DbValue::Unsupported => pg3::DbValue::Unsupported,
             }
@@ -185,6 +188,9 @@ mod rdbms_types {
                 pg4::DbDataType::Decimal => pg3::DbDataType::Other,
                 pg4::DbDataType::Range32 => pg3::DbDataType::Other,
                 pg4::DbDataType::Range64 => pg3::DbDataType::Other,
+                pg4::DbDataType::ArrayInt32 => pg3::DbDataType::Other,
+                pg4::DbDataType::ArrayInt64 => pg3::DbDataType::Other,
+                pg4::DbDataType::ArrayStr => pg3::DbDataType::Other,
                 pg4::DbDataType::Other => pg3::DbDataType::Other,
             }
         }

wit/deps/[email protected]/postgres.wit

@@ -30,6 +30,9 @@ interface postgres {
       decimal,
       range32,
       range64,
+      array-int32,
+      array-int64,
+      array-str,
       other,
   }
 
@@ -56,6 +59,9 @@ interface postgres {
       decimal(string), // I admit defeat. Base 10
       range32(tuple<option<tuple<s32, range-bound-kind>>, option<tuple<s32, range-bound-kind>>>),
       range64(tuple<option<tuple<s64, range-bound-kind>>, option<tuple<s64, range-bound-kind>>>),
+      array-int32(list<option<s32>>),
+      array-int64(list<option<s64>>),
+      array-str(list<option<string>>),
       db-null,
       unsupported,
   }
@@ -83,6 +89,9 @@ interface postgres {
       decimal(string), // base 10
       range32(tuple<option<tuple<s32, range-bound-kind>>, option<tuple<s32, range-bound-kind>>>),
       range64(tuple<option<tuple<s64, range-bound-kind>>, option<tuple<s64, range-bound-kind>>>),
+      array-int32(list<option<s32>>),
+      array-int64(list<option<s64>>),
+      array-str(list<option<string>>),
       db-null,
   }