Sometimes all you need is a good rubber duck

FuelLabs · Dec 8, 2023 · 4834ac9 · 4834ac9
1 parent 0367eca
commit 4834ac9
Show file tree

Hide file tree

Showing 4 changed files with 277 additions and 248 deletions.
diff --git a/packages/fuel-indexer-graphql/src/arguments.rs b/packages/fuel-indexer-graphql/src/arguments.rs
@@ -90,6 +90,7 @@ impl QueryParams {
         query_clause
     }
 
+    // TODO: Allow for non-id field to be used for pagination.
     pub(crate) fn parse_pagination(&mut self, db_type: &DbType) {
         match db_type {
             DbType::Postgres => {

diff --git a/packages/fuel-indexer-graphql/src/lib.rs b/packages/fuel-indexer-graphql/src/lib.rs
@@ -53,9 +53,10 @@ pub enum GraphqlError {
 }
 
 #[derive(Debug, Clone)]
-pub enum ParsedQueryKind {
+pub enum QueryKind {
     Object,
     Connection,
+    Cte,
 }
 
 /// The type of selection that can be present in a user's operation.
@@ -86,7 +87,7 @@ pub enum ParsedSelection {
         alias: Option<Positioned<Name>>,
         fields: Vec<ParsedSelection>,
         arguments: Vec<ParamType>,
-        kind: ParsedQueryKind,
+        kind: QueryKind,
         root_entity_type: String,
     },
     PageInfo {

diff --git a/packages/fuel-indexer-graphql/src/query/parse.rs b/packages/fuel-indexer-graphql/src/query/parse.rs
@@ -12,7 +12,7 @@ use fuel_indexer_lib::graphql::{parser::InternalType, ParsedGraphQLSchema};
 
 use crate::{
     arguments::{parse_argument_into_param, ParamType},
-    GraphqlError, GraphqlResult, ParsedQueryKind, ParsedSelection,
+    GraphqlError, GraphqlResult, ParsedSelection, QueryKind,
 };
 
 /// Contains information about a successfully-parsed user operation.
@@ -265,15 +265,12 @@ fn parse_selections(
                         Some(&query_type),
                     )?;
                     let (kind, query_type) = if query_type.contains("Connection") {
-                        (
-                            ParsedQueryKind::Connection,
-                            query_type.replace("Connection", ""),
-                        )
+                        (QueryKind::Connection, query_type.replace("Connection", ""))
                     } else {
-                        (ParsedQueryKind::Object, query_type)
+                        (QueryKind::Object, query_type)
                     };
 
-                    if let ParsedQueryKind::Object = kind {
+                    if let QueryKind::Object = kind {
                         if !arguments.iter().any(|a| {
                             matches!(
                                 a,