ALTER CONSTRAINT clause for CHECK constraint

Author: aafemt

doc/sql.extensions/README.ddl.txt

@@ -667,15 +667,15 @@ DROP [GLOBAL] MAPPING [IF EXISTS] <mapping>
 ALTER TABLE <table> DROP [IF EXISTS] <column>
 ALTER TABLE <table> DROP CONSTRAINT [IF EXISTS] <constraint>
 
-2) ALTER CONSTRAINT
+2) ALTER CONSTRAINT clause for ALTER TABLE statement.
 
-ANSI standard compliant ALTER CONSTRAINT clause for ALTER TABLE statement.
+Syntax:
 
 ALTER TABLE ALTER CONSTRAINT <constraint name> [NOT] ENFORCED
 
-Supported for UNIQUE, PRIMARY KEY and FOREIGN KEY constraints.
+Supported for UNIQUE, PRIMARY KEY, FOREIGN KEY and CHECK constraints.
 Primary and unique keys cannot be deactivated if they are referenced by any active foreign key.
 
-The corresponding non-standard ALTER INDEX statement is allowed as well.
+The corresponding ALTER INDEX and ALTER TRIGGER statements are allowed as well.
 
 ODS 13.2 is required.

src/dsql/DdlNodes.epp

@@ -3558,7 +3558,6 @@ bool TriggerDefinition::modify(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch
 		{
 			switch (TRG.RDB$SYSTEM_FLAG)
 			{
-				case fb_sysflag_check_constraint:
 				case fb_sysflag_referential_constraint:
 				case fb_sysflag_view_check:
 					status_exception::raise(Arg::Gds(isc_dyn_cant_modify_auto_trig));
@@ -7952,16 +7951,33 @@ void AlterRelationNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratc
 						{
 							// Deactivation of primary/unique key requires check for active foreign keys
 							checkIndexReferenced(tdbb, transaction, RC.RDB$INDEX_NAME);
+							modifyIndex(tdbb, transaction, RC.RDB$INDEX_NAME, clause->enforced);
 						}
 						else if (strcmp(RC.RDB$CONSTRAINT_TYPE, FOREIGN_KEY) == 0)
 						{
 							// Activation of foreign key requires check for active partner which is done on index activation
-							// so there is nothing to do here
+							// so there is nothing to check here
+							modifyIndex(tdbb, transaction, RC.RDB$INDEX_NAME, clause->enforced);
+						}
+						else if (strcmp(RC.RDB$CONSTRAINT_TYPE, CHECK_CNSTRT) == 0)
+						{
+							AutoCacheRequest requestHandle(tdbb, drq_m_check_trgs, DYN_REQUESTS);
+
+							FOR (REQUEST_HANDLE requestHandle TRANSACTION_HANDLE transaction)
+								TRG IN RDB$TRIGGERS CROSS
+								CHK IN RDB$CHECK_CONSTRAINTS WITH
+								TRG.RDB$RELATION_NAME EQ name.c_str() AND
+								TRG.RDB$TRIGGER_NAME EQ CHK.RDB$TRIGGER_NAME AND
+								CHK.RDB$CONSTRAINT_NAME EQ clause->name.c_str()
+							{
+								MODIFY TRG
+									TRG.RDB$TRIGGER_INACTIVE = clause->enforced ? FALSE : TRUE;
+								END_MODIFY
+							}
+							END_FOR
 						}
 						else
 							status_exception::raise(Arg::Gds(isc_wish_list) << Arg::Gds(isc_ref_cnstrnt_update));
-
-						modifyIndex(tdbb, transaction, RC.RDB$INDEX_NAME, clause->enforced);
 					}
 					END_FOR
 

src/isql/show.epp

@@ -3030,6 +3030,10 @@ static processing_state show_check(const SCHAR* object)
 
 		if (!TRG.RDB$TRIGGER_SOURCE.NULL)
 			SHOW_print_metadata_text_blob (isqlGlob.Out, &TRG.RDB$TRIGGER_SOURCE);
+
+		if (TRG.RDB$TRIGGER_INACTIVE == 1)
+			isqlGlob.printf(" Not enforced");
+
 		isqlGlob.printf(NEWLINE);
 
 	END_FOR

src/jrd/drq.h

@@ -251,6 +251,7 @@ enum drq_type_t
 	drq_e_pub_tab_all,		// erase relation from all publication
 	drq_get_constr_type,	// get constraint type
 	drq_c_active_fk,		// check if active FK references this index
+	drq_m_check_trgs,		// activate/deactivate triggers for check constraint
 
 	drq_MAX
 };

src/jrd/ini.epp

@@ -141,9 +141,6 @@ namespace
 		{ "RDB$TRIGGER_21", (UCHAR) nam_trgs,
 			RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger21), trigger21,
 			0, ODS_8_0 },
-		{ "RDB$TRIGGER_22", (UCHAR) nam_trgs,
-			RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger22),
-			trigger22, 0, ODS_8_0 },
 		{ "RDB$TRIGGER_23", (UCHAR) nam_r_fields,
 			RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger23), trigger23,
 			0, ODS_8_0 },
@@ -180,7 +177,6 @@ namespace
 		{ "RDB$TRIGGER_3", 0, "systrig_update", ODS_8_0 },
 		{ "RDB$TRIGGER_24", 1, "cnstrnt_fld_rename", ODS_8_0 },
 		{ "RDB$TRIGGER_23", 1, "cnstrnt_fld_del", ODS_8_0 },
