From eed6015e70a153124db4d91e41ac9c6bcf38f586 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 31 Dec 2020 14:05:42 +0100
Subject: [PATCH] refactor: Move addHasVariadic to SQL

---
 src/PostgREST/DbStructure.hs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/PostgREST/DbStructure.hs b/src/PostgREST/DbStructure.hs
index 6682a0c25..4cf98b77f 100644
--- a/src/PostgREST/DbStructure.hs
+++ b/src/PostgREST/DbStructure.hs
@@ -129,7 +129,7 @@ sourceColumnFromRow allCols (s1,t1,c1,s2,t2,c2) = (,) <$> col1 <*> col2
 decodeProcs :: HD.Result ProcsMap
 decodeProcs =
   -- Duplicate rows for a function means they're overloaded, order these by least args according to ProcDescription Ord instance
-  map sort . M.fromListWith (++) . map ((\(x,y) -> (x, [y])) . addKey . addHasVariadic) <$> HD.rowList procRow
+  map sort . M.fromListWith (++) . map ((\(x,y) -> (x, [y])) . addKey) <$> HD.rowList procRow
   where
     procRow = ProcDescription
               <$> column HD.text
@@ -142,10 +142,7 @@ decodeProcs =
                   <*> column HD.bool
                   <*> column HD.bool)
               <*> (parseVolatility <$> column HD.char)
-              <*> pure False
-
-    addHasVariadic :: ProcDescription -> ProcDescription
-    addHasVariadic pd@ProcDescription{pdArgs} = pd{pdHasVariadic=isJust $ find pgaVar pdArgs}
+              <*> column HD.bool
 
     addKey :: ProcDescription -> (QualifiedIdentifier, ProcDescription)
     addKey pd = (QualifiedIdentifier (pdSchema pd) (pdName pd), pd)
@@ -232,7 +229,8 @@ procsSqlQuery = [q|
      -- if any INOUT or OUT arguments present, treat as composite
      or COALESCE(proargmodes::text[] && '{b,o}', false)
     ) AS rettype_is_composite,
-    p.provolatile
+    p.provolatile,
+    p.provariadic > 0 AS hasvariadic
   FROM pg_proc p
   JOIN pg_namespace pn ON pn.oid = p.pronamespace
   JOIN base_types bt ON bt.oid = p.prorettype