Commitfcabd07

Thomas G. Lockhart

committed

Change precedence for boolean operators to match expected behavior.

Change NOTICE/NOTICE/NOTICE/WARN elog messages to a single message with a few newline/tab breaks embedded in the string. Much cleaner I hope.

1 parentcc19151 commitfcabd07Copy full SHA for fcabd07

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.81 1997/12/24 06:06:26 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.82 1998/01/01 05:44:53 thomas Exp $`
`14`	`14`	`*`
`15`	`15`	`* HISTORY`
`16`	`16`	`* AUTHORDATEMAJOR EVENT`
`@@ -306,10 +306,11 @@ Oidparam_type(int t); /* used in parse_expr.c */`
`306`	`306`	`%leftAND`
`307`	`307`	`%rightNOT`
`308`	`308`	`%right'='`
	`309`	`+%nonassoc'<' '>'`
`309`	`310`	`%nonassocLIKE`
`310`	`311`	`%nonassocBETWEEN`
`311`	`312`	`%nonassocIN`
`312`		`-%nonassocOp`
	`313`	`+%nonassocOp/* multi-character ops and user-defined operators */`
`313`	`314`	`%nonassocNOTNULL`
`314`	`315`	`%nonassocISNULL`
`315`	`316`	`%nonassocIS`
`@@ -319,7 +320,6 @@ Oidparam_type(int t); /* used in parse_expr.c */`
`319`	`320`	`/* Unary Operators */`
`320`	`321`	`%right':'`
`321`	`322`	`%left';'/* end of statement or natural log */`
`322`		`-%nonassoc'<' '>'`
`323`	`323`	`%rightUMINUS`
`324`	`324`	`%left'.'`
`325`	`325`	`%left'[' ']'`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.3 1997/11/26 03:42:45 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.4 1998/01/01 05:44:54 thomas Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -587,11 +587,17 @@ op_error(char *op, Oid arg1, Oid arg2)`
`587`	`587`	`elog(WARN,"right hand side of operator %s has an unknown type, probably a bad attribute name",op);`
`588`	`588`	`}`
`589`	`589`
	`590`	`+#ifFALSE`
`590`	`591`	`elog(NOTICE,"there is no operator %s for types %s and %s",`
`591`	`592`	`op,typeTypeName(tp1),typeTypeName(tp2));`
`592`	`593`	`elog(NOTICE,"You will either have to retype this query using an");`
`593`	`594`	`elog(NOTICE,"explicit cast, or you will have to define the operator");`
`594`	`595`	`elog(WARN,"%s for %s and %s using CREATE OPERATOR",`
`595`	`596`	`op,typeTypeName(tp1),typeTypeName(tp2));`
	`597`	`+#endif`
	`598`	`+elog(WARN,"There is no operator '%s' for types '%s' and '%s'"`
	`599`	`+"\n\tYou will either have to retype this query using an explicit cast,"`
	`600`	`+"\n\tor you will have to define the operator using CREATE OPERATOR",`
	`601`	`+op,typeTypeName(tp1),typeTypeName(tp2));`
`596`	`602`	`}`
`597`	`603`

Comments

(0)