Return unsupported Postgres types as raw blobs

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

Author: itowlson

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

@@ -5,6 +5,7 @@ use tokio_postgres::{types::ToSql, Row};
 mod convert;
 mod decimal;
 mod interval;
+mod other;
 mod pg_null;
 
 use convert::{
@@ -14,6 +15,7 @@ use convert::{
     range_wit_to_pg, time_pg_to_wit, time_wit_to_pg, timestamp_wit_to_pg, uuid_wit_to_pg,
 };
 use interval::Interval;
+use other::Other;
 use pg_null::PgNull;
 
 pub fn convert_data_type(pg_type: &Type) -> DbDataType {
@@ -42,7 +44,7 @@ pub fn convert_data_type(pg_type: &Type) -> DbDataType {
         Type::INTERVAL => DbDataType::Interval,
         _ => {
             tracing::debug!("Couldn't convert Postgres type {} to WIT", pg_type.name(),);
-            DbDataType::Other
+            DbDataType::Other(pg_type.name().to_owned())
         }
     }
 }
@@ -126,7 +128,7 @@ pub fn convert_entry(row: &Row, index: usize) -> anyhow::Result<DbValue> {
                 t.name(),
                 column.name()
             );
-            Ok(DbValue::Unsupported)
+            map_db_value(row, index, DbValue::Unsupported, |v: Other| v.into())
         }
     }
 }

crates/factor-outbound-pg/src/types/other.rs

@@ -0,0 +1,22 @@
+/// A catch-all type via which we return unsupported Postgres values as blobs.
+#[derive(Debug)]
+pub struct Other(Vec<u8>);
+
+impl tokio_postgres::types::FromSql<'_> for Other {
+    fn from_sql(
+        _ty: &tokio_postgres::types::Type,
+        raw: &'_ [u8],
+    ) -> Result<Self, Box<dyn std::error::Error + Sync + Send>> {
+        Ok(Self(raw.to_owned()))
+    }
+
+    fn accepts(_ty: &tokio_postgres::types::Type) -> bool {
+        true
+    }
+}
+
+impl From<Other> for Vec<u8> {
+    fn from(value: Other) -> Self {
+        value.0
+    }
+}

crates/world/src/conversions.rs

@@ -76,7 +76,7 @@ mod rdbms_types {
                 pg4::DbValue::Str(s) => v1::rdbms_types::DbValue::Str(s),
                 pg4::DbValue::Binary(b) => v1::rdbms_types::DbValue::Binary(b),
                 pg4::DbValue::DbNull => v1::rdbms_types::DbValue::DbNull,
-                pg4::DbValue::Unsupported => v1::rdbms_types::DbValue::Unsupported,
+                pg4::DbValue::Unsupported(_) => v1::rdbms_types::DbValue::Unsupported,
                 _ => v1::rdbms_types::DbValue::Unsupported,
             }
         }
@@ -95,7 +95,7 @@ mod rdbms_types {
                 pg4::DbValue::Str(s) => v2::rdbms_types::DbValue::Str(s),
                 pg4::DbValue::Binary(b) => v2::rdbms_types::DbValue::Binary(b),
                 pg4::DbValue::DbNull => v2::rdbms_types::DbValue::DbNull,
-                pg4::DbValue::Unsupported => v2::rdbms_types::DbValue::Unsupported,
+                pg4::DbValue::Unsupported(_) => v2::rdbms_types::DbValue::Unsupported,
                 _ => v2::rdbms_types::DbValue::Unsupported,
             }
         }
@@ -129,7 +129,7 @@ mod rdbms_types {
                 pg4::DbValue::ArrayStr(_) => pg3::DbValue::Unsupported,
                 pg4::DbValue::Interval(_) => pg3::DbValue::Unsupported,
                 pg4::DbValue::DbNull => pg3::DbValue::DbNull,
-                pg4::DbValue::Unsupported => pg3::DbValue::Unsupported,
+                pg4::DbValue::Unsupported(_) => pg3::DbValue::Unsupported,
             }
         }
     }
@@ -146,7 +146,7 @@ mod rdbms_types {
                 pg4::DbDataType::Floating64 => v1::rdbms_types::DbDataType::Floating64,
                 pg4::DbDataType::Str => v1::rdbms_types::DbDataType::Str,
                 pg4::DbDataType::Binary => v1::rdbms_types::DbDataType::Binary,
-                pg4::DbDataType::Other => v1::rdbms_types::DbDataType::Other,
+                pg4::DbDataType::Other(_) => v1::rdbms_types::DbDataType::Other,
                 _ => v1::rdbms_types::DbDataType::Other,
             }
         }
@@ -164,7 +164,7 @@ mod rdbms_types {
                 pg4::DbDataType::Floating64 => v2::rdbms_types::DbDataType::Floating64,
                 pg4::DbDataType::Str => v2::rdbms_types::DbDataType::Str,
                 pg4::DbDataType::Binary => v2::rdbms_types::DbDataType::Binary,
-                pg4::DbDataType::Other => v2::rdbms_types::DbDataType::Other,
+                pg4::DbDataType::Other(_) => v2::rdbms_types::DbDataType::Other,
                 _ => v2::rdbms_types::DbDataType::Other,
             }
         }
@@ -197,7 +197,7 @@ mod rdbms_types {
                 pg4::DbDataType::ArrayDecimal => pg3::DbDataType::Other,
                 pg4::DbDataType::ArrayStr => pg3::DbDataType::Other,
                 pg4::DbDataType::Interval => pg3::DbDataType::Other,
-                pg4::DbDataType::Other => pg3::DbDataType::Other,
+                pg4::DbDataType::Other(_) => pg3::DbDataType::Other,
             }
         }
     }

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

@@ -11,7 +11,7 @@ interface postgres {
   }
 
   /// Data types for a database column
-  enum db-data-type {
+  variant db-data-type {
       boolean,
       int8,
       int16,
@@ -36,7 +36,7 @@ interface postgres {
       array-decimal,
       array-str,
       interval,
-      other,
+      other(string),
   }
 
   /// Database values
@@ -69,7 +69,7 @@ interface postgres {
       array-str(list<option<string>>),
       interval(interval),
       db-null,
-      unsupported,
+      unsupported(list<u8>),
   }
 
   /// Values used in parameterized queries