fixed build_check_constraint_name_internal() (don't use Oids)

funbringer · funbringer · commit d00a9ae250ab · 2016-09-06T00:40:59.000+03:00
diff --git a/src/init.c b/src/init.c
@@ -552,7 +552,7 @@ find_inheritance_children_array(Oid parentrelId, LOCKMODE lockmode, uint32 *size
 char *
 build_check_constraint_name_internal(Oid relid, AttrNumber attno)
 {
-	return psprintf("pathman_%u_%u_check", relid, attno);
+	return psprintf("pathman_%s_%u_check", get_rel_name(relid), attno);
 }
 
 /*
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -519,7 +519,7 @@ build_check_constraint_name_attnum(PG_FUNCTION_ARGS)
 
 	result = build_check_constraint_name_internal(relid, attnum);
 
-	PG_RETURN_TEXT_P(cstring_to_text(result));
+	PG_RETURN_TEXT_P(cstring_to_text(quote_identifier(result)));
 }
 
 Datum
@@ -539,7 +539,7 @@ build_check_constraint_name_attname(PG_FUNCTION_ARGS)
 
 	result = build_check_constraint_name_internal(relid, attnum);
 
-	PG_RETURN_TEXT_P(cstring_to_text(result));
+	PG_RETURN_TEXT_P(cstring_to_text(quote_identifier(result)));
 }
 
 Datum

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ find_inheritance_children_array(Oid parentrelId, LOCKMODE lockmode, uint32 *size`
`552`	`552`	`char *`
`553`	`553`	`build_check_constraint_name_internal(Oid relid, AttrNumber attno)`
`554`	`554`	`{`
`555`		`- return psprintf("pathman_%u_%u_check", relid, attno);`
	`555`	`+ return psprintf("pathman_%s_%u_check", get_rel_name(relid), attno);`
`556`	`556`	`}`
`557`	`557`
`558`	`558`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ build_check_constraint_name_attnum(PG_FUNCTION_ARGS)`
`519`	`519`
`520`	`520`	`result = build_check_constraint_name_internal(relid, attnum);`
`521`	`521`
`522`		`- PG_RETURN_TEXT_P(cstring_to_text(result));`
	`522`	`+ PG_RETURN_TEXT_P(cstring_to_text(quote_identifier(result)));`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`Datum`
`@@ -539,7 +539,7 @@ build_check_constraint_name_attname(PG_FUNCTION_ARGS)`
`539`	`539`
`540`	`540`	`result = build_check_constraint_name_internal(relid, attnum);`
`541`	`541`
`542`		`- PG_RETURN_TEXT_P(cstring_to_text(result));`
	`542`	`+ PG_RETURN_TEXT_P(cstring_to_text(quote_identifier(result)));`
`543`	`543`	`}`
`544`	`544`
`545`	`545`	`Datum`