diff --git a/src/jrd/trig.h b/src/jrd/trig.h
index 36fdd707d2..8c5302c737 100644
--- a/src/jrd/trig.h
+++ b/src/jrd/trig.h
@@ -34,9 +34,10 @@
    operation to the four concatenations of SQL$ and the relation name.
    This blr cannot be generate by gdef.  The modified blr is:
 
+       blr_cast, blr_varying2, 3, 0, 31, 0,
        blr_substring,
        blr_concatenate, 
-          blr_literal, blr_text, 4,0, 'S','Q','L','$',
+          blr_literal, blr_text2, 1, 0, 4, 0, 'S', 'Q', 'L', '$',
           blr_field, 5, 17, 'R','D','B','$','R','E','L','A','T','I','O','N','_','N','A','M','E', 
        blr_literal, blr_long, 0, 0,0,0,0,
        blr_literal, blr_long, 0, 31,0,0,0,
@@ -115,9 +116,10 @@ static const UCHAR trigger1[] =
    than 32 characters.
    This blr cannot be generate by gdef.  The modified blr is:
 
+       blr_cast, blr_varying2, 3, 0, 31, 0,
        blr_substring,
        blr_concatenate, 
-          blr_literal, blr_text, 4,0, 'S','Q','L','$',
+          blr_literal, blr_text2, 1, 0, 4, 0, 'S', 'Q', 'L', '$',
           blr_field, 5, 17, 'R','D','B','$','R','E','L','A','T','I','O','N','_','N','A','M','E', 
        blr_literal, blr_long, 0, 0,0,0,0,
        blr_literal, blr_long, 0, 31,0,0,0,
@@ -563,9 +565,10 @@ static const UCHAR trigger1[] =
 	blr_modify, 6, 15,
 	blr_begin,
 	blr_assignment,
+	blr_cast, blr_varying2, 3, 0, 31, 0,
 	blr_substring,
 	blr_concatenate,
-	blr_literal, blr_text, 4, 0, 'S', 'Q', 'L', '$',
+	blr_literal, blr_text2, 1, 0, 4, 0, 'S', 'Q', 'L', '$',
 	blr_field, 6, 17, 'R', 'D', 'B', '$', 'R', 'E', 'L', 'A', 'T', 'I', 'O',
 		'N', '_', 'N', 'A', 'M', 'E',
 	blr_literal, blr_long, 0, 0, 0, 0, 0,
@@ -577,9 +580,10 @@ static const UCHAR trigger1[] =
 	blr_neq,
 	blr_field, 6, 18, 'R', 'D', 'B', '$', 'S', 'E', 'C', 'U', 'R', 'I', 'T',
 		'Y', '_', 'C', 'L', 'A', 'S', 'S',
+	blr_cast, blr_varying2, 3, 0, 31, 0,
 	blr_substring,
 	blr_concatenate,
-	blr_literal, blr_text, 4, 0, 'S', 'Q', 'L', '$',
+	blr_literal, blr_text2, 1, 0, 4, 0, 'S', 'Q', 'L', '$',
 	blr_field, 6, 17, 'R', 'D', 'B', '$', 'R', 'E', 'L', 'A', 'T', 'I', 'O',
 		'N', '_', 'N', 'A', 'M', 'E',
 	blr_literal, blr_long, 0, 0, 0, 0, 0,
@@ -722,9 +726,10 @@ static const UCHAR trigger1[] =
 	blr_modify, 18, 20,
 	blr_begin,
 	blr_assignment,
+	blr_cast, blr_varying2, 3, 0, 31, 0,
 	blr_substring,
 	blr_concatenate,
-	blr_literal, blr_text, 4, 0, 'S', 'Q', 'L', '$',
+	blr_literal, blr_text2, 1, 0, 4, 0, 'S', 'Q', 'L', '$',
 	blr_field, 18, 18, 'R', 'D', 'B', '$', 'P', 'R', 'O', 'C', 'E', 'D', 'U',
 		'R', 'E', '_', 'N', 'A', 'M', 'E',
 	blr_literal, blr_long, 0, 0, 0, 0, 0,
@@ -736,9 +741,10 @@ static const UCHAR trigger1[] =
 	blr_neq,
 	blr_field, 18, 18, 'R', 'D', 'B', '$', 'S', 'E', 'C', 'U', 'R', 'I', 'T',
 		'Y', '_', 'C', 'L', 'A', 'S', 'S',
+	blr_cast, blr_varying2, 3, 0, 31, 0,
 	blr_substring,
 	blr_concatenate,
-	blr_literal, blr_text, 4, 0, 'S', 'Q', 'L', '$',
+	blr_literal, blr_text2, 1, 0, 4, 0, 'S', 'Q', 'L', '$',
 	blr_field, 18, 18, 'R', 'D', 'B', '$', 'P', 'R', 'O', 'C', 'E', 'D', 'U',
 		'R', 'E', '_', 'N', 'A', 'M', 'E',
 	blr_literal, blr_long, 0, 0, 0, 0, 0,