Revert an ill-considered portion of my patch of 12-Mar, which tried to save a

few lines in sql_exec_error_callback() by using the function source string
field that the patch added to SQL function cache entries.  This doesn't work
because the fn_extra field isn't filled in yet during init_sql_fcache().
Probably it could be made to work, but it doesn't seem appropriate to contort
the main code paths to make an error-reporting path a tad faster.  Per report
from Pavel Stehule.

diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index e115bd32827fe34d78cef4cb43a86a8174193a53..502ba94db60da1ff06be0e91f4aa91f4a60056a7 100644 (file)
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -765,11 +765,21 @@ sql_exec_error_callback(void *arg)
         * If there is a syntax error position, convert to internal syntax error
         */
        syntaxerrposition = geterrposition();
-       if (syntaxerrposition > 0 && fcache->src)
+       if (syntaxerrposition > 0)
        {
+               bool            isnull;
+               Datum           tmp;
+               char       *prosrc;
+
+               tmp = SysCacheGetAttr(PROCOID, func_tuple, Anum_pg_proc_prosrc,
+                                                         &isnull);
+               if (isnull)
+                       elog(ERROR, "null prosrc");
+               prosrc = DatumGetCString(DirectFunctionCall1(textout, tmp));
                errposition(0);
                internalerrposition(syntaxerrposition);
-               internalerrquery(fcache->src);
+               internalerrquery(prosrc);
+               pfree(prosrc);
        }
 
        /*