correctly, style fixes.
* procedural language
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.70 2005/05/26 00:16:31 momjian Exp $
+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.71 2005/05/26 03:18:53 neilc Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
plpgsql_build_datatype(TEXTOID, -1), true);
$$.sqlerrm_varno = var->dno;
plpgsql_add_initdatums(NULL);
- };
+ }
+ ;
decl_sect : opt_label
{
* procedural language
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.139 2005/05/26 00:16:31 momjian Exp $
+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.140 2005/05/26 03:18:53 neilc Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
var = (PLpgSQL_var *) (estate->datums[block->sqlerrm_varno]);
var->isnull = false;
var->freeval = true;
- var->value = DirectFunctionCall1(textin, CStringGetDatum("Sucessful completion"));
+ var->value = DirectFunctionCall1(textin, CStringGetDatum("Successful completion"));
/*
* First initialize all variables declared in this block
if (var->freeval)
{
- pfree((void *) (var->value));
+ pfree(DatumGetPointer(var->value));
var->freeval = false;
}
CurrentResourceOwner = oldowner;
/* set SQLSTATE and SQLERRM variables */
-
var = (PLpgSQL_var *) (estate->datums[block->sqlstate_varno]);
- pfree((void *) (var->value));
+ pfree(DatumGetPointer(var->value));
var->value = DirectFunctionCall1(textin, CStringGetDatum(unpack_sql_state(edata->sqlerrcode)));
-
+
var = (PLpgSQL_var *) (estate->datums[block->sqlerrm_varno]);
- pfree((void *) (var->value));
+ pfree(DatumGetPointer(var->value));
var->value = DirectFunctionCall1(textin, CStringGetDatum(edata->message));
/*
drop function void_return_expr();
drop function missing_return_expr();
-- test SQLSTATE and SQLERRM
-create or replace function trap_exceptions() returns void as $_$
+create function trap_exceptions() returns void as $_$
begin
begin
raise exception 'first exception';
end; $_$ language plpgsql;
select trap_exceptions();
NOTICE: P0001 first exception
-NOTICE: 00000 Sucessful completion
+NOTICE: 00000 Successful completion
NOTICE: P0001 last exception
trap_exceptions
-----------------
drop function void_return_expr();
drop function missing_return_expr();
+
-- test SQLSTATE and SQLERRM
-create or replace function trap_exceptions() returns void as $_$
+create function trap_exceptions() returns void as $_$
begin
begin
raise exception 'first exception';