3 files changed, 34 insertions, 16 deletions
diff --git a/contrib/btree_gist/btree_num.c.in b/contrib/btree_gist/btree_num.c.in
index 6dbbedc9b7..fd9052510f 100644
--- a/contrib/btree_gist/btree_num.c.in
+++ b/contrib/btree_gist/btree_num.c.in
@@ -247,14 +247,20 @@ __BTREE_GIST_TYPE2__key_cmp(const void *a, const void *b)
 Datum
 __BTREE_GIST_TYPE2__key_in(PG_FUNCTION_ARGS)
 {
-  elog(ERROR, "Not implemented");
+  ereport(ERROR,
+		(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		 errmsg("<datatype>key_in() not implemented")));
+
   PG_RETURN_POINTER(NULL);
 }
 
 Datum
 __BTREE_GIST_TYPE2__key_out(PG_FUNCTION_ARGS)
 {
-  elog(ERROR, "Not implemented");
+  ereport(ERROR,
+		(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		 errmsg("<datatype>key_out() not implemented")));
+
   PG_RETURN_POINTER(NULL);
 }
 
diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c
index 8af765f3d7..59fdcdba5c 100644
--- a/contrib/btree_gist/btree_ts.c
+++ b/contrib/btree_gist/btree_ts.c
@@ -270,13 +270,19 @@ tskey_cmp(const void *a, const void *b)
 Datum
 tskey_in(PG_FUNCTION_ARGS)
 {
-	elog(ERROR, "Not implemented");
+	ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("feature not implemented")));
+
 	PG_RETURN_POINTER(NULL);
 }
 
 Datum
 tskey_out(PG_FUNCTION_ARGS)
 {
-	elog(ERROR, "Not implemented");
+	ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("feature not implemented")));
+
 	PG_RETURN_POINTER(NULL);
 }
diff --git a/contrib/btree_gist/expected/btree_gist.out b/contrib/btree_gist/expected/btree_gist.out
index 497740062d..c8b52e07c2 100644
--- a/contrib/btree_gist/expected/btree_gist.out
+++ b/contrib/btree_gist/expected/btree_gist.out
@@ -3,18 +3,24 @@
 -- does not depend on contents of btree_gist.sql.
 --
 \set ECHO none
-psql:btree_gist.sql:8: NOTICE:  ProcedureCreate: type int2key is not yet defined
-psql:btree_gist.sql:13: NOTICE:  Argument type "int2key" is only a shell
-psql:btree_gist.sql:25: NOTICE:  ProcedureCreate: type int4key is not yet defined
-psql:btree_gist.sql:30: NOTICE:  Argument type "int4key" is only a shell
-psql:btree_gist.sql:42: NOTICE:  ProcedureCreate: type int8key is not yet defined
-psql:btree_gist.sql:47: NOTICE:  Argument type "int8key" is only a shell
-psql:btree_gist.sql:59: NOTICE:  ProcedureCreate: type float4key is not yet defined
-psql:btree_gist.sql:64: NOTICE:  Argument type "float4key" is only a shell
-psql:btree_gist.sql:77: NOTICE:  ProcedureCreate: type float8key is not yet defined
-psql:btree_gist.sql:82: NOTICE:  Argument type "float8key" is only a shell
-psql:btree_gist.sql:392: NOTICE:  ProcedureCreate: type tskey is not yet defined
-psql:btree_gist.sql:397: NOTICE:  Argument type "tskey" is only a shell
+psql:btree_gist.sql:8: NOTICE:  type int2key is not yet defined
+DETAIL:  Creating a shell type definition.
+psql:btree_gist.sql:13: NOTICE:  argument type int2key is only a shell
+psql:btree_gist.sql:25: NOTICE:  type int4key is not yet defined
+DETAIL:  Creating a shell type definition.
+psql:btree_gist.sql:30: NOTICE:  argument type int4key is only a shell
+psql:btree_gist.sql:42: NOTICE:  type int8key is not yet defined
+DETAIL:  Creating a shell type definition.
+psql:btree_gist.sql:47: NOTICE:  argument type int8key is only a shell
+psql:btree_gist.sql:59: NOTICE:  type float4key is not yet defined
+DETAIL:  Creating a shell type definition.
+psql:btree_gist.sql:64: NOTICE:  argument type float4key is only a shell
+psql:btree_gist.sql:77: NOTICE:  type float8key is not yet defined
+DETAIL:  Creating a shell type definition.
+psql:btree_gist.sql:82: NOTICE:  argument type float8key is only a shell
+psql:btree_gist.sql:392: NOTICE:  type tskey is not yet defined
+DETAIL:  Creating a shell type definition.
+psql:btree_gist.sql:397: NOTICE:  argument type tskey is only a shell
 CREATE TABLE int4tmp (b int4);
 \copy int4tmp from 'data/test_btree.data'
 CREATE TABLE int8tmp (b int8);