[Firebird-checkins] CVS: firebird2/src/dsql pass1.cpp,1.27,1.28

[Dmitry Y. <di...@us...>]

Build Version :  T1.5.0.1156 Firebird 1.5 Alpha 4

(writeBuildNum.sh,v 1.1138 2002/10/31 12:01:55 dimitr Exp $ )

Update of /cvsroot/firebird/firebird2/src/dsql
In directory usw-pr-cvs1:/tmp/cvs-serv9828/dsql

Modified Files:
	pass1.cpp 
Log Message:
Disallowed Nickolay's SAVEPOINT feature for SPs/triggers.

Index: pass1.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dsql/pass1.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -b -U3 -r1.27 -r1.28
--- pass1.cpp	29 Oct 2002 20:20:23 -0000	1.27
+++ pass1.cpp	31 Oct 2002 12:01:53 -0000	1.28
@@ -1376,7 +1376,16 @@
 		return input;
 		
 	case nod_user_savepoint:
+		if (request->req_flags & REQ_procedure)
+			ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104, gds_arg_gds, gds_token_err,	/* Token unknown */
+					  gds_arg_gds, gds_random, gds_arg_string, "SAVEPOINT", 0);
+		request->req_type = REQ_SAVEPOINT;	
+		return input;
+
 	case nod_undo_savepoint:
+		if (request->req_flags & REQ_procedure)
+			ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104, gds_arg_gds, gds_token_err,	/* Token unknown */
+					  gds_arg_gds, gds_random, gds_arg_string, "ROLLBACK", 0);
 		request->req_type = REQ_SAVEPOINT;	
 		return input;