Commiteb730cf

Michael Meskes

committed

Added correct error handling in DESCRIBE statement processing by Boszormenyi Zoltan <zb@cybertec.at>.

1 parentd3be71a commiteb730cfCopy full SHA for eb730cf

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* dynamic SQL support routines`
`2`	`2`	`*`
`3`		`- * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.34 2010/01/1510:44:34 meskes Exp $`
	`3`	`+ * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.35 2010/01/1513:19:12 meskes Exp $`
`4`	`4`	`*/`
`5`	`5`
`6`	`6`	`#definePOSTGRES_ECPG_INTERNAL`
`@@ -739,14 +739,24 @@ ECPGdescribe(int line, int compat, bool input, const char *connection_name, cons`
`739`	`739`
`740`	`740`	`/* DESCRIBE INPUT is not yet supported */`
`741`	`741`	`if (input)`
	`742`	`+{`
	`743`	`+ecpg_raise(line,ECPG_UNSUPPORTED,ECPG_SQLSTATE_ECPG_INTERNAL_ERROR,"DESCRIBE INPUT");`
`742`	`744`	`returnret;`
	`745`	`+}`
`743`	`746`
`744`	`747`	`con=ecpg_get_connection(connection_name);`
`745`	`748`	`if (!con)`
`746`		`-return false;`
	`749`	`+{`
	`750`	`+ecpg_raise(line,ECPG_NO_CONN,ECPG_SQLSTATE_CONNECTION_DOES_NOT_EXIST,`
	`751`	`+connection_name ?connection_name :ecpg_gettext("NULL"));`
	`752`	`+returnret;`
	`753`	`+}`
`747`	`754`	`prep=ecpg_find_prepared_statement(stmt_name,con,NULL);`
`748`	`755`	`if (!prep)`
	`756`	`+{`
	`757`	`+ecpg_raise(line,ECPG_INVALID_STMT,ECPG_SQLSTATE_INVALID_SQL_STATEMENT_NAME,stmt_name);`
`749`	`758`	`returnret;`
	`759`	`+}`
`750`	`760`
`751`	`761`	`va_start(args,stmt_name);`
`752`	`762`

Comments

(0)