-		{ "RDB$TRIGGER_22", 1, "check_trig_update", ODS_8_0 },
 		{ "RDB$TRIGGER_21", 1, "check_trig_del", ODS_8_0 },
 		{ "RDB$TRIGGER_19", 1, "integ_index_del", ODS_8_0 },
 		{ "RDB$TRIGGER_18", 1, "integ_index_seg_mod", ODS_8_0 },

src/jrd/trig.h

@@ -1412,92 +1412,6 @@ static const UCHAR trigger21[] =
 };
 
 
-/* define trigger update_constraint_trigger for rdb$triggers  */
-
-/******
-static const TEXT trigger_22_msg_0 [] = "Can't update trigger used by a CHECK Constraint";
-******/
-
-static const UCHAR trigger22[] =
-{
-	blr_version5,
-	blr_begin,
-	blr_for,
-	blr_rse, 2,
-	blr_relation, 21, 'R', 'D', 'B', '$', 'C', 'H', 'E', 'C', 'K', '_', 'C',
-		'O', 'N', 'S', 'T', 'R', 'A', 'I', 'N', 'T', 'S', 3,
-	blr_relation, 24, 'R', 'D', 'B', '$', 'R', 'E', 'L', 'A', 'T', 'I', 'O',
-		'N', '_', 'C', 'O', 'N', 'S', 'T', 'R', 'A', 'I', 'N', 'T', 'S', 4,
-	blr_boolean,
-	blr_and,
-	blr_eql,
-	blr_field, 3, 16, 'R', 'D', 'B', '$', 'T', 'R', 'I', 'G', 'G', 'E', 'R',
-		'_', 'N', 'A', 'M', 'E',
-	blr_field, 0, 16, 'R', 'D', 'B', '$', 'T', 'R', 'I', 'G', 'G', 'E', 'R',
-		'_', 'N', 'A', 'M', 'E',
-	blr_and,
-	blr_eql,
-	blr_field, 4, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
-		'I', 'N', 'T', '_', 'N', 'A', 'M', 'E',
-	blr_field, 3, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
-		'I', 'N', 'T', '_', 'N', 'A', 'M', 'E',
-	blr_eql,
-	blr_field, 4, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
-		'I', 'N', 'T', '_', 'T', 'Y', 'P', 'E',
-	blr_literal, blr_text, 5, 0, 'C', 'H', 'E', 'C', 'K',
-	blr_end,
-	blr_begin,
-	// ASF: Instead of always throw error here as before, we now check if any (except
-	// RDB$DESCRIPTION and RDB$TRIGGER_SOURCE) field was changed.
-	// We need this to RDB$FIX_METADATA (from metadata charset upgrade script) work.
-	// Also don't check RDB$VALID_BLR - see CORE-3101.
-	blr_if,
-	blr_not,
-	blr_and,
-	blr_and,
-	blr_and,
-	blr_and,
-	blr_and,
-	blr_and,
-	blr_and,
-	blr_and,
-	blr_equiv,
-	blr_field, 0, 16, 'R','D','B','$','T','R','I','G','G','E','R','_','N','A','M','E',
-	blr_field, 1, 16, 'R','D','B','$','T','R','I','G','G','E','R','_','N','A','M','E',
-	blr_equiv,
-	blr_field, 0, 17, 'R','D','B','$','R','E','L','A','T','I','O','N','_','N','A','M','E',
-	blr_field, 1, 17, 'R','D','B','$','R','E','L','A','T','I','O','N','_','N','A','M','E',
-	blr_equiv,
-	blr_field, 0, 20, 'R','D','B','$','T','R','I','G','G','E','R','_','S','E','Q','U','E','N','C','E',
-	blr_field, 1, 20, 'R','D','B','$','T','R','I','G','G','E','R','_','S','E','Q','U','E','N','C','E',
-	blr_equiv,
-	blr_field, 0, 16, 'R','D','B','$','T','R','I','G','G','E','R','_','T','Y','P','E',
-	blr_field, 1, 16, 'R','D','B','$','T','R','I','G','G','E','R','_','T','Y','P','E',
-	blr_equiv,
-	blr_field, 0, 15, 'R','D','B','$','T','R','I','G','G','E','R','_','B','L','R',
-	blr_field, 1, 15, 'R','D','B','$','T','R','I','G','G','E','R','_','B','L','R',
-	blr_equiv,
-	blr_field, 0, 20, 'R','D','B','$','T','R','I','G','G','E','R','_','I','N','A','C','T','I','V','E',
-	blr_field, 1, 20, 'R','D','B','$','T','R','I','G','G','E','R','_','I','N','A','C','T','I','V','E',
-	blr_equiv,
-	blr_field, 0, 15, 'R','D','B','$','S','Y','S','T','E','M','_','F','L','A','G',
-	blr_field, 1, 15, 'R','D','B','$','S','Y','S','T','E','M','_','F','L','A','G',
-	blr_equiv,
-	blr_field, 0, 9, 'R','D','B','$','F','L','A','G','S',
-	blr_field, 1, 9, 'R','D','B','$','F','L','A','G','S',
-	blr_equiv,
-	blr_field, 0, 14, 'R','D','B','$','D','E','B','U','G','_','I','N','F','O',
-	blr_field, 1, 14, 'R','D','B','$','D','E','B','U','G','_','I','N','F','O',
-    blr_begin,
-	blr_leave, 1,
-	blr_end,
-	blr_end,
-	blr_end,
-	blr_end,
-	blr_eoc
-};
-
-
 /* define trigger pre_delete_field for rdb$relation_fields  */
 
 /******