feat(gb-8962): postgres pagination

Author: pimeys

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "grafbase-postgres"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2024"
 license = "Apache-2.0"
 

cli/postgres/Cargo.toml

@@ -5,6 +5,7 @@ use clap::{Parser, Subcommand};
 #[derive(Parser, Debug)]
 #[command(name = "grafbase-postgres")]
 #[command(about = "Grafbase Postgres Extension")]
+#[command(version)]
 pub struct Args {
     /// Connection string to the database
     #[arg(short, long, env = "DATABASE_URL")]

cli/postgres/src/args.rs

@@ -1,6 +1,6 @@
 use grafbase_database_definition::TableWalker;
 use serde::Deserialize;
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
 /// Returns the default value for enable_queries configuration.
 fn default_enable_queries() -> bool {
@@ -33,7 +33,7 @@ pub struct Config {
     pub extension_url: String,
     /// Configuration details for each schema within the database, keyed by schema name.
     #[serde(default)]
-    pub schemas: HashMap<String, SchemaConfig>,
+    pub schemas: BTreeMap<String, SchemaConfig>,
 }
 
 impl Config {
@@ -105,10 +105,10 @@ pub struct SchemaConfig {
     pub enable_queries: Option<bool>,
     /// Configuration details for each view within the database, keyed by view name.
     #[serde(default)]
-    pub views: HashMap<String, ViewConfig>,
+    pub views: BTreeMap<String, ViewConfig>,
     /// Configuration overrides for each table within the schema, keyed by table name.
     #[serde(default)]
-    pub tables: HashMap<String, TableConfig>,
+    pub tables: BTreeMap<String, TableConfig>,
 }
 
 #[derive(Deserialize, Debug)]
@@ -120,7 +120,7 @@ pub struct TableConfig {
     pub enable_queries: Option<bool>,
     /// Configuration details for relationships originating from this view, keyed by relationship name.
     #[serde(default)]
-    pub relations: HashMap<String, RelationConfig>,
+    pub relations: BTreeMap<String, RelationConfig>,
 }
 
 /// Represents the configuration settings for a specific database relation (e.g., a view).
@@ -135,10 +135,10 @@ pub struct ViewConfig {
     pub unique_keys: Option<Vec<Vec<String>>>,
     /// Configuration details for each column within the relation, keyed by column name.
     #[serde(default)]
-    pub columns: HashMap<String, ColumnConfig>,
+    pub columns: BTreeMap<String, ColumnConfig>,
     /// Configuration details for relationships originating from this view, keyed by relationship name.
     #[serde(default)]
-    pub relations: HashMap<String, RelationConfig>,
+    pub relations: BTreeMap<String, RelationConfig>,
 }
 
 /// Represents the configuration for a specific column within a view.

crates/postgres-introspection/src/config.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
 use anyhow::bail;
 use grafbase_database_definition::{DatabaseDefinition, ForeignKey, ForeignKeyColumn, SchemaId};
@@ -160,7 +160,7 @@ fn override_relations(
     database_definition: &mut DatabaseDefinition,
     constrained_schema_id: SchemaId,
     table_name: &str,
-    relations: &HashMap<String, RelationConfig>,
+    relations: &BTreeMap<String, RelationConfig>,
 ) -> anyhow::Result<()> {
     let Some(constrained_table_id) = database_definition.get_table_id(constrained_schema_id, table_name) else {
         bail!("Table `{table_name}` not found in relation configuration.")

crates/postgres-introspection/src/foreign_keys.rs

@@ -213,14 +213,14 @@ fn render_page_info(rendered: &mut Schema<'_>) {
     });
 
     r#type.push_field({
-        let mut field = Field::new("startCursor", "String!");
+        let mut field = Field::new("startCursor", "String");
         field.set_description("The cursor of the first item in the page");
         field.push_directive(Directive::new("shareable"));
         field
     });
 
     r#type.push_field({
-        let mut field = Field::new("endCursor", "String!");
+        let mut field = Field::new("endCursor", "String");
         field.set_description("The cursor of the last item in the page");
         field.push_directive(Directive::new("shareable"));
         field

crates/postgres-introspection/src/render/output_types.rs

@@ -46,6 +46,11 @@ impl<'a> Column<'a> {
         self.table = Some(table.into());
         self
     }
+
+    /// Returns the name of the column.
+    pub fn get_name(&self) -> &str {
+        &self.name
+    }
 }
 
 impl<'a> Aliasable<'a> for Column<'a> {

crates/sql-ast/src/ast/column.rs

@@ -46,6 +46,8 @@ pub enum Compare<'a> {
     Any(Box<Expression<'a>>),
     /// ALL (`left`)
     All(Box<Expression<'a>>),
+    /// `left` IS NOT DISTINCT FROM `right`
+    IsNotDistinctFrom(Box<Expression<'a>>, Box<Expression<'a>>),
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -102,6 +104,12 @@ pub trait Comparable<'a> {
     where
         T: Into<Expression<'a>>;
 
+    /// Tests if both sides are not the same value (NULLs are equal).
+    #[allow(clippy::wrong_self_convention)]
+    fn is_not_distinct_from<T>(self, comparison: T) -> Compare<'a>
+    where
+        T: Into<Expression<'a>>;
+
     /// Tests if the left side is smaller than the right side.
     fn less_than<T>(self, comparison: T) -> Compare<'a>
     where
@@ -194,26 +202,6 @@ pub trait Comparable<'a> {
     where
         T: Into<Expression<'a>>;
 
-    /// Tests if the JSON array starts with a value.
-    fn json_array_begins_with<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>;
-
-    /// Tests if the JSON array does not start with a value.
-    fn json_array_not_begins_with<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>;
-
-    /// Tests if the JSON array ends with a value.
-    fn json_array_ends_into<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>;
-
-    /// Tests if the JSON array does not end with a value.
-    fn json_array_not_ends_into<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>;
-
     /// Tests if the JSON value is of a certain type.
     fn json_type_equals<T>(self, json_type: T) -> Compare<'a>
     where
@@ -260,6 +248,16 @@ where
         val.not_equals(comparison)
     }
 
+    fn is_not_distinct_from<T>(self, comparison: T) -> Compare<'a>
+    where
+        T: Into<Expression<'a>>,
+    {
+        let col: Column<'a> = self.into();
+        let val: Expression<'a> = col.into();
+
+        val.is_not_distinct_from(comparison)
+    }
+
     fn less_than<T>(self, comparison: T) -> Compare<'a>
     where
         T: Into<Expression<'a>>,
@@ -418,46 +416,6 @@ where
         val.json_array_not_contains(item)
     }
 
-    fn json_array_begins_with<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>,
-    {
-        let col: Column<'a> = self.into();
-        let val: Expression<'a> = col.into();
-
-        val.json_array_begins_with(item)
-    }
-
-    fn json_array_not_begins_with<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>,
-    {
-        let col: Column<'a> = self.into();
-        let val: Expression<'a> = col.into();
-
-        val.json_array_not_begins_with(item)
-    }
-
-    fn json_array_ends_into<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>,
-    {
-        let col: Column<'a> = self.into();
-        let val: Expression<'a> = col.into();
-
-        val.json_array_ends_into(item)
-    }
-
-    fn json_array_not_ends_into<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>,
-    {
-        let col: Column<'a> = self.into();
-        let val: Expression<'a> = col.into();
-
-        val.json_array_not_ends_into(item)
-    }
-
     fn json_type_equals<T>(self, json_type: T) -> Compare<'a>
     where
         T: Into<JsonType<'a>>,

crates/sql-ast/src/ast/compare.rs

@@ -217,6 +217,13 @@ impl<'a> Comparable<'a> for Expression<'a> {
         Compare::NotEquals(Box::new(self), Box::new(comparison.into()))
     }
 
