Skip to content

Commit 0cc8de3

Browse files
committed
Regenerate system triggers improving formatting and constant names.
1 parent ec18fa5 commit 0cc8de3

File tree

2 files changed

+1460
-1940
lines changed

2 files changed

+1460
-1940
lines changed

src/jrd/ini.epp

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -88,83 +88,83 @@ namespace
8888
const jrd_trg triggers[] =
8989
{
9090
{ "RDB$TRIGGER_1", (UCHAR) nam_user_privileges,
91-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger3), trigger3,
92-
0, ODS_8_0 },
91+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(TRIGGER_BLR_RDB_USER_PRIVILEGES_TRIGGER_1_BEFORE_UPDATE),
92+
TRIGGER_BLR_RDB_USER_PRIVILEGES_TRIGGER_1_BEFORE_UPDATE, 0, ODS_8_0 },
9393
{ "RDB$TRIGGER_8", (UCHAR) nam_user_privileges,
94-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger2), trigger2,
95-
0, ODS_8_0 },
94+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(TRIGGER_BLR_RDB_USER_PRIVILEGES_TRIGGER_8_BEFORE_DELETE),
95+
TRIGGER_BLR_RDB_USER_PRIVILEGES_TRIGGER_8_BEFORE_DELETE, 0, ODS_8_0 },
9696
{ "RDB$TRIGGER_9", (UCHAR) nam_user_privileges,
97-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(trigger1), trigger1,
98-
0, ODS_8_0 },
97+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(TRIGGER_BLR_RDB_USER_PRIVILEGES_TRIGGER_9_BEFORE_INSERT),
98+
TRIGGER_BLR_RDB_USER_PRIVILEGES_TRIGGER_9_BEFORE_INSERT, 0, ODS_8_0 },
9999
{ "RDB$TRIGGER_2", (UCHAR) nam_trgs,
100-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger4), trigger4,
101-
0, ODS_8_0 },
100+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(TRIGGER_BLR_RDB_TRIGGERS_TRIGGER_2_BEFORE_UPDATE),
101+
TRIGGER_BLR_RDB_TRIGGERS_TRIGGER_2_BEFORE_UPDATE, 0, ODS_8_0 },
102102
{ "RDB$TRIGGER_3", (UCHAR) nam_trgs,
103-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger4), trigger4,
104-
0, ODS_8_0 },
103+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(TRIGGER_BLR_RDB_TRIGGERS_TRIGGER_3_BEFORE_DELETE),
104+
TRIGGER_BLR_RDB_TRIGGERS_TRIGGER_3_BEFORE_DELETE, 0, ODS_8_0 },
105105
{ "RDB$TRIGGER_26", (UCHAR) nam_rel_constr,
106-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(trigger26), trigger26,
107-
0, ODS_8_0 },
106+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(TRIGGER_BLR_RDB_RELATION_CONSTRAINTS_TRIGGER_26_BEFORE_INSERT),
107+
TRIGGER_BLR_RDB_RELATION_CONSTRAINTS_TRIGGER_26_BEFORE_INSERT, 0, ODS_8_0 },
108108
{ "RDB$TRIGGER_25", (UCHAR) nam_rel_constr,
109-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger25),
110-
trigger25, 0, ODS_8_0 },
109+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(TRIGGER_BLR_RDB_RELATION_CONSTRAINTS_TRIGGER_25_BEFORE_UPDATE),
110+
TRIGGER_BLR_RDB_RELATION_CONSTRAINTS_TRIGGER_25_BEFORE_UPDATE, 0, ODS_8_0 },
111111
{ "RDB$TRIGGER_10", (UCHAR) nam_rel_constr,
112-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger10), trigger10,
113-
0, ODS_8_0 },
112+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(TRIGGER_BLR_RDB_RELATION_CONSTRAINTS_TRIGGER_10_BEFORE_DELETE),
113+
TRIGGER_BLR_RDB_RELATION_CONSTRAINTS_TRIGGER_10_BEFORE_DELETE, 0, ODS_8_0 },
114114
{ "RDB$TRIGGER_11", (UCHAR) nam_rel_constr,
115-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(trigger11),
116-
trigger11, 0, ODS_8_0 },
115+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(TRIGGER_BLR_RDB_RELATION_CONSTRAINTS_TRIGGER_11_AFTER_DELETE),
116+
TRIGGER_BLR_RDB_RELATION_CONSTRAINTS_TRIGGER_11_AFTER_DELETE, 0, ODS_8_0 },
117117
{ "RDB$TRIGGER_12", (UCHAR) nam_ref_constr,
118-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(trigger12), trigger12,
119-
0, ODS_8_0 },
118+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(TRIGGER_BLR_RDB_REF_CONSTRAINTS_TRIGGER_12_BEFORE_INSERT),
119+
TRIGGER_BLR_RDB_REF_CONSTRAINTS_TRIGGER_12_BEFORE_INSERT, 0, ODS_8_0 },
120120
{ "RDB$TRIGGER_13", (UCHAR) nam_ref_constr,
121-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger13),
122-
trigger13, 0, ODS_8_0 },
121+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(TRIGGER_BLR_RDB_REF_CONSTRAINTS_TRIGGER_13_BEFORE_UPDATE),
122+
TRIGGER_BLR_RDB_REF_CONSTRAINTS_TRIGGER_13_BEFORE_UPDATE, 0, ODS_8_0 },
123123
{ "RDB$TRIGGER_14", (UCHAR) nam_chk_constr,
124-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger14),
125-
trigger14, 0, ODS_8_0 },
124+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(TRIGGER_BLR_RDB_CHECK_CONSTRAINTS_TRIGGER_14_BEFORE_UPDATE),
125+
TRIGGER_BLR_RDB_CHECK_CONSTRAINTS_TRIGGER_14_BEFORE_UPDATE, 0, ODS_8_0 },
126126
{ "RDB$TRIGGER_15", (UCHAR) nam_chk_constr,
127-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger15), trigger15,
128-
0, ODS_8_0 },
127+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(TRIGGER_BLR_RDB_CHECK_CONSTRAINTS_TRIGGER_15_BEFORE_DELETE),
128+
TRIGGER_BLR_RDB_CHECK_CONSTRAINTS_TRIGGER_15_BEFORE_DELETE, 0, ODS_8_0 },
129129
{ "RDB$TRIGGER_16", (UCHAR) nam_chk_constr,
130-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(trigger16),
131-
trigger16, 0, ODS_8_0 },
130+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(TRIGGER_BLR_RDB_CHECK_CONSTRAINTS_TRIGGER_16_AFTER_DELETE),
131+
TRIGGER_BLR_RDB_CHECK_CONSTRAINTS_TRIGGER_16_AFTER_DELETE, 0, ODS_8_0 },
132132
{ "RDB$TRIGGER_17", (UCHAR) nam_i_segments,
133-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger17), trigger17,
134-
0, ODS_8_0 },
133+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(TRIGGER_BLR_RDB_INDEX_SEGMENTS_TRIGGER_17_BEFORE_DELETE),
134+
TRIGGER_BLR_RDB_INDEX_SEGMENTS_TRIGGER_17_BEFORE_DELETE, 0, ODS_8_0 },
135135
{ "RDB$TRIGGER_18", (UCHAR) nam_i_segments,
136-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger18),
137-
trigger18, 0, ODS_8_0 },
136+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(TRIGGER_BLR_RDB_INDEX_SEGMENTS_TRIGGER_18_BEFORE_UPDATE),
137+
TRIGGER_BLR_RDB_INDEX_SEGMENTS_TRIGGER_18_BEFORE_UPDATE, 0, ODS_8_0 },
138138
{ "RDB$TRIGGER_19", (UCHAR) nam_indices,
139-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger19), trigger19,
140-
0, ODS_8_0 },
139+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(TRIGGER_BLR_RDB_INDICES_TRIGGER_19_BEFORE_DELETE),
140+
TRIGGER_BLR_RDB_INDICES_TRIGGER_19_BEFORE_DELETE, 0, ODS_8_0 },
141141
{ "RDB$TRIGGER_20", (UCHAR) nam_indices,
142-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger20),
143-
trigger20, 0, ODS_8_0 },
142+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(TRIGGER_BLR_RDB_INDICES_TRIGGER_20_BEFORE_UPDATE),
143+
TRIGGER_BLR_RDB_INDICES_TRIGGER_20_BEFORE_UPDATE, 0, ODS_8_0 },
144144
{ "RDB$TRIGGER_21", (UCHAR) nam_trgs,
145-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger21), trigger21,
146-
0, ODS_8_0 },
145+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(TRIGGER_BLR_RDB_TRIGGERS_TRIGGER_21_BEFORE_DELETE),
146+
TRIGGER_BLR_RDB_TRIGGERS_TRIGGER_21_BEFORE_DELETE, 0, ODS_8_0 },
147147
{ "RDB$TRIGGER_22", (UCHAR) nam_trgs,
148-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger22),
149-
trigger22, 0, ODS_8_0 },
148+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(TRIGGER_BLR_RDB_TRIGGERS_TRIGGER_22_BEFORE_UPDATE),
149+
TRIGGER_BLR_RDB_TRIGGERS_TRIGGER_22_BEFORE_UPDATE, 0, ODS_8_0 },
150150
{ "RDB$TRIGGER_23", (UCHAR) nam_r_fields,
151-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger23), trigger23,
152-
0, ODS_8_0 },
151+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(TRIGGER_BLR_RDB_RELATION_FIELDS_TRIGGER_23_BEFORE_DELETE),
152+
TRIGGER_BLR_RDB_RELATION_FIELDS_TRIGGER_23_BEFORE_DELETE, 0, ODS_8_0 },
153153
{ "RDB$TRIGGER_24", (UCHAR) nam_r_fields,
154-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger24),
155-
trigger24, 0, ODS_8_0 },
154+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(TRIGGER_BLR_RDB_RELATION_FIELDS_TRIGGER_24_BEFORE_UPDATE),
155+
TRIGGER_BLR_RDB_RELATION_FIELDS_TRIGGER_24_BEFORE_UPDATE, 0, ODS_8_0 },
156156
{ "RDB$TRIGGER_27", (UCHAR) nam_r_fields,
157-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(trigger27),
158-
trigger27, 0, ODS_8_0 },
157+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(TRIGGER_BLR_RDB_RELATION_FIELDS_TRIGGER_27_AFTER_DELETE),
158+
TRIGGER_BLR_RDB_RELATION_FIELDS_TRIGGER_27_AFTER_DELETE, 0, ODS_8_0 },
159159
{ "RDB$TRIGGER_34", (UCHAR) nam_rel_constr,
160-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(trigger34),
161-
trigger34, TRG_ignore_perm, ODS_8_1 },
160+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(TRIGGER_BLR_RDB_RELATION_CONSTRAINTS_TRIGGER_34_AFTER_DELETE),
161+
TRIGGER_BLR_RDB_RELATION_CONSTRAINTS_TRIGGER_34_AFTER_DELETE, TRG_ignore_perm, ODS_8_1 },
162162
{ "RDB$TRIGGER_35", (UCHAR) nam_chk_constr,
163-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(trigger35),
164-
trigger35, TRG_ignore_perm, ODS_8_1 },
163+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(TRIGGER_BLR_RDB_CHECK_CONSTRAINTS_TRIGGER_35_AFTER_DELETE),
164+
TRIGGER_BLR_RDB_CHECK_CONSTRAINTS_TRIGGER_35_AFTER_DELETE, TRG_ignore_perm, ODS_8_1 },
165165
{ "RDB$TRIGGER_36", (UCHAR) nam_fields,
166-
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger36),
167-
trigger36, 0, ODS_11_0 },
166+
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(TRIGGER_BLR_RDB_FIELDS_TRIGGER_36_BEFORE_UPDATE),
167+
TRIGGER_BLR_RDB_FIELDS_TRIGGER_36_BEFORE_UPDATE, 0, ODS_11_0 },
168168
{ 0, 0, 0, 0, 0, 0 }
169169
};
170170

0 commit comments

Comments
 (0)