Add PostgreSQL-version agnostic type lookup

Author: mkindahl

test/src/test_with_clause_parser.c

@@ -16,6 +16,7 @@
 #include <utils/elog.h>
 #include <utils/lsyscache.h>
 #include <utils/memutils.h>
+#include <utils/regproc.h>
 
 #include "annotations.h"
 #include "export.h"
@@ -245,21 +246,30 @@ TS_TEST_FN(ts_test_with_clause_parse)
 	HeapTuple tuple;
 	WithClauseValue *result;
 
-	/* Look up any missing type ids before using it below to allow
-	 * user-defined types. Note that this will not look up types we have found
-	 * in previous calls of this function. */
+	/*
+	 * Look up any missing type ids before using it below to allow
+	 * user-defined types.
+	 *
+	 * Note that this will not look up types we have found in previous calls
+	 * of this function.
+	 *
+	 * We use the slightly more complicated way of calling to_regtype since
+	 * that exists on all versions of PostgreSQL. We cannot use regtypein
+	 * since that can generate errors and we do not want to deal with that.
+	 */
 	for (unsigned int i = 0; i < TS_ARRAY_LEN(test_args); ++i)
 	{
+		LOCAL_FCINFO(fcinfo_in, 1);
 		Datum result;
-		ErrorSaveContext escontext = { T_ErrorSaveContext };
-		if (test_args[i].type_id == InvalidOid &&
-			DirectInputFunctionCallSafe(regtypein,
-										(char *) test_args[i].arg_names[0],
-										InvalidOid,
-										-1,
-										(Node *) &escontext,
-										&result))
-			test_args[i].type_id = DatumGetObjectId(result);
+		if (test_args[i].type_id == InvalidOid)
+		{
+			InitFunctionCallInfoData(*fcinfo_in, NULL, 1, InvalidOid, NULL, NULL);
+			fcinfo_in->args[0].value = CStringGetTextDatum(test_args[i].arg_names[0]);
+			fcinfo_in->args[0].isnull = false;
+			result = to_regtype(fcinfo_in);
+			if (!fcinfo_in->isnull)
+				test_args[i].type_id = DatumGetObjectId(result);
+		}
 	}
 
 	if (SRF_IS_FIRSTCALL())

tsl/test/shared/expected/with_clause_parser.out

@@ -402,3 +402,6 @@ SELECT * FROM test_with_clause_parse('{
  sqlstate_raise |        |      |       |      |          | 
 (7 rows)
 
+\c :TEST_DBNAME :ROLE_SUPERUSER
+DROP TYPE sqlstate_raise CASCADE;
+NOTICE:  drop cascades to 2 other objects

tsl/test/shared/sql/with_clause_parser.sql

@@ -139,3 +139,6 @@ SELECT * FROM test_with_clause_parse('{
     {"c", "name", "bar"},
     {"d", "regclass", "pg_type"}
 }');
+
+\c :TEST_DBNAME :ROLE_SUPERUSER
+DROP TYPE sqlstate_raise CASCADE;