+    fn is_not_distinct_from<T>(self, comparison: T) -> Compare<'a>
+    where
+        T: Into<Expression<'a>>,
+    {
+        Compare::IsNotDistinctFrom(Box::new(self), Box::new(comparison.into()))
+    }
+
     fn less_than<T>(self, comparison: T) -> Compare<'a>
     where
         T: Into<Expression<'a>>,
@@ -349,42 +356,6 @@ impl<'a> Comparable<'a> for Expression<'a> {
         Compare::Json(JsonCompare::ArrayNotContains(Box::new(self), Box::new(item.into())))
     }
 
-    fn json_array_begins_with<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>,
-    {
-        let array_starts_with: Expression = super::function::json_extract_first_array_elem(self).into();
-
-        Compare::Equals(Box::new(array_starts_with), Box::new(item.into()))
-    }
-
-    fn json_array_not_begins_with<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>,
-    {
-        let array_starts_with: Expression = super::function::json_extract_first_array_elem(self).into();
-
-        Compare::NotEquals(Box::new(array_starts_with), Box::new(item.into()))
-    }
-
-    fn json_array_ends_into<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>,
-    {
-        let array_ends_into: Expression = super::function::json_extract_last_array_elem(self).into();
-
-        Compare::Equals(Box::new(array_ends_into), Box::new(item.into()))
-    }
-
-    fn json_array_not_ends_into<T>(self, item: T) -> Compare<'a>
-    where
-        T: Into<Expression<'a>>,
-    {
-        let array_ends_into: Expression = super::function::json_extract_last_array_elem(self).into();
-
-        Compare::NotEquals(Box::new(array_ends_into), Box::new(item.into()))
-    }
-
     fn json_type_equals<T>(self, json_type: T) -> Compare<'a>
     where
         T: Into<JsonType<'a>>,

crates/sql-ast/src/ast/expression.rs

@@ -4,9 +4,12 @@ mod average;
 mod cast;
 mod coalesce;
 mod concat;
+mod convert_from;
 mod count;
+mod decode;
 mod encode;
 mod json_agg;
+mod json_build_array;
 mod json_build_object;
 mod json_extract;
 mod json_extract_array;
@@ -27,12 +30,15 @@ pub use average::*;
 pub use cast::*;
 pub use coalesce::*;
 pub use concat::*;
+pub use convert_from::*;
 pub use count::*;
+pub use decode::*;
 pub use encode::*;
 pub use json_agg::*;
+pub use json_build_array::*;
 pub use json_build_object::*;
 pub use json_extract::*;
-pub(crate) use json_extract_array::*;
+pub use json_extract_array::*;
 pub use json_unquote::*;
 pub use lower::*;
 pub use maximum::*;
@@ -49,18 +55,17 @@ use super::{Alias, Aliasable};
 /// A database function definition
 #[derive(Debug, Clone, PartialEq)]
 pub struct Function<'a> {
-    pub(crate) typ_: FunctionType<'a>,
+    pub(crate) r#type: FunctionType<'a>,
     pub(crate) alias: Option<Alias<'a>>,
 }
 
 impl Function<'_> {
     pub fn returns_json(&self) -> bool {
         matches!(
-            self.typ_,
+            self.r#type,
             FunctionType::RowToJson(_)
                 | FunctionType::JsonExtract(_)
-                | FunctionType::JsonExtractLastArrayElem(_)
-                | FunctionType::JsonExtractFirstArrayElem(_)
+                | FunctionType::JsonExtractArrayElem(_)
                 | FunctionType::ToJsonb(_)
         )
     }
@@ -81,8 +86,7 @@ pub(crate) enum FunctionType<'a> {
     Coalesce(Coalesce<'a>),
     Concat(Concat<'a>),
     JsonExtract(JsonExtract<'a>),
-    JsonExtractLastArrayElem(JsonExtractLastArrayElem<'a>),
-    JsonExtractFirstArrayElem(JsonExtractFirstArrayElem<'a>),
+    JsonExtractArrayElem(JsonExtractArrayElem<'a>),
     JsonUnquote(JsonUnquote<'a>),
     RowToJson(RowToJson<'a>),
     ToJsonb(ToJsonb<'a>),
@@ -91,6 +95,10 @@ pub(crate) enum FunctionType<'a> {
     JsonBuildObject(JsonBuildObject<'a>),
     Unnest(Unnest<'a>),
     ArrayPosition(ArrayPosition<'a>),
+    JsonBuildArray(JsonBuildArray<'a>),
+    RowNumber(RowNumber<'a>),
+    Decode(Decode<'a>),
+    ConvertFrom(ConvertFrom<'a>),
 }
 
 impl<'a> Aliasable<'a> for Function<'a> {

crates/sql-ast/src/ast/function.rs

@@ -23,7 +23,7 @@ where
 impl<'a> From<AggregateToString<'a>> for Function<'a> {
     fn from(value: AggregateToString<'a>) -> Self {
         Self {
-            typ_: FunctionType::AggregateToString(value),
+            r#type: FunctionType::AggregateToString(value),
             alias: None,
         }
     }

crates/sql-ast/src/ast/function/aggregate_to_string.rs

@@ -24,7 +24,7 @@ where
 impl<'a> From<ArrayPosition<'a>> for Function<'a> {
     fn from(value: ArrayPosition<'a>) -> Self {
         Self {
-            typ_: FunctionType::ArrayPosition(value),
+            r#type: FunctionType::ArrayPosition(value),
             alias: None,
         }
     }

crates/sql-ast/src/ast/function/array_position.rs

@@ -19,7 +19,7 @@ where
 impl<'a> From<Average<'a>> for Function<'a> {
     fn from(value: Average<'a>) -> Self {
         Self {
-            typ_: FunctionType::Average(value),
+            r#type: FunctionType::Average(value),
             alias: None,
         }
     }