Commitbc20c41

Thomas G. Lockhart

committed

Fix bug in recent improvement to type resolution code. Forgot to retain

"best choice" type category when resolving UNKNOWN function and operator arguments. Thanks to Tom Lane for finding test case.

1 parenta8555ad commitbc20c41Copy full SHA for bc20c41

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.92 2000/11/06 15:42:30 thomas Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.93 2000/11/11 19:49:26 thomas Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -951,6 +951,8 @@ func_select_candidate(int nargs,`
`951`	`951`	`/* started out as unknown type, so give preference to string type, if available */`
`952`	`952`	`if (current_category==STRING_TYPE)`
`953`	`953`	`{`
	`954`	`+slot_category=current_category;`
	`955`	`+slot_type=current_type;`
`954`	`956`	`/* forget all previous candidates */`
`955`	`957`	`candidates=current_candidate;`
`956`	`958`	`last_candidate=current_candidate;`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.42 2000/11/07 16:01:01 thomas Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.43 2000/11/11 19:49:26 thomas Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -435,6 +435,7 @@ oper_select_candidate(int nargs,`
`435`	`435`	`current_typeids=current_candidate->args;`
`436`	`436`	`current_type=current_typeids[i];`
`437`	`437`	`current_category=TypeCategory(current_type);`
	`438`	`+/* first time through? Then we'll use this one for now */`
`438`	`439`	`if (slot_category==INVALID_TYPE)`
`439`	`440`	`{`
`440`	`441`	`slot_category=current_category;`
`@@ -446,6 +447,8 @@ oper_select_candidate(int nargs,`
`446`	`447`	`/* started out as unknown type, so give preference to string type, if available */`
`447`	`448`	`if (current_category==STRING_TYPE)`
`448`	`449`	`{`
	`450`	`+slot_category=current_category;`
	`451`	`+slot_type=current_type;`
`449`	`452`	`/* forget all previous candidates */`
`450`	`453`	`candidates=current_candidate;`
`451`	`454`	`last_candidate=current_candidate;`

Comments

(0)