store: Make infrastructure columns visible in Table::column()

Add block$ (immutable), block_range (mutable), and causality_region
to the column lookup so callers that need these columns by name can
find them. Also add CAUSALITY_REGION_COL pseudo-column static and
tighten with_nsp visibility to pub(crate).

Author: lutter

store/postgres/src/relational.rs

@@ -76,7 +76,7 @@ use graph::prelude::{
     QueryExecutionError, StoreError, ValueType,
 };
 
-use crate::block_range::{BoundSide, BLOCK_COLUMN, BLOCK_RANGE_COLUMN};
+use crate::block_range::{BoundSide, BLOCK_COLUMN, BLOCK_RANGE_COLUMN, CAUSALITY_REGION_COLUMN};
 pub use crate::catalog::Catalog;
 use crate::ForeignServer;
 use crate::{catalog, deployment, AsyncPgConnection};

store/postgres/src/relational/dsl.rs

@@ -32,7 +32,7 @@ use crate::relational_queries::PARENT_ID;
 use super::value::FromOidRow;
 use super::Column as RelColumn;
 use super::SqlName;
-use super::{BLOCK_COLUMN, BLOCK_RANGE_COLUMN};
+use super::{BLOCK_COLUMN, BLOCK_RANGE_COLUMN, CAUSALITY_REGION_COLUMN};
 
 const TYPENAME: &str = "__typename";
 
@@ -50,6 +50,8 @@ lazy_static! {
     pub static ref PARENT_STRING_COL: RelColumn = RelColumn::pseudo_column(PARENT_ID, ColumnType::String);
     pub static ref PARENT_BYTES_COL: RelColumn = RelColumn::pseudo_column(PARENT_ID, ColumnType::Bytes);
     pub static ref PARENT_INT_COL: RelColumn = RelColumn::pseudo_column(PARENT_ID, ColumnType::Int8);
+    pub static ref CAUSALITY_REGION_COL: RelColumn =
+        RelColumn::pseudo_column(CAUSALITY_REGION_COLUMN, ColumnType::Int);
 
     pub static ref META_COLS: [&'static RelColumn; 2] = [&*TYPENAME_COL, &*VID_COL];
 }
@@ -184,10 +186,22 @@ impl<'a> Table<'a> {
     /// is useful if just the name of the column qualified with the table
     /// name/alias is needed
     pub fn column(&self, name: &str) -> Option<Column<'a>> {
+        let block_col: &RelColumn = if self.meta.immutable {
+            &BLOCK_COL
+        } else {
+            &BLOCK_RANGE_COL
+        };
+        let cr_col: Option<&RelColumn> = if self.meta.has_causality_region {
+            Some(&*CAUSALITY_REGION_COL)
+        } else {
+            None
+        };
         self.meta
             .columns
             .iter()
             .chain(*META_COLS)
+            .chain(std::iter::once(block_col))
+            .chain(cr_col)
             .find(|c| &c.name == name)
             .map(|c| Column::new(*self, c))
     }

store/postgres/src/relational/index.rs

@@ -441,7 +441,7 @@ impl CreateIndex {
         }
     }
 
-    pub fn with_nsp(&self, nsp2: String) -> Result<Self, Error> {
+    pub(crate) fn with_nsp(&self, nsp2: String) -> Result<Self, Error> {
         let s = self.clone();
         match s {
             CreateIndex::Unknown { defn: _ } => Err(anyhow!("Failed to parse the index")),