8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 22:43:03 +01:00

Added error constants for messages. It's my previous mistake.

This commit is contained in:
Roman Simakov 2019-03-21 18:16:56 +03:00
parent 70b9fab34f
commit 6359ed98bb
9 changed files with 145 additions and 13 deletions

View File

@ -2206,8 +2206,32 @@ C --
PARAMETER (GDS__dyn_cant_use_in_foreignkey = 336068897)
INTEGER*4 GDS__dyn_defvaldecl_package_func
PARAMETER (GDS__dyn_defvaldecl_package_func = 336068898)
INTEGER*4 GDS__dyn_cyclic_role
PARAMETER (GDS__dyn_cyclic_role = 336068900)
INTEGER*4 GDS__dyn_cant_use_zero_inc_ident
PARAMETER (GDS__dyn_cant_use_zero_inc_ident = 336068904)
INTEGER*4 GDS__dyn_no_ddl_grant_opt_priv
PARAMETER (GDS__dyn_no_ddl_grant_opt_priv = 336068907)
INTEGER*4 GDS__dyn_no_grant_opt_priv
PARAMETER (GDS__dyn_no_grant_opt_priv = 336068908)
INTEGER*4 GDS__dyn_func_not_exist
PARAMETER (GDS__dyn_func_not_exist = 336068909)
INTEGER*4 GDS__dyn_proc_not_exist
PARAMETER (GDS__dyn_proc_not_exist = 336068910)
INTEGER*4 GDS__dyn_pack_not_exist
PARAMETER (GDS__dyn_pack_not_exist = 336068911)
INTEGER*4 GDS__dyn_trig_not_exist
PARAMETER (GDS__dyn_trig_not_exist = 336068912)
INTEGER*4 GDS__dyn_view_not_exist
PARAMETER (GDS__dyn_view_not_exist = 336068913)
INTEGER*4 GDS__dyn_rel_not_exist
PARAMETER (GDS__dyn_rel_not_exist = 336068914)
INTEGER*4 GDS__dyn_exc_not_exist
PARAMETER (GDS__dyn_exc_not_exist = 336068915)
INTEGER*4 GDS__dyn_gen_not_exist
PARAMETER (GDS__dyn_gen_not_exist = 336068916)
INTEGER*4 GDS__dyn_fld_not_exist
PARAMETER (GDS__dyn_fld_not_exist = 336068917)
INTEGER*4 GDS__gbak_unknown_switch
PARAMETER (GDS__gbak_unknown_switch = 336330753)
INTEGER*4 GDS__gbak_page_size_missing

View File

@ -2201,8 +2201,32 @@ const
gds_dyn_cant_use_in_foreignkey = 336068897;
isc_dyn_defvaldecl_package_func = 336068898;
gds_dyn_defvaldecl_package_func = 336068898;
isc_dyn_cyclic_role = 336068900;
gds_dyn_cyclic_role = 336068900;
isc_dyn_cant_use_zero_inc_ident = 336068904;
gds_dyn_cant_use_zero_inc_ident = 336068904;
isc_dyn_no_ddl_grant_opt_priv = 336068907;
gds_dyn_no_ddl_grant_opt_priv = 336068907;
isc_dyn_no_grant_opt_priv = 336068908;
gds_dyn_no_grant_opt_priv = 336068908;
isc_dyn_func_not_exist = 336068909;
gds_dyn_func_not_exist = 336068909;
isc_dyn_proc_not_exist = 336068910;
gds_dyn_proc_not_exist = 336068910;
isc_dyn_pack_not_exist = 336068911;
gds_dyn_pack_not_exist = 336068911;
isc_dyn_trig_not_exist = 336068912;
gds_dyn_trig_not_exist = 336068912;
isc_dyn_view_not_exist = 336068913;
gds_dyn_view_not_exist = 336068913;
isc_dyn_rel_not_exist = 336068914;
gds_dyn_rel_not_exist = 336068914;
isc_dyn_exc_not_exist = 336068915;
gds_dyn_exc_not_exist = 336068915;
isc_dyn_gen_not_exist = 336068916;
gds_dyn_gen_not_exist = 336068916;
isc_dyn_fld_not_exist = 336068917;
gds_dyn_fld_not_exist = 336068917;
isc_gbak_unknown_switch = 336330753;
gds_gbak_unknown_switch = 336330753;
isc_gbak_page_size_missing = 336330754;

