Merge pull request #544 from supabase/fix_comment_directive_parsing

fix a bug in which a closing parenthesis in @graphql directive failed to parse as json
supabase · Jul 12, 2024 · d1acb1b · d1acb1b
2 parents 0b1c39b + 064ae81
commit d1acb1b
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/sql/directives.sql b/sql/directives.sql
@@ -11,7 +11,7 @@ as $$
             (
                 regexp_match(
                     comment_,
-                    '@graphql\((.+?)\)'
+                    '@graphql\((.+)\)'
                 )
             )[1]::jsonb,
             jsonb_build_object()

diff --git a/test/expected/comment_directive.out b/test/expected/comment_directive.out
@@ -1,9 +1,36 @@
 select
     graphql.comment_directive(
         comment_ := '@graphql({"name": "myField"})'
-    )
+    );
   comment_directive  
 ---------------------
  {"name": "myField"}
 (1 row)
 
+select
+    graphql.comment_directive(
+        comment_ := '@graphql({"name": "myField with (parentheses)"})'
+    );
+           comment_directive            
+----------------------------------------
+ {"name": "myField with (parentheses)"}
+(1 row)
+
+select
+    graphql.comment_directive(
+        comment_ := '@graphql({"name": "myField with a (starting parenthesis"})'
+    );
+                comment_directive                 
+--------------------------------------------------
+ {"name": "myField with a (starting parenthesis"}
+(1 row)
+
+select
+    graphql.comment_directive(
+        comment_ := '@graphql({"name": "myField with an ending parenthesis)"})'
+    );
+                comment_directive                
+-------------------------------------------------
+ {"name": "myField with an ending parenthesis)"}
+(1 row)
+
diff --git a/test/sql/comment_directive.sql b/test/sql/comment_directive.sql
@@ -1,4 +1,19 @@
 select
     graphql.comment_directive(
         comment_ := '@graphql({"name": "myField"})'
-    )
+    );
+
+select
+    graphql.comment_directive(
+        comment_ := '@graphql({"name": "myField with (parentheses)"})'
+    );
+
+select
+    graphql.comment_directive(
+        comment_ := '@graphql({"name": "myField with a (starting parenthesis"})'
+    );
+
+select
+    graphql.comment_directive(
+        comment_ := '@graphql({"name": "myField with an ending parenthesis)"})'
+    );