From 89c09d13206b838ea4468343c0223c25cf63de14 Mon Sep 17 00:00:00 2001 From: Adriano dos Santos Fernandes Date: Mon, 15 Apr 2019 12:22:10 -0300 Subject: [PATCH] Improve some error names/constants. --- lang_helpers/gds_codes.ftn | 16 ++++++++-------- lang_helpers/gds_codes.pas | 16 ++++++++-------- src/dsql/StmtNodes.cpp | 4 ++-- src/include/gen/codetext.h | 8 ++++---- src/include/gen/iberror.h | 16 ++++++++-------- src/include/gen/msgs.h | 8 ++++---- src/include/gen/sql_code.h | 8 ++++---- src/include/gen/sql_state.h | 8 ++++---- src/jrd/jrd.cpp | 10 +++++----- src/msgs/messages2.sql | 8 ++++---- src/msgs/system_errors2.sql | 8 ++++---- 11 files changed, 55 insertions(+), 55 deletions(-) diff --git a/lang_helpers/gds_codes.ftn b/lang_helpers/gds_codes.ftn index abec8afa9b..0c48c8dc0e 100644 --- a/lang_helpers/gds_codes.ftn +++ b/lang_helpers/gds_codes.ftn @@ -1718,10 +1718,10 @@ C -- PARAMETER (GDS__sysf_invalid_hash_algorithm = 335545152) INTEGER*4 GDS__expression_eval_index PARAMETER (GDS__expression_eval_index = 335545153) - INTEGER*4 GDS__decfloat_trap - PARAMETER (GDS__decfloat_trap = 335545154) - INTEGER*4 GDS__decfloat_round - PARAMETER (GDS__decfloat_round = 335545155) + INTEGER*4 GDS__invalid_decfloat_trap + PARAMETER (GDS__invalid_decfloat_trap = 335545154) + INTEGER*4 GDS__invalid_decfloat_round + PARAMETER (GDS__invalid_decfloat_round = 335545155) INTEGER*4 GDS__sysf_invalid_first_last_part PARAMETER (GDS__sysf_invalid_first_last_part = 335545156) INTEGER*4 GDS__sysf_invalid_date_timestamp @@ -1920,10 +1920,10 @@ C -- PARAMETER (GDS__eds_input_prm_not_used = 335545253) INTEGER*4 GDS__effective_user PARAMETER (GDS__effective_user = 335545254) - INTEGER*4 GDS__time_zone_bind - PARAMETER (GDS__time_zone_bind = 335545255) - INTEGER*4 GDS__decfloat_bind - PARAMETER (GDS__decfloat_bind = 335545256) + INTEGER*4 GDS__invalid_time_zone_bind + PARAMETER (GDS__invalid_time_zone_bind = 335545255) + INTEGER*4 GDS__invalid_decfloat_bind + PARAMETER (GDS__invalid_decfloat_bind = 335545256) INTEGER*4 GDS__gfix_db_name PARAMETER (GDS__gfix_db_name = 335740929) INTEGER*4 GDS__gfix_invalid_sw diff --git a/lang_helpers/gds_codes.pas b/lang_helpers/gds_codes.pas index 074b4ae947..803a52397c 100644 --- a/lang_helpers/gds_codes.pas +++ b/lang_helpers/gds_codes.pas @@ -1713,10 +1713,10 @@ const gds_sysf_invalid_hash_algorithm = 335545152; isc_expression_eval_index = 335545153; gds_expression_eval_index = 335545153; - isc_decfloat_trap = 335545154; - gds_decfloat_trap = 335545154; - isc_decfloat_round = 335545155; - gds_decfloat_round = 335545155; + isc_invalid_decfloat_trap = 335545154; + gds_invalid_decfloat_trap = 335545154; + isc_invalid_decfloat_round = 335545155; + gds_invalid_decfloat_round = 335545155; isc_sysf_invalid_first_last_part = 335545156; gds_sysf_invalid_first_last_part = 335545156; isc_sysf_invalid_date_timestamp = 335545157; @@ -1915,10 +1915,10 @@ const gds_eds_input_prm_not_used = 335545253; isc_effective_user = 335545254; gds_effective_user = 335545254; - isc_time_zone_bind = 335545255; - gds_time_zone_bind = 335545255; - isc_decfloat_bind = 335545256; - gds_decfloat_bind = 335545256; + isc_invalid_time_zone_bind = 335545255; + gds_invalid_time_zone_bind = 335545255; + isc_invalid_decfloat_bind = 335545256; + gds_invalid_decfloat_bind = 335545256; isc_gfix_db_name = 335740929; gds_gfix_db_name = 335740929; isc_gfix_invalid_sw = 335740930; diff --git a/src/dsql/StmtNodes.cpp b/src/dsql/StmtNodes.cpp index 88e18955d1..d5c0f73795 100644 --- a/src/dsql/StmtNodes.cpp +++ b/src/dsql/StmtNodes.cpp @@ -8321,7 +8321,7 @@ SetDecFloatRoundNode::SetDecFloatRoundNode(MemoryPool& pool, Firebird::MetaName* fb_assert(name); const DecFloatConstant* mode = DecFloatConstant::getByText(*name, FB_DEC_RoundModes, FB_DEC_RMODE_OFFSET); if (!mode) - (Arg::Gds(isc_decfloat_round) << *name).raise(); + (Arg::Gds(isc_invalid_decfloat_round) << *name).raise(); rndMode = mode->val; } @@ -8341,7 +8341,7 @@ void SetDecFloatTrapsNode::trap(Firebird::MetaName* name) fb_assert(name); const DecFloatConstant* trap = DecFloatConstant::getByText(*name, FB_DEC_IeeeTraps, FB_DEC_TRAPS_OFFSET); if (!trap) - (Arg::Gds(isc_decfloat_trap) << *name).raise(); + (Arg::Gds(isc_invalid_decfloat_trap) << *name).raise(); traps |= trap->val; } diff --git a/src/include/gen/codetext.h b/src/include/gen/codetext.h index 7cae419cf4..5c210ee45e 100644 --- a/src/include/gen/codetext.h +++ b/src/include/gen/codetext.h @@ -855,8 +855,8 @@ static const struct { {"subproc_not_impl", 335545151}, {"sysf_invalid_hash_algorithm", 335545152}, {"expression_eval_index", 335545153}, - {"decfloat_trap", 335545154}, - {"decfloat_round", 335545155}, + {"invalid_decfloat_trap", 335545154}, + {"invalid_decfloat_round", 335545155}, {"sysf_invalid_first_last_part", 335545156}, {"sysf_invalid_date_timestamp", 335545157}, {"precision_err2", 335545158}, @@ -956,8 +956,8 @@ static const struct { {"tra_snapshot_does_not_exist", 335545252}, {"eds_input_prm_not_used", 335545253}, {"effective_user", 335545254}, - {"time_zone_bind", 335545255}, - {"decfloat_bind", 335545256}, + {"invalid_time_zone_bind", 335545255}, + {"invalid_decfloat_bind", 335545256}, {"gfix_db_name", 335740929}, {"gfix_invalid_sw", 335740930}, {"gfix_incmp_sw", 335740932}, diff --git a/src/include/gen/iberror.h b/src/include/gen/iberror.h index 8e34ed58b9..b64f3ae9fd 100644 --- a/src/include/gen/iberror.h +++ b/src/include/gen/iberror.h @@ -889,8 +889,8 @@ const ISC_STATUS isc_subfunc_not_impl = 335545150L; const ISC_STATUS isc_subproc_not_impl = 335545151L; const ISC_STATUS isc_sysf_invalid_hash_algorithm = 335545152L; const ISC_STATUS isc_expression_eval_index = 335545153L; -const ISC_STATUS isc_decfloat_trap = 335545154L; -const ISC_STATUS isc_decfloat_round = 335545155L; +const ISC_STATUS isc_invalid_decfloat_trap = 335545154L; +const ISC_STATUS isc_invalid_decfloat_round = 335545155L; const ISC_STATUS isc_sysf_invalid_first_last_part = 335545156L; const ISC_STATUS isc_sysf_invalid_date_timestamp = 335545157L; const ISC_STATUS isc_precision_err2 = 335545158L; @@ -990,8 +990,8 @@ const ISC_STATUS isc_bad_repl_handle = 335545251L; const ISC_STATUS isc_tra_snapshot_does_not_exist = 335545252L; const ISC_STATUS isc_eds_input_prm_not_used = 335545253L; const ISC_STATUS isc_effective_user = 335545254L; -const ISC_STATUS isc_time_zone_bind = 335545255L; -const ISC_STATUS isc_decfloat_bind = 335545256L; +const ISC_STATUS isc_invalid_time_zone_bind = 335545255L; +const ISC_STATUS isc_invalid_decfloat_bind = 335545256L; const ISC_STATUS isc_gfix_db_name = 335740929L; const ISC_STATUS isc_gfix_invalid_sw = 335740930L; const ISC_STATUS isc_gfix_incmp_sw = 335740932L; @@ -2338,8 +2338,8 @@ const ISC_STATUS isc_err_max = 1423; #define isc_subproc_not_impl 335545151L #define isc_sysf_invalid_hash_algorithm 335545152L #define isc_expression_eval_index 335545153L -#define isc_decfloat_trap 335545154L -#define isc_decfloat_round 335545155L +#define isc_invalid_decfloat_trap 335545154L +#define isc_invalid_decfloat_round 335545155L #define isc_sysf_invalid_first_last_part 335545156L #define isc_sysf_invalid_date_timestamp 335545157L #define isc_precision_err2 335545158L @@ -2439,8 +2439,8 @@ const ISC_STATUS isc_err_max = 1423; #define isc_tra_snapshot_does_not_exist 335545252L #define isc_eds_input_prm_not_used 335545253L #define isc_effective_user 335545254L -#define isc_time_zone_bind 335545255L -#define isc_decfloat_bind 335545256L +#define isc_invalid_time_zone_bind 335545255L +#define isc_invalid_decfloat_bind 335545256L #define isc_gfix_db_name 335740929L #define isc_gfix_invalid_sw 335740930L #define isc_gfix_incmp_sw 335740932L diff --git a/src/include/gen/msgs.h b/src/include/gen/msgs.h index e081a76fa4..0b880063bc 100644 --- a/src/include/gen/msgs.h +++ b/src/include/gen/msgs.h @@ -858,8 +858,8 @@ Data source : @4"}, /* eds_statement */ {335545151, "Sub-procedure @1 was declared but not implemented"}, /* subproc_not_impl */ {335545152, "Invalid HASH algorithm @1"}, /* sysf_invalid_hash_algorithm */ {335545153, "Expression evaluation error for index \"@1\" on table \"@2\""}, /* expression_eval_index */ - {335545154, "Invalid decfloat trap state @1"}, /* decfloat_trap */ - {335545155, "Invalid decfloat rounding mode @1"}, /* decfloat_round */ + {335545154, "Invalid decfloat trap state @1"}, /* invalid_decfloat_trap */ + {335545155, "Invalid decfloat rounding mode @1"}, /* invalid_decfloat_round */ {335545156, "Invalid part @1 to calculate the @1 of a DATE/TIMESTAMP"}, /* sysf_invalid_first_last_part */ {335545157, "Expected DATE/TIMESTAMP value in @1"}, /* sysf_invalid_date_timestamp */ {335545158, "Precision must be from @1 to @2"}, /* precision_err2 */ @@ -959,8 +959,8 @@ Data source : @4"}, /* eds_statement */ {335545252, "Transaction's base snapshot number does not exist"}, /* tra_snapshot_does_not_exist */ {335545253, "Input parameter '@1' is not used in SQL query text"}, /* eds_input_prm_not_used */ {335545254, "Effective user is @1"}, /* effective_user */ - {335545255, "Invalid time zone bind mode @1"}, /* time_zone_bind */ - {335545256, "Invalid decfloat bind mode @1"}, /* decfloat_bind */ + {335545255, "Invalid time zone bind mode @1"}, /* invalid_time_zone_bind */ + {335545256, "Invalid decfloat bind mode @1"}, /* invalid_decfloat_bind */ {335740929, "data base file name (@1) already given"}, /* gfix_db_name */ {335740930, "invalid switch @1"}, /* gfix_invalid_sw */ {335740932, "incompatible switch combination"}, /* gfix_incmp_sw */ diff --git a/src/include/gen/sql_code.h b/src/include/gen/sql_code.h index a81c0cc2d4..d9a4f774b1 100644 --- a/src/include/gen/sql_code.h +++ b/src/include/gen/sql_code.h @@ -854,8 +854,8 @@ static const struct { {335545151, -901}, /* 831 subproc_not_impl */ {335545152, -901}, /* 832 sysf_invalid_hash_algorithm */ {335545153, -901}, /* 833 expression_eval_index */ - {335545154, -901}, /* 834 decfloat_trap */ - {335545155, -901}, /* 835 decfloat_round */ + {335545154, -901}, /* 834 invalid_decfloat_trap */ + {335545155, -901}, /* 835 invalid_decfloat_round */ {335545156, -833}, /* 836 sysf_invalid_first_last_part */ {335545157, -833}, /* 837 sysf_invalid_date_timestamp */ {335545158, -842}, /* 838 precision_err2 */ @@ -955,8 +955,8 @@ static const struct { {335545252, -901}, /* 932 tra_snapshot_does_not_exist */ {335545253, -901}, /* 933 eds_input_prm_not_used */ {335545254, -551}, /* 934 effective_user */ - {335545255, -901}, /* 935 time_zone_bind */ - {335545256, -901}, /* 936 decfloat_bind */ + {335545255, -901}, /* 935 invalid_time_zone_bind */ + {335545256, -901}, /* 936 invalid_decfloat_bind */ {335740929, -901}, /* 1 gfix_db_name */ {335740930, -901}, /* 2 gfix_invalid_sw */ {335740932, -901}, /* 4 gfix_incmp_sw */ diff --git a/src/include/gen/sql_state.h b/src/include/gen/sql_state.h index 7252b86fdb..e88ec7832b 100644 --- a/src/include/gen/sql_state.h +++ b/src/include/gen/sql_state.h @@ -854,8 +854,8 @@ static const struct { {335545151, "42000"}, // 831 subproc_not_impl {335545152, "42000"}, // 832 sysf_invalid_hash_algorithm {335545153, "42000"}, // 833 expression_eval_index - {335545154, "42000"}, // 834 decfloat_trap - {335545155, "42000"}, // 835 decfloat_round + {335545154, "42000"}, // 834 invalid_decfloat_trap + {335545155, "42000"}, // 835 invalid_decfloat_round {335545156, "42000"}, // 836 sysf_invalid_first_last_part {335545157, "42000"}, // 837 sysf_invalid_date_timestamp {335545158, "HY104"}, // 838 precision_err2 @@ -955,8 +955,8 @@ static const struct { {335545252, "0B000"}, // 932 tra_snapshot_does_not_exist {335545253, "42000"}, // 933 eds_input_prm_not_used {335545254, "28000"}, // 934 effective_user - {335545255, "42000"}, // 935 time_zone_bind - {335545256, "42000"}, // 936 decfloat_bind + {335545255, "42000"}, // 935 invalid_time_zone_bind + {335545256, "42000"}, // 936 invalid_decfloat_bind {335740929, "00000"}, // 1 gfix_db_name {335740930, "00000"}, // 2 gfix_invalid_sw {335740932, "00000"}, // 4 gfix_incmp_sw diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp index cadbb1e44e..9d3432c17a 100644 --- a/src/jrd/jrd.cpp +++ b/src/jrd/jrd.cpp @@ -1074,7 +1074,7 @@ namespace Jrd else if (option == "native") timeZoneBind = TimeZoneUtil::BIND_NATIVE; else - (Arg::Gds(isc_time_zone_bind) << option).raise(); + (Arg::Gds(isc_invalid_time_zone_bind) << option).raise(); } if (options.dpb_decfloat_bind.hasData()) @@ -1107,12 +1107,12 @@ namespace Jrd } if (*p != '\0' || p - start == 0 || p - start > 2 || scale > DecimalBinding::MAX_SCALE) - (Arg::Gds(isc_decfloat_bind) << option).raise(); + (Arg::Gds(isc_invalid_decfloat_bind) << option).raise(); decFloatBinding = DecimalBinding(DecimalBinding::DEC_NUMERIC, static_cast(-scale)); } else - (Arg::Gds(isc_decfloat_bind) << option).raise(); + (Arg::Gds(isc_invalid_decfloat_bind) << option).raise(); } if (options.dpb_decfloat_round.hasData()) @@ -1121,7 +1121,7 @@ namespace Jrd options.dpb_decfloat_round.c_str(), FB_DEC_RoundModes, FB_DEC_RMODE_OFFSET); if (!dfConst) - (Arg::Gds(isc_decfloat_round) << options.dpb_decfloat_round).raise(); + (Arg::Gds(isc_invalid_decfloat_round) << options.dpb_decfloat_round).raise(); decFloatStatus.roundingMode = dfConst->val; } @@ -1142,7 +1142,7 @@ namespace Jrd trap.c_str(), FB_DEC_IeeeTraps, FB_DEC_TRAPS_OFFSET); if (!dfConst) - (Arg::Gds(isc_decfloat_trap) << trap).raise(); + (Arg::Gds(isc_invalid_decfloat_trap) << trap).raise(); traps |= dfConst->val; diff --git a/src/msgs/messages2.sql b/src/msgs/messages2.sql index caacd82cb1..eba8cde7c3 100644 --- a/src/msgs/messages2.sql +++ b/src/msgs/messages2.sql @@ -941,8 +941,8 @@ Data source : @4', NULL, NULL) ('subproc_not_impl', NULL, 'StmtNodes.cpp', NULL, 0, 831, NULL, 'Sub-procedure @1 was declared but not implemented', NULL, NULL); ('sysf_invalid_hash_algorithm', NULL, 'SysFunction.cpp', NULL, 0, 832, NULL, 'Invalid HASH algorithm @1', NULL, NULL); ('expression_eval_index', NULL, 'btr.cpp', NULL, 0, 833, NULL, 'Expression evaluation error for index "@1" on table "@2"', NULL, NULL); -('decfloat_trap', NULL, 'StmtNodes.cpp', NULL, 0, 834, NULL, 'Invalid decfloat trap state @1', NULL, NULL); -('decfloat_round', NULL, 'StmtNodes.cpp', NULL, 0, 835, NULL, 'Invalid decfloat rounding mode @1', NULL, NULL); +('invalid_decfloat_trap', NULL, 'StmtNodes.cpp', NULL, 0, 834, NULL, 'Invalid decfloat trap state @1', NULL, NULL); +('invalid_decfloat_round', NULL, 'StmtNodes.cpp', NULL, 0, 835, NULL, 'Invalid decfloat rounding mode @1', NULL, NULL); ('sysf_invalid_first_last_part', 'evlFirstLastDay', 'SysFunction.cpp', NULL, 0, 836, NULL, 'Invalid part @1 to calculate the @1 of a DATE/TIMESTAMP', NULL, NULL) ('sysf_invalid_date_timestamp', 'evlFirstLastDay', 'SysFunction.cpp', NULL, 0, 837, NULL, 'Expected DATE/TIMESTAMP value in @1', NULL, NULL) ('precision_err2', NULL, 'dsql parse.y', NULL, 0, 838, NULL, 'Precision must be from @1 to @2', NULL, NULL); @@ -1042,8 +1042,8 @@ Data source : @4', NULL, NULL) ('tra_snapshot_does_not_exist', NULL, 'tpc.cpp', NULL, 0, 932, NULL, 'Transaction''s base snapshot number does not exist', NULL, NULL); ('eds_input_prm_not_used', NULL, 'ExtDS.cpp', NULL, 0, 933, NULL, 'Input parameter ''@1'' is not used in SQL query text', NULL, NULL); ('effective_user', NULL, NULL, NULL, 0, 934, NULL, 'Effective user is @1', NULL, NULL); -('time_zone_bind', NULL, 'jrd.cpp', NULL, 0, 935, NULL, 'Invalid time zone bind mode @1', NULL, NULL); -('decfloat_bind', NULL, 'jrd.cpp', NULL, 0, 936, NULL, 'Invalid decfloat bind mode @1', NULL, NULL); +('invalid_time_zone_bind', NULL, 'jrd.cpp', NULL, 0, 935, NULL, 'Invalid time zone bind mode @1', NULL, NULL); +('invalid_decfloat_bind', NULL, 'jrd.cpp', NULL, 0, 936, NULL, 'Invalid decfloat bind mode @1', NULL, NULL); -- QLI (NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL); (NULL, NULL, NULL, NULL, 1, 1, NULL, 'bad block type', NULL, NULL); diff --git a/src/msgs/system_errors2.sql b/src/msgs/system_errors2.sql index 64c9a8e8ff..d10cfe46b8 100644 --- a/src/msgs/system_errors2.sql +++ b/src/msgs/system_errors2.sql @@ -840,8 +840,8 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA (-901, '42', '000', 0, 831, 'subproc_not_impl', NULL, NULL) (-901, '42', '000', 0, 832, 'sysf_invalid_hash_algorithm', NULL, NULL) (-901, '42', '000', 0, 833, 'expression_eval_index', NULL, NULL) -(-901, '42', '000', 0, 834, 'decfloat_trap', NULL, NULL) -(-901, '42', '000', 0, 835, 'decfloat_round', NULL, NULL) +(-901, '42', '000', 0, 834, 'invalid_decfloat_trap', NULL, NULL) +(-901, '42', '000', 0, 835, 'invalid_decfloat_round', NULL, NULL) (-833, '42', '000', 0, 836, 'sysf_invalid_first_last_part', NULL, NULL) (-833, '42', '000', 0, 837, 'sysf_invalid_date_timestamp', NULL, NULL) (-842, 'HY', '104', 0, 838, 'precision_err2', NULL, NULL) @@ -941,8 +941,8 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA (-901, '0B', '000', 0, 932, 'tra_snapshot_does_not_exist', NULL, NULL) (-901, '42', '000', 0, 933, 'eds_input_prm_not_used', NULL, NULL) (-551, '28', '000', 0, 934, 'effective_user', NULL, 'ERROR') -(-901, '42', '000', 0, 935, 'time_zone_bind', NULL, NULL) -(-901, '42', '000', 0, 936, 'decfloat_bind', NULL, NULL) +(-901, '42', '000', 0, 935, 'invalid_time_zone_bind', NULL, NULL) +(-901, '42', '000', 0, 936, 'invalid_decfloat_bind', NULL, NULL) -- GFIX (-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL) (-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)