View File

@ -1099,7 +1099,19 @@ static const struct {
{"dyn_cant_use_zero_increment", 336068896},
{"dyn_cant_use_in_foreignkey", 336068897},
{"dyn_defvaldecl_package_func", 336068898},
{"dyn_cyclic_role", 336068900},
{"dyn_cant_use_zero_inc_ident", 336068904},
{"dyn_no_ddl_grant_opt_priv", 336068907},
{"dyn_no_grant_opt_priv", 336068908},
{"dyn_func_not_exist", 336068909},
{"dyn_proc_not_exist", 336068910},
{"dyn_pack_not_exist", 336068911},
{"dyn_trig_not_exist", 336068912},
{"dyn_view_not_exist", 336068913},
{"dyn_rel_not_exist", 336068914},
{"dyn_exc_not_exist", 336068915},
{"dyn_gen_not_exist", 336068916},
{"dyn_fld_not_exist", 336068917},
{"gbak_unknown_switch", 336330753},
{"gbak_page_size_missing", 336330754},
{"gbak_page_size_toobig", 336330755},

View File

@ -1133,7 +1133,19 @@ const ISC_STATUS isc_dyn_cant_modify_sysobj = 336068895L;
const ISC_STATUS isc_dyn_cant_use_zero_increment = 336068896L;
const ISC_STATUS isc_dyn_cant_use_in_foreignkey = 336068897L;
const ISC_STATUS isc_dyn_defvaldecl_package_func = 336068898L;
const ISC_STATUS isc_dyn_cyclic_role = 336068900L;
const ISC_STATUS isc_dyn_cant_use_zero_inc_ident = 336068904L;
const ISC_STATUS isc_dyn_no_ddl_grant_opt_priv = 336068907L;
const ISC_STATUS isc_dyn_no_grant_opt_priv = 336068908L;
const ISC_STATUS isc_dyn_func_not_exist = 336068909L;
const ISC_STATUS isc_dyn_proc_not_exist = 336068910L;
const ISC_STATUS isc_dyn_pack_not_exist = 336068911L;
const ISC_STATUS isc_dyn_trig_not_exist = 336068912L;
const ISC_STATUS isc_dyn_view_not_exist = 336068913L;
const ISC_STATUS isc_dyn_rel_not_exist = 336068914L;
const ISC_STATUS isc_dyn_exc_not_exist = 336068915L;
const ISC_STATUS isc_dyn_gen_not_exist = 336068916L;
const ISC_STATUS isc_dyn_fld_not_exist = 336068917L;
const ISC_STATUS isc_gbak_unknown_switch = 336330753L;
const ISC_STATUS isc_gbak_page_size_missing = 336330754L;
const ISC_STATUS isc_gbak_page_size_toobig = 336330755L;
@ -1464,7 +1476,7 @@ const ISC_STATUS isc_trace_switch_user_only = 337182757L;
const ISC_STATUS isc_trace_switch_param_miss = 337182758L;
const ISC_STATUS isc_trace_param_act_notcompat = 337182759L;
const ISC_STATUS isc_trace_mandatory_switch_miss = 337182760L;
const ISC_STATUS isc_err_max = 1408;
const ISC_STATUS isc_err_max = 1420;
#else /* c definitions */
@ -2567,7 +2579,19 @@ const ISC_STATUS isc_err_max = 1408;
#define isc_dyn_cant_use_zero_increment 336068896L
#define isc_dyn_cant_use_in_foreignkey 336068897L
#define isc_dyn_defvaldecl_package_func 336068898L
#define isc_dyn_cyclic_role 336068900L
#define isc_dyn_cant_use_zero_inc_ident 336068904L
#define isc_dyn_no_ddl_grant_opt_priv 336068907L
#define isc_dyn_no_grant_opt_priv 336068908L
#define isc_dyn_func_not_exist 336068909L
#define isc_dyn_proc_not_exist 336068910L
#define isc_dyn_pack_not_exist 336068911L
#define isc_dyn_trig_not_exist 336068912L
#define isc_dyn_view_not_exist 336068913L
#define isc_dyn_rel_not_exist 336068914L
#define isc_dyn_exc_not_exist 336068915L
#define isc_dyn_gen_not_exist 336068916L
#define isc_dyn_fld_not_exist 336068917L
#define isc_gbak_unknown_switch 336330753L
#define isc_gbak_page_size_missing 336330754L
#define isc_gbak_page_size_toobig 336330755L
@ -2898,7 +2922,7 @@ const ISC_STATUS isc_err_max = 1408;
#define isc_trace_switch_param_miss 337182758L
#define isc_trace_param_act_notcompat 337182759L
#define isc_trace_mandatory_switch_miss 337182760L
#define isc_err_max 1408
#define isc_err_max 1420
#endif

View File

@ -1102,7 +1102,19 @@ Data source : @4"}, /* eds_statement */
{336068896, "INCREMENT BY 0 is an illegal option for sequence @1"}, /* dyn_cant_use_zero_increment */
{336068897, "Can't use @1 in FOREIGN KEY constraint"}, /* dyn_cant_use_in_foreignkey */
{336068898, "Default values for parameters are not allowed in the definition of a previously declared packaged function @1.@2"}, /* dyn_defvaldecl_package_func */
{336068900, "role @1 can not be granted to role @2"}, /* dyn_cyclic_role */
{336068904, "INCREMENT BY 0 is an illegal option for identity column @1 of table @2"}, /* dyn_cant_use_zero_inc_ident */
{336068907, "no @1 privilege with grant option on DDL @2"}, /* dyn_no_ddl_grant_opt_priv */
{336068908, "no @1 privilege with grant option on object @2"}, /* dyn_no_grant_opt_priv */
{336068909, "Function @1 does not exist"}, /* dyn_func_not_exist */
{336068910, "Procedure @1 does not exist"}, /* dyn_proc_not_exist */
{336068911, "Package @1 does not exist"}, /* dyn_pack_not_exist */
{336068912, "Trigger @1 does not exist"}, /* dyn_trig_not_exist */
{336068913, "View @1 does not exist"}, /* dyn_view_not_exist */
{336068914, "Table @1 does not exist"}, /* dyn_rel_not_exist */
{336068915, "Exception @1 does not exist"}, /* dyn_exc_not_exist */
{336068916, "Generator/Sequence @1 does not exist"}, /* dyn_gen_not_exist */
{336068917, "Field @1 of table @2 does not exist"}, /* dyn_fld_not_exist */
{336330753, "found unknown switch"}, /* gbak_unknown_switch */
{336330754, "page size parameter missing"}, /* gbak_page_size_missing */
{336330755, "Page size specified (@1) greater than limit (32768 bytes)"}, /* gbak_page_size_toobig */

View File

@ -1098,7 +1098,19 @@ static const struct {
{336068896, -901}, /* 288 dyn_cant_use_zero_increment */
{336068897, -901}, /* 289 dyn_cant_use_in_foreignkey */
{336068898, -901}, /* 290 dyn_defvaldecl_package_func */
{336068900, -901}, /* 292 dyn_cyclic_role */
{336068904, -901}, /* 296 dyn_cant_use_zero_inc_ident */
{336068907, -901}, /* 299 dyn_no_ddl_grant_opt_priv */
{336068908, -901}, /* 300 dyn_no_grant_opt_priv */
{336068909, -901}, /* 301 dyn_func_not_exist */
{336068910, -901}, /* 302 dyn_proc_not_exist */
{336068911, -901}, /* 303 dyn_pack_not_exist */
{336068912, -901}, /* 304 dyn_trig_not_exist */
{336068913, -901}, /* 305 dyn_view_not_exist */
{336068914, -901}, /* 306 dyn_rel_not_exist */
{336068915, -901}, /* 307 dyn_exc_not_exist */
{336068916, -901}, /* 308 dyn_gen_not_exist */
{336068917, -901}, /* 309 dyn_fld_not_exist */
{336330753, -901}, /* 1 gbak_unknown_switch */
{336330754, -901}, /* 2 gbak_page_size_missing */
{336330755, -901}, /* 3 gbak_page_size_toobig */

View File

@ -1098,7 +1098,19 @@ static const struct {
{336068896, "42000"}, // 288 dyn_cant_use_zero_increment
{336068897, "42000"}, // 289 dyn_cant_use_in_foreignkey
{336068898, "42000"}, // 290 dyn_defvaldecl_package_func
{336068900, "42000"}, // 292 dyn_cyclic_role
{336068904, "42000"}, // 296 dyn_cant_use_zero_inc_ident
{336068907, "42000"}, // 299 dyn_no_ddl_grant_opt_priv
{336068908, "42000"}, // 300 dyn_no_grant_opt_priv
{336068909, "42000"}, // 301 dyn_func_not_exist
{336068910, "42000"}, // 302 dyn_proc_not_exist
{336068911, "42000"}, // 303 dyn_pack_not_exist
{336068912, "42000"}, // 304 dyn_trig_not_exist
{336068913, "42000"}, // 305 dyn_view_not_exist
{336068914, "42000"}, // 306 dyn_rel_not_exist
{336068915, "42000"}, // 307 dyn_exc_not_exist
{336068916, "42000"}, // 308 dyn_gen_not_exist
{336068917, "42000"}, // 309 dyn_fld_not_exist
{336330753, "00000"}, // 1 gbak_unknown_switch
{336330754, "00000"}, // 2 gbak_page_size_missing
{336330755, "00000"}, // 3 gbak_page_size_toobig

View File

@ -2126,17 +2126,17 @@ COMMIT WORK;
('dyn_cant_use_zero_inc_ident', NULL, 'DdlNodes.epp', NULL, 8, 296, NULL, 'INCREMENT BY 0 is an illegal option for identity column @1 of table @2', NULL, NULL);
('dyn_concur_alter_database', 'AlterDatabaseNode::execute', 'DdlNodes.epp', NULL, 8, 297, NULL, 'Concurrent ALTER DATABASE is not supported', NULL, NULL);
('dyn_incompat_alter_database', 'AlterDatabaseNode::execute', 'DdlNodes.epp', NULL, 8, 298, NULL, 'Incompatible ALTER DATABASE clauses: ''@1'' and ''@2''', NULL, NULL);
(NULL, 'checkGrantorCanGrantObject', 'DdlNodes.epp', NULL, 8, 299, NULL, 'no @1 privilege with grant option on DDL @2', NULL, NULL);
(NULL, 'checkGrantorCanGrantObject', 'DdlNodes.epp', NULL, 8, 300, NULL, 'no @1 privilege with grant option on object @2', NULL, NULL);
(NULL, 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 301, NULL, 'Function @1 does not exist', NULL, NULL);
(NULL, 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 302, NULL, 'Procedure @1 does not exist', NULL, NULL);
(NULL, 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 303, NULL, 'Package @1 does not exist', NULL, NULL);
(NULL, 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 304, NULL, 'Trigger @1 does not exist', NULL, NULL);
(NULL, 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 305, NULL, 'View @1 does not exist', NULL, NULL);
(NULL, 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 306, NULL, 'Table @1 does not exist', NULL, NULL);
(NULL, 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 307, NULL, 'Exception @1 does not exist', NULL, NULL);
(NULL, 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 308, NULL, 'Generator/Sequence @1 does not exist', NULL, NULL);
(NULL, 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 309, NULL, 'Field @1 of table @2 does not exist', NULL, NULL);
('dyn_no_ddl_grant_opt_priv', 'checkGrantorCanGrantObject', 'DdlNodes.epp', NULL, 8, 299, NULL, 'no @1 privilege with grant option on DDL @2', NULL, NULL);
('dyn_no_grant_opt_priv', 'checkGrantorCanGrantObject', 'DdlNodes.epp', NULL, 8, 300, NULL, 'no @1 privilege with grant option on object @2', NULL, NULL);
('dyn_func_not_exist', 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 301, NULL, 'Function @1 does not exist', NULL, NULL);
('dyn_proc_not_exist', 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 302, NULL, 'Procedure @1 does not exist', NULL, NULL);
('dyn_pack_not_exist', 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 303, NULL, 'Package @1 does not exist', NULL, NULL);
('dyn_trig_not_exist', 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 304, NULL, 'Trigger @1 does not exist', NULL, NULL);
('dyn_view_not_exist', 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 305, NULL, 'View @1 does not exist', NULL, NULL);
('dyn_rel_not_exist', 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 306, NULL, 'Table @1 does not exist', NULL, NULL);
('dyn_exc_not_exist', 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 307, NULL, 'Exception @1 does not exist', NULL, NULL);
('dyn_gen_not_exist', 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 308, NULL, 'Generator/Sequence @1 does not exist', NULL, NULL);
('dyn_fld_not_exist', 'GrantRevokeNode::grantRevoke', 'DdlNodes.epp', NULL, 8, 309, NULL, 'Field @1 of table @2 does not exist', NULL, NULL);
COMMIT WORK;
-- TEST
(NULL, 'main', 'test.c', NULL, 11, 0, NULL, 'This is a modified text message', NULL, NULL);

View File

@ -1087,7 +1087,19 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA
(-901, '42', '000', 8, 288, 'dyn_cant_use_zero_increment', NULL, NULL)
(-901, '42', '000', 8, 289, 'dyn_cant_use_in_foreignkey', NULL, NULL)
(-901, '42', '000', 8, 290, 'dyn_defvaldecl_package_func', NULL, NULL)
(-901, '42', '000', 8, 292, 'dyn_cyclic_role', NULL, NULL)
(-901, '42', '000', 8, 296, 'dyn_cant_use_zero_inc_ident', NULL, NULL)
(-901, '42', '000', 8, 299, 'dyn_no_ddl_grant_opt_priv', NULL, NULL)
(-901, '42', '000', 8, 300, 'dyn_no_grant_opt_priv', NULL, NULL)
(-901, '42', '000', 8, 301, 'dyn_func_not_exist', NULL, NULL)
(-901, '42', '000', 8, 302, 'dyn_proc_not_exist', NULL, NULL)
(-901, '42', '000', 8, 303, 'dyn_pack_not_exist', NULL, NULL)
(-901, '42', '000', 8, 304, 'dyn_trig_not_exist', NULL, NULL)
(-901, '42', '000', 8, 305, 'dyn_view_not_exist', NULL, NULL)
(-901, '42', '000', 8, 306, 'dyn_rel_not_exist', NULL, NULL)
(-901, '42', '000', 8, 307, 'dyn_exc_not_exist', NULL, NULL)
(-901, '42', '000', 8, 308, 'dyn_gen_not_exist', NULL, NULL)
(-901, '42', '000', 8, 309, 'dyn_fld_not_exist', NULL, NULL)
-- GBAK
(-901, '00', '000', 12, 1, 'gbak_unknown_switch', NULL, NULL)
(-901, '00', '000', 12, 2, 'gbak_page_size_missing', NULL, NULL)