store: Add OidValue::Int4Range and fix block_range binding

Add `OidValue::Int4Range(Bound<i32>, Bound<i32>)` variant to properly
deserialize PostgreSQL int4range columns (OID 3904). Update `select_cols`
in dsl.rs to bind block_range as `Range<Integer>` instead of using the
Bytes placeholder, resolving the existing TODO.

Author: lutter

store/postgres/src/relational/dsl.rs

@@ -16,7 +16,7 @@ use diesel::query_dsl::methods::SelectDsl;
 use diesel::query_source::QuerySource;
 
 use diesel::sql_types::{
-    Array, BigInt, Binary, Bool, Integer, Nullable, Numeric, SingleValue, Text, Timestamptz,
+    Array, BigInt, Binary, Bool, Integer, Nullable, Numeric, Range, SingleValue, Text, Timestamptz,
     Untyped,
 };
 use diesel::{AppearsOnTable, Expression, QueryDsl, QueryResult, SelectableExpression};
@@ -43,8 +43,8 @@ lazy_static! {
     pub static ref TYPENAME_COL: RelColumn = RelColumn::pseudo_column(TYPENAME, ColumnType::String);
     pub static ref VID_COL: RelColumn = RelColumn::pseudo_column("vid", ColumnType::Int8);
     pub static ref BLOCK_COL: RelColumn = RelColumn::pseudo_column(BLOCK_COLUMN, ColumnType::Int8);
-    // The column type is a placeholder, we can't deserialize in4range; but
-    // we also never try to use it when we get data from the database
+    // The column type is a placeholder; block_range is deserialized as
+    // int4range via special handling in select_cols
     pub static ref BLOCK_RANGE_COL: RelColumn =
         RelColumn::pseudo_column(BLOCK_RANGE_COLUMN, ColumnType::Bytes);
     pub static ref PARENT_STRING_COL: RelColumn = RelColumn::pseudo_column(PARENT_ID, ColumnType::String);
@@ -291,7 +291,6 @@ impl<'a> Table<'a> {
             if self.meta.immutable {
                 cols.push(&*BLOCK_COL);
             } else {
-                // TODO: We can't deserialize in4range
                 cols.push(&*BLOCK_RANGE_COL);
             }
         }
@@ -348,6 +347,10 @@ impl<'a> Table<'a> {
                 )));
                 continue;
             }
+            if column.name == BLOCK_RANGE_COL.name {
+                selection.add_field(self.bind::<Range<Integer>>(&column.name).unwrap());
+                continue;
+            }
             match column.column_type {
                 ColumnType::Boolean => add_field::<Bool>(&mut selection, self, column),
                 ColumnType::BigDecimal => add_field::<Numeric>(&mut selection, self, column),

store/postgres/src/relational/value.rs

@@ -1,8 +1,9 @@
 //! Helpers to use diesel dynamic schema to retrieve values from Postgres
 
 use std::num::NonZeroU32;
+use std::ops::Bound;
 
-use diesel::sql_types::{Array, BigInt, Binary, Bool, Integer, Numeric, Text, Timestamptz};
+use diesel::sql_types::{Array, BigInt, Binary, Bool, Integer, Numeric, Range, Text, Timestamptz};
 use diesel::{deserialize::FromSql, pg::Pg};
 use diesel_dynamic_schema::dynamic_value::{Any, DynamicRow};
 
@@ -45,6 +46,7 @@ pub enum OidValue {
     BigDecimalArray(Vec<BigDecimal>),
     Timestamp(Timestamp),
     TimestampArray(Vec<Timestamp>),
+    Int4Range(Bound<i32>, Bound<i32>),
     Null,
 }
 
@@ -66,6 +68,7 @@ impl FromSql<Any, Pg> for OidValue {
         const NUMERIC_ARY_OID: NonZeroU32 = NonZeroU32::new(1231).unwrap();
         const TIMESTAMPTZ_OID: NonZeroU32 = NonZeroU32::new(1184).unwrap();
         const TIMESTAMPTZ_ARY_OID: NonZeroU32 = NonZeroU32::new(1185).unwrap();
+        const INT4RANGE_OID: NonZeroU32 = NonZeroU32::new(3904).unwrap();
 
         match value.get_oid() {
             VARCHAR_OID | TEXT_OID => {
@@ -102,6 +105,10 @@ impl FromSql<Any, Pg> for OidValue {
                 <Vec<Timestamp> as FromSql<Array<Timestamptz>, Pg>>::from_sql(value)
                     .map(OidValue::TimestampArray)
             }
+            INT4RANGE_OID => {
+                <(Bound<i32>, Bound<i32>) as FromSql<Range<Integer>, Pg>>::from_sql(value)
+                    .map(|(lo, hi)| OidValue::Int4Range(lo, hi))
+            }
             e => Err(format!("Unknown type: {e}").into()),
         }
     }
@@ -143,6 +150,11 @@ impl FromOidValue for r::Value {
             O::BigDecimalArray(b) => as_list(b, |b| Self::String(b.to_string())),
             O::Timestamp(t) => Self::Timestamp(t),
             O::TimestampArray(t) => as_list(t, Self::Timestamp),
+            O::Int4Range(..) => {
+                return Err(StoreError::InternalError(
+                    "int4range can not be converted to r::Value".to_string(),
+                ))
+            }
             O::Null => Self::Null,
         };
         Ok(value)
@@ -195,6 +207,11 @@ impl FromOidValue for graph::prelude::Value {
             },
             O::Timestamp(t) => Self::Timestamp(t),
             O::TimestampArray(t) => as_list(t, Self::Timestamp),
+            O::Int4Range(..) => {
+                return Err(StoreError::InternalError(
+                    "int4range can not be converted to Value".to_string(),
+                ))
+            }
             O::Null => Self::Null,
         };
         Ok(value)