firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 02:03:04 +01:00
Code Issues

Minor diagnostics cleanup

Browse Source
This commit is contained in:
AlexPeshkoff 2016-07-28 15:19:39 +03:00
parent 8df890c52c
commit fa9f723cce
12 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang_helpers/gds_codes.ftn
View File

@ -1638,6 +1638,10 @@ C --
PARAMETER (GDS__miss_prvlg = 335545112)
INTEGER*4 GDS__crypt_checksum
PARAMETER (GDS__crypt_checksum = 335545113)
INTEGER*4 GDS__not_dba
PARAMETER (GDS__not_dba = 335545114)
INTEGER*4 GDS__no_cursor
PARAMETER (GDS__no_cursor = 335545115)
INTEGER*4 GDS__gfix_db_name
PARAMETER (GDS__gfix_db_name = 335740929)
INTEGER*4 GDS__gfix_invalid_sw

4
lang_helpers/gds_codes.pas
View File

@ -1633,6 +1633,10 @@ const
gds_miss_prvlg = 335545112;
isc_crypt_checksum = 335545113;
gds_crypt_checksum = 335545113;
isc_not_dba = 335545114;
gds_not_dba = 335545114;
isc_no_cursor = 335545115;
gds_no_cursor = 335545115;
isc_gfix_db_name = 335740929;
gds_gfix_db_name = 335740929;
isc_gfix_invalid_sw = 335740930;

2
src/dsql/dsql.cpp
View File

