Merge pull request #168 from grafbase/brabier/lkznnvqkynmk

update SDK to 0.21

Author: Finistere

.github/workflows/pull-request.yml

@@ -55,8 +55,8 @@ jobs:
     strategy:
       matrix:
         version:
-          - gateway: "0.46.0"
-            cli: "0.101.0"
+          - gateway: "0.47.1"
+            cli: "0.102.1"
     env:
       RUSTFLAGS: -D warnings
     steps:

.gitignore

@@ -1,4 +1,5 @@
 target
+.claude
 
 # Devenv
 .devenv*

Cargo.lock

@@ -69,7 +69,7 @@ futures-util = "0.3.31"
 fxhash = "0.2.1"
 grafbase-database-definition = { version = "0.1.0", path = "crates/database-definition" }
 grafbase-postgres-introspection = { version = "0.1.0", path = "crates/postgres-introspection" }
-grafbase-sdk = "0.20"
+grafbase-sdk = "0.21.1"
 hashbrown = "0.15"
 http = "1.3"
 indexmap = "2.9.0"

Cargo.toml

@@ -105,10 +105,10 @@ fn is_valid_subgraph_name(name: &str) -> bool {
     let mut chars = name.chars();
 
     // First character must be a letter
-    if let Some(first) = chars.next() {
-        if !first.is_ascii_alphabetic() {
-            return false;
-        }
+    if let Some(first) = chars.next()
+        && !first.is_ascii_alphabetic()
+    {
+        return false;
     }
 
     // Remaining characters must be letters, digits, or hyphens

cli/protoc-gen-grafbase-subgraph/src/main.rs

@@ -268,17 +268,17 @@ impl ProtoMethod {
         }
 
         // Priority 2: Method-level override for query
-        if let Some(is_query) = self.is_query {
-            if is_query {
-                return GraphQLOperationType::Query;
-            }
+        if let Some(is_query) = self.is_query
+            && is_query
+        {
+            return GraphQLOperationType::Query;
         }
 
         // Priority 2: Method-level override for mutation
-        if let Some(is_mutation) = self.is_mutation {
-            if is_mutation {
-                return GraphQLOperationType::Mutation;
-            }
+        if let Some(is_mutation) = self.is_mutation
+            && is_mutation
+        {
+            return GraphQLOperationType::Mutation;
         }
 
         // Priority 3: Service-level default

cli/protoc-gen-grafbase-subgraph/src/schema/records.rs

@@ -418,60 +418,57 @@ fn extract_message_graphql_directives_from_options(message: &DescriptorProto, tr
                         use protobuf::Message;
                         if let Ok(derive_field_proto) =
                             crate::options_proto::options::DeriveField::parse_from_bytes(bytes)
+                            && derive_field_proto.has_entity()
                         {
-                            if derive_field_proto.has_entity() {
-                                translated_message.derive_fields.push(crate::schema::DeriveField {
-                                    entity: derive_field_proto.entity().to_owned(),
-                                    name: if derive_field_proto.has_name() {
-                                        Some(derive_field_proto.name().to_owned())
-                                    } else {
-                                        None
-                                    },
-                                    is: if derive_field_proto.has_is() {
-                                        match derive::extract_is(derive_field_proto.is()) {
-                                            Ok(is) => Some(is),
-                                            Err(err) => {
-                                                eprintln!("Error reading derive_field.is at {}: {err}", message.name());
-                                                None
-                                            }
+                            translated_message.derive_fields.push(crate::schema::DeriveField {
+                                entity: derive_field_proto.entity().to_owned(),
+                                name: if derive_field_proto.has_name() {
+                                    Some(derive_field_proto.name().to_owned())
+                                } else {
+                                    None
+                                },
+                                is: if derive_field_proto.has_is() {
+                                    match derive::extract_is(derive_field_proto.is()) {
+                                        Ok(is) => Some(is),
+                                        Err(err) => {
+                                            eprintln!("Error reading derive_field.is at {}: {err}", message.name());
+                                            None
                                         }
-                                    } else {
-                                        None
-                                    },
-                                });
-                            }
+                                    }
+                                } else {
+                                    None
+                                },
+                            });
                         }
                     }
                 }
                 KEY => {
                     if let protobuf::UnknownValueRef::LengthDelimited(bytes) = value {
                         use protobuf::Message;
-                        if let Ok(key_proto) = crate::options_proto::options::Key::parse_from_bytes(bytes) {
-                            if key_proto.has_fields() {
-                                translated_message.keys.push(crate::schema::Key {
-                                    fields: key_proto.fields().to_owned(),
-                                });
-                            }
+                        if let Ok(key_proto) = crate::options_proto::options::Key::parse_from_bytes(bytes)
+                            && key_proto.has_fields()
+                        {
+                            translated_message.keys.push(crate::schema::Key {
+                                fields: key_proto.fields().to_owned(),
+                            });
                         }
                     }
                 }
                 JOIN_FIELD => {
                     if let protobuf::UnknownValueRef::LengthDelimited(bytes) = value {
                         use protobuf::Message;
                         if let Ok(join_field_proto) = crate::options_proto::options::JoinField::parse_from_bytes(bytes)
+                            && join_field_proto.has_name()
+                            && join_field_proto.has_service()
+                            && join_field_proto.has_method()
+                            && join_field_proto.has_require()
                         {
-                            if join_field_proto.has_name()
-                                && join_field_proto.has_service()
-                                && join_field_proto.has_method()
-                                && join_field_proto.has_require()
-                            {
-                                translated_message.join_fields.push(crate::schema::JoinField {
-                                    name: join_field_proto.name().to_owned(),
-                                    service: join_field_proto.service().to_owned(),
-                                    method: join_field_proto.method().to_owned(),
-                                    require: join_field_proto.require().to_owned(),
-                                });
-                            }
+                            translated_message.join_fields.push(crate::schema::JoinField {
+                                name: join_field_proto.name().to_owned(),
+                                service: join_field_proto.service().to_owned(),
+                                method: join_field_proto.method().to_owned(),
+                                require: join_field_proto.require().to_owned(),
+                            });
                         }
                     }
                 }

cli/protoc-gen-grafbase-subgraph/src/translate_schema.rs

@@ -173,10 +173,10 @@ fn render_column<'a>(render: &mut Type<'a>, table: TableWalker<'a>, column: Tabl
         directive.push_argument(Argument::string("name", column.database_name()));
         directive.push_argument(Argument::constant("type", column.database_type().as_str()));
 
-        if let DatabaseType::Enum(r#enum) = column.database_type() {
-            if r#enum.schema() != table.schema() {
-                directive.push_argument(Argument::string("enumSchema", r#enum.schema()));
-            }
+        if let DatabaseType::Enum(r#enum) = column.database_type()
+            && r#enum.schema() != table.schema()
+        {
+            directive.push_argument(Argument::string("enumSchema", r#enum.schema()));
         }
 
         directive

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

@@ -160,12 +160,12 @@ impl Renderer {
             None => (),
         }
 
-        if let Some(returning) = insert.returning {
-            if !returning.is_empty() {
-                let values = returning.into_iter().map(|r| r.into()).collect();
-                self.write(" RETURNING ");
-                self.visit_columns(values);
-            }
+        if let Some(returning) = insert.returning
+            && !returning.is_empty()
+        {
+            let values = returning.into_iter().map(|r| r.into()).collect();
+            self.write(" RETURNING ");
+            self.visit_columns(values);
         };
     }
 
@@ -738,12 +738,12 @@ impl Renderer {
             self.visit_conditions(conditions);
         }
 
-        if let Some(returning) = update.returning {
-            if !returning.is_empty() {
-                let values = returning.into_iter().map(|r| r.into()).collect();
-                self.write(" RETURNING ");
-                self.visit_columns(values);
-            }
+        if let Some(returning) = update.returning
+            && !returning.is_empty()
+        {
+            let values = returning.into_iter().map(|r| r.into()).collect();
+            self.write(" RETURNING ");
+            self.visit_columns(values);
         }
     }
 
@@ -945,11 +945,9 @@ impl Renderer {
             }
         };
 
-        if include_alias {
-            if let Some(alias) = table.alias {
-                self.visit_alias(alias);
-            };
-        }
+        if include_alias && let Some(alias) = table.alias {
+            self.visit_alias(alias);
+        };
     }
 
     /// A database column identifier

crates/sql-ast/src/renderer/postgres.rs

@@ -1,6 +1,6 @@
 [package]
 name = "authenticated"
-version = "1.0.0"
+version = "1.1.0"
 edition = "2024"
 license = "Apache-2.0"
 publish = false