Handling correct typmod for money/smallmoney during coercion and dump-restore

src/backend/parser/parse_coerce.c

@@ -797,7 +797,9 @@ coerce_to_domain(Node *arg, Oid baseTypeId, int32 baseTypeMod, Oid typeId,
 		 strcmp(type_name, "nchar") == 0 ||
 		 strcmp(type_name, "varbinary") == 0 ||
 		 strcmp(type_name, "binary") == 0 ||
-		 strcmp(type_name, "decimal") == 0))
+		 strcmp(type_name, "decimal") == 0 ||
+		 strcmp(type_name, "smallmoney") == 0||
+		 strcmp(type_name, "money") == 0))
 		result->resulttypmod = baseTypeMod;
 
 	return (Node *) result;

src/backend/parser/parse_type.c

@@ -33,6 +33,7 @@ static int32 typenameTypeMod(ParseState *pstate, const TypeName *typeName,
 check_or_set_default_typmod_hook_type check_or_set_default_typmod_hook = NULL;
 validate_var_datatype_scale_hook_type validate_var_datatype_scale_hook = NULL;
 handle_default_collation_hook_type handle_default_collation_hook = NULL;
+get_domain_typmodin_hook_type get_domain_typmodin_hook = NULL;
 
 /*
  * LookupTypeName
@@ -361,6 +362,13 @@ typenameTypeMod(ParseState *pstate, const TypeName *typeName, Type typ)
 
 	typmodin = ((Form_pg_type) GETSTRUCT(typ))->typmodin;
 
+	/*
+	 * Find the OID of domain's typmodin function, which is same as its basetype's typmodin OID,
+	 * for domains like smallmoney/money and their UDTs during restore.
+	 */
+	if (get_domain_typmodin_hook)
+		typmodin = (*get_domain_typmodin_hook)(typ);
+
 	if (typmodin == InvalidOid)
 		ereport(ERROR,
 				(errcode(ERRCODE_SYNTAX_ERROR),

src/include/parser/parse_type.h

@@ -72,4 +72,12 @@ extern PGDLLEXPORT validate_var_datatype_scale_hook_type validate_var_datatype_s
 typedef Oid (*handle_default_collation_hook_type) (Type typ, bool handle_pg_type);
 extern PGDLLEXPORT handle_default_collation_hook_type handle_default_collation_hook;
 
+/*
+ * Hook to find oid of typmodin function for a given domain tuple which is essentially same as
+ * the oid of it's basetype's typmodin function. This is only used during restore to handle domains
+ * like smallmoney/money and UDTs created on them.
+ */
+typedef Oid (*get_domain_typmodin_hook_type) (Type typ);
+extern PGDLLEXPORT get_domain_typmodin_hook_type get_domain_typmodin_hook;
+
 #endif							/* PARSE_TYPE_H */