@ -208,7 +208,7 @@ DsqlCursor* DSQL_open(thread_db* tdbb,
// Validate statement type
if (!reqTypeWithCursor(statement->getType()))
(Arg::Gds(isc_random) << "Cannot open non-SELECT statement").raise();
Arg::Gds(isc_no_cursor).raise();
// Validate cursor being not already open

2
src/include/gen/codetext.h
View File

@ -815,6 +815,8 @@ static const struct {
{"wrong_prvlg", 335545111},
{"miss_prvlg", 335545112},
{"crypt_checksum", 335545113},
{"not_dba", 335545114},
{"no_cursor", 335545115},
{"gfix_db_name", 335740929},
{"gfix_invalid_sw", 335740930},
{"gfix_incmp_sw", 335740932},

8
src/include/gen/iberror.h
View File

@ -849,6 +849,8 @@ const ISC_STATUS isc_max_idx_depth = 335545110L;
const ISC_STATUS isc_wrong_prvlg = 335545111L;
const ISC_STATUS isc_miss_prvlg = 335545112L;
const ISC_STATUS isc_crypt_checksum = 335545113L;
const ISC_STATUS isc_not_dba = 335545114L;
const ISC_STATUS isc_no_cursor = 335545115L;
const ISC_STATUS isc_gfix_db_name = 335740929L;
const ISC_STATUS isc_gfix_invalid_sw = 335740930L;
const ISC_STATUS isc_gfix_incmp_sw = 335740932L;
@ -1320,7 +1322,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 = 1264;
const ISC_STATUS isc_err_max = 1266;
#else /* c definitions */
@ -2139,6 +2141,8 @@ const ISC_STATUS isc_err_max = 1264;
#define isc_wrong_prvlg 335545111L
#define isc_miss_prvlg 335545112L
#define isc_crypt_checksum 335545113L
#define isc_not_dba 335545114L
#define isc_no_cursor 335545115L
#define isc_gfix_db_name 335740929L
#define isc_gfix_invalid_sw 335740930L
#define isc_gfix_incmp_sw 335740932L
@ -2610,7 +2614,7 @@ const ISC_STATUS isc_err_max = 1264;
#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 1264
#define isc_err_max 1266
#endif

2
src/include/gen/msgs.h
View File

@ -818,6 +818,8 @@ Data source : @4"}, /* eds_statement */
{335545111, "System privilege @1 does not exist"}, /* wrong_prvlg */
{335545112, "System privilege @1 is missing"}, /* miss_prvlg */
{335545113, "Invalid or missing checksum of encrypted database"}, /* crypt_checksum */
{335545114, "You must have SYSDBA rights at this server"}, /* not_dba */
{335545115, "Cannot open cursor for non-SELECT statement"}, /* no_cursor */
{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 */

2
src/include/gen/sql_code.h
View File

@ -814,6 +814,8 @@ static const struct {
{335545111, -901}, /* 791 wrong_prvlg */
{335545112, -902}, /* 792 miss_prvlg */
{335545113, -902}, /* 793 crypt_checksum */
{335545114, -902}, /* 794 not_dba */
{335545115, -901}, /* 795 no_cursor */
{335740929, -901}, /* 1 gfix_db_name */
{335740930, -901}, /* 2 gfix_invalid_sw */
{335740932, -901}, /* 4 gfix_incmp_sw */

2
src/include/gen/sql_state.h
View File

@ -814,6 +814,8 @@ static const struct {
{335545111, "0A000"}, // 791 wrong_prvlg
{335545112, "28000"}, // 792 miss_prvlg
{335545113, "XX000"}, // 793 crypt_checksum
{335545114, "28000"}, // 794 not_dba
{335545115, "07005"}, // 795 no_cursor
{335740929, "00000"}, // 1 gfix_db_name
{335740930, "00000"}, // 2 gfix_invalid_sw
{335740932, "00000"}, // 4 gfix_incmp_sw

2
src/jrd/svc.cpp
View File

@ -2066,7 +2066,7 @@ void Service::start(USHORT spb_length, const UCHAR* spb_data)
// Do not let everyone look at server log
if (svc_id == isc_action_svc_get_fb_log && !(svc_user_flag & SVC_user_dba))
{
status_exception::raise(Arg::Gds(isc_adm_task_denied));
status_exception::raise(Arg::Gds(isc_adm_task_denied) << Arg::Gds(isc_not_dba));
}
// Break up the command line into individual arguments.

2
src/msgs/facilities2.sql
View File

@ -1,7 +1,7 @@
/* MAX_NUMBER is the next number to be used, always one more than the highest message number. */
set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES (?, ?, ?, ?);
--
('2016-06-03 14:53:38', 'JRD', 0, 794)
('2016-07-28 14:55:12', 'JRD', 0, 796)
('2015-03-17 18:33:00', 'QLI', 1, 533)
('2015-01-07 18:01:51', 'GFIX', 3, 134)
('1996-11-07 13:39:40', 'GPRE', 4, 1)

2
src/msgs/messages2.sql
View File

@ -901,6 +901,8 @@ Data source : @4', NULL, NULL)
('wrong_prvlg', 'SCL_convert_privilege', 'scl.epp', NULL, 0, 791, NULL, 'System privilege @1 does not exist', NULL, NULL);
('miss_prvlg', 'validateAccess', 'jrd.cpp', NULL, 0, 792, NULL, 'System privilege @1 is missing', NULL, NULL);
('crypt_checksum', 'CryptoManager::checkDigitalSignature', 'CryptoManager.cpp', NULL, 0, 793, NULL, 'Invalid or missing checksum of encrypted database', NULL, NULL);
('not_dba', 'Service::start', 'svc.cpp', NULL, 0, 794, NULL, 'You must have SYSDBA rights at this server', NULL, NULL);
('no_cursor', 'DSQL_open', 'dsql.cpp', NULL, 0, 795, NULL, 'Cannot open cursor for non-SELECT statement', 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);

2
src/msgs/system_errors2.sql
View File

@ -800,6 +800,8 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA
(-901, '0A', '000', 0, 791, 'wrong_prvlg', NULL, NULL)
(-902, '28', '000', 0, 792, 'miss_prvlg', NULL, NULL)
(-902, 'XX', '000', 0, 793, 'crypt_checksum', NULL, NULL)
(-902, '28', '000', 0, 794, 'not_dba', NULL, NULL)
(-901, '07', '005', 0, 795, 'no_cursor', NULL, NULL)
-- GFIX
(-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL)
(-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)