handwritten column incoming

Author: juleswritescode

crates/pg_schema_cache/src/columns.rs

@@ -42,17 +42,20 @@ pub struct Column {
 
     pub schema_name: String,
     pub type_id: i64,
-    // pub is_nullable: bool,
-    // pub is_primary_key: bool,
 
-    // pub default_value: Option<String>,
+    pub is_nullable: bool,
 
-    // pub varchar_length: Option<i32>,
+    pub is_primary_key: bool,
+    pub is_unique: bool,
 
+    /// The Default "value" of the column. Might be a function call, hence "_expr".
+    pub default_expr: Option<String>,
+
+    pub varchar_length: Option<i32>,
     // /// None if the column is not a foreign key.
     // pub foreign_key: Option<ForeignKeyReference>,
-
-    // pub comment: Option<String>,
+    /// Comment inserted via `COMMENT ON COLUMN my_table.my_comment '...'`, if present.
+    pub comment: Option<String>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]

crates/pg_schema_cache/src/queries/columns.sql

@@ -7,14 +7,26 @@ with
       n.nspname as schema_name
     from
       pg_catalog.pg_class c
-      left join pg_catalog.pg_namespace n on n.oid = c.relnamespace
+      join pg_catalog.pg_namespace n on n.oid = c.relnamespace
     where
       -- r: normal tables
       -- v: views
       -- m: materialized views
       -- f: foreign tables
       -- p: partitioned tables
       c.relkind in ('r', 'v', 'm', 'f', 'p')
+  ),
+  available_indexes as (
+    select
+      unnest (ix.indkey) as attnum,
+      ix.indisprimary as is_primary,
+      ix.indisunique as is_unique,
+      ix.indrelid as table_oid
+    from
+      pg_catalog.pg_class c
+      join pg_catalog.pg_index ix on c.oid = ix.indexrelid
+    where
+      c.relkind = 'i'
   )
 select
   atts.attname as name,
@@ -28,10 +40,22 @@ select
   nullif(
     information_schema._pg_char_max_length (atts.atttypid, atts.atttypmod),
     -1
-  ) as varchar_length
+  ) as varchar_length,
+  pg_get_expr (def.adbin, def.adrelid) as default_expr,
+  coalesce(ix.is_primary, false) as is_primary_key,
+  coalesce(ix.is_unique, false) as is_unique,
+  pg_catalog.col_description (ts.table_oid, atts.attnum) as comment
 from
   pg_catalog.pg_attribute atts
-  left join available_tables ts on atts.attrelid = ts.table_oid
+  join available_tables ts on atts.attrelid = ts.table_oid
+  left join available_indexes ix on atts.attrelid = ix.table_oid
+  and atts.attnum = ix.attnum
+  left join pg_catalog.pg_attrdef def on atts.attrelid = def.adrelid
+  and atts.attnum = def.adnum
 where
   -- system columns, such as `cmax` or `tableoid`, have negative `attnum`s
-  atts.attnum >= 0;
+  atts.attnum >= 0
+order by
+  schema_name desc,
+  table_name,
+  attnum;