[Firebird-checkins] CVS: firebird2/src/jrd dyn_def.epp,1.95,1.96 dyn_mod.epp,1.60,1.61

[Claudio V. C. <ro...@us...>]

Build Version :  T2.0.0.10968 Firebird 2.0 Alpha 2

(writeBuildNum.sh,v 1.10979 2005/05/20 00:23:25 robocop Exp )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27315/src/jrd

Modified Files:
	dyn_def.epp dyn_mod.epp 
Log Message:
- Adjust error messages.
- Correct way to stop automatically generated triggers from being altered.

Index: dyn_def.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/dyn_def.epp,v
retrieving revision 1.95
retrieving revision 1.96
diff -b -U3 -r1.95 -r1.96
--- dyn_def.epp	19 May 2005 08:26:38 -0000	1.95
+++ dyn_def.epp	20 May 2005 00:23:14 -0000	1.96
@@ -846,7 +846,7 @@
 		{
 			DYN_rundown_request(request, drq_l_difference);
 			DYN_error_punt(true, 156, NULL, NULL, NULL, NULL, NULL);
-			/* msg 156: Shared cache lookup failed */
+			/* msg 156: Difference file lookup failed */
 		}
 	}
 

Index: dyn_mod.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/dyn_mod.epp,v
retrieving revision 1.60
retrieving revision 1.61
diff -b -U3 -r1.60 -r1.61
--- dyn_mod.epp	19 May 2005 08:26:38 -0000	1.60
+++ dyn_mod.epp	20 May 2005 00:23:15 -0000	1.61
@@ -612,10 +612,6 @@
  * Note: a global field here is a SQL domain.
  *
  **************************************/
-	SSHORT field_adjusted_count = 0;
-	const TEXT* err_one_type_change_only =
-		"Only one data type change to the domain allowed at a time";
-
 	thread_db* tdbb = JRD_get_thread_data();
 	Database* dbb = tdbb->tdbb_database;
 
@@ -642,10 +638,11 @@
 	const UCHAR *qryhdr, *missingval, *fldvald, *fldvaldsrc, *fielddesc,
 		*flddftval, *flddfltsrc;
 
-
 	GET_STRING(ptr, orig_dom.dyn_fld_name);
 
 	found = false;
+	int field_adjusted_count = 0;
+	
 	FOR(REQUEST_HANDLE request TRANSACTION_HANDLE gbl->gbl_transaction)
 		FLD IN RDB$FIELDS WITH FLD.RDB$FIELD_NAME EQ orig_dom.dyn_fld_name.c_str()
 
@@ -756,7 +753,8 @@
 				if (++field_adjusted_count > 2)
 				{
 					EXE_unwind(tdbb, request);
-					DYN_error_punt(false, 5, err_one_type_change_only, NULL, NULL, NULL, NULL);
+					DYN_error_punt(false, 148, orig_dom.dyn_fld_name.c_str(), NULL, NULL, NULL, NULL);
+					// msg 148: "Only one data type change to the domain %s allowed at a time"
 				}
 				switch (new_dom.dyn_dtype) {
 				
@@ -780,7 +778,8 @@
 				if (++field_adjusted_count > 2)
 				{
 					EXE_unwind(tdbb, request);
-					DYN_error_punt(false, 5, err_one_type_change_only, NULL, NULL, NULL, NULL);
+					DYN_error_punt(false, 148, orig_dom.dyn_fld_name.c_str(), NULL, NULL, NULL, NULL);
+					// msg 148: "Only one data type change to the domain %s allowed at a time"
 				}
 
 				switch (new_dom.dyn_dtype) {
@@ -1803,7 +1802,9 @@
 			case fb_sysflag_check_constraint:
 			case fb_sysflag_referential_constraint:
 			case fb_sysflag_view_check:
-				continue;
+				DYN_error_punt(false, 109, NULL, NULL, NULL, NULL, NULL);
+				// msg 109: "Triggers created automatically cannot be modified"
+				break;
 			default:
 				break;
 			}
@@ -1822,7 +1823,7 @@
 						GET_STRING(ptr, new_trigger_name);
 						if (new_trigger_name.length() == 0)
 							DYN_error_punt(false, 212, NULL, NULL, NULL, NULL, NULL);
-							/* msg 212: "Zero length identifiers not allowed" */
+							// msg 212: "Zero length identifiers not allowed"
 					    strcpy (X.RDB$TRIGGER_NAME, new_trigger_name.c_str());
 					}
 					break;
@@ -2544,10 +2545,6 @@
  *	produces a warning. This condition raises an error, too.
  *
  **************************************/
-	SSHORT field_adjusted_count = 0;
-	const TEXT* err_one_type_change_only =
-		"Only one data type change to the field allowed at a time";
-
 	thread_db* tdbb = JRD_get_thread_data();
 	Database* dbb = tdbb->tdbb_database;
 	
@@ -2572,6 +2569,8 @@
 	dtype = scale = prec = subtype = charlen = collation = fldlen = nullflg =
 		charset = false;
 	
+	int field_adjusted_count = 0;
+	
 	FOR(REQUEST_HANDLE request TRANSACTION_HANDLE gbl->gbl_transaction)
 		RFR IN RDB$RELATION_FIELDS WITH RFR.RDB$RELATION_NAME = relation_name->c_str()
 			AND RFR.RDB$FIELD_NAME = orig_fld.dyn_fld_name.c_str()
@@ -2628,7 +2627,9 @@
 					fldlen = true;
 					new_fld.dyn_dsc.dsc_length = DYN_get_number(ptr);
 					if (++field_adjusted_count > 2)
-						DYN_error_punt(false, 5, err_one_type_change_only, NULL, NULL, NULL, NULL);
+						DYN_error_punt(false, 149, orig_fld.dyn_fld_name.c_str(), NULL, NULL, NULL, NULL);
+						// msg 149: "Only one data type change to the field %s allowed at a time"
+
 					switch (new_fld.dyn_dtype)
 					{
 					case blr_text:
@@ -2649,7 +2650,8 @@
 					dtype = true;
 					new_fld.dyn_dtype = DYN_get_number(ptr);
 					if (++field_adjusted_count > 2)
-						DYN_error_punt(false, 5, err_one_type_change_only, NULL, NULL, NULL, NULL);
+						DYN_error_punt(false, 149, orig_fld.dyn_fld_name.c_str(), NULL, NULL, NULL, NULL);
+						// msg 149: "Only one data type change to the field %s allowed at a time"
 
 					switch (new_fld.dyn_dtype) {
 					case blr_text: