diff --git a/src/include/gen/msgs.h b/src/include/gen/msgs.h index 5b023ed781..9e9ac5303a 100644 --- a/src/include/gen/msgs.h +++ b/src/include/gen/msgs.h @@ -216,7 +216,7 @@ static const SCHAR * const messages[] = { "Could not expand the WAL segment for database %s", /* 194, wal_cant_expand */ "status code %s unknown", /* 195, codnotdef */ "exception %s not defined", /* 196, xcpnotdef */ - "exception %d", /* 197, except */ + "exception %s", /* 197, except */ "restart shared cache manager", /* 198, cache_restart */ "invalid lock handle", /* 199, bad_lock_handle */ "long-term journaling already enabled", /* 200, jrn_present */ diff --git a/src/jrd/exe.cpp b/src/jrd/exe.cpp index 1eddc425df..314e455f5e 100644 --- a/src/jrd/exe.cpp +++ b/src/jrd/exe.cpp @@ -3799,31 +3799,23 @@ static void set_error(thread_db* tdbb, const xcp_repeat* exception, jrd_nod* msg s = message; else if (temp[0]) s = temp; - //else if (name.length()) - // s = name.c_str(); else s = NULL; + char nr[20]; + const char* nameOrNumber = nr; if (name.length()) - { - if (s) - ERR_post(isc_except2, - isc_arg_string, ERR_cstring(name.c_str()), - isc_arg_gds, isc_random, isc_arg_string, ERR_cstring(s), - 0); - else - ERR_post(isc_except2, isc_arg_string, ERR_cstring(name.c_str()), 0); - } + nameOrNumber = name.c_str(); else - { - if (s) - ERR_post(isc_except, - isc_arg_number, exception->xcp_code, - isc_arg_gds, isc_random, isc_arg_string, ERR_cstring(s), - 0); - else - ERR_post(isc_except, isc_arg_number, exception->xcp_code, 0); - } + sprintf(nr, "%d", exception->xcp_code); + + if (s) + ERR_post(isc_except, + isc_arg_string, ERR_cstring(nameOrNumber), + isc_arg_gds, isc_random, isc_arg_string, ERR_cstring(s), + 0); + else + ERR_post(isc_except, isc_arg_string, ERR_cstring(nameOrNumber), 0); } } diff --git a/src/msgs/facilities.sql b/src/msgs/facilities.sql index 6d117a8e78..9996a1dfdd 100644 --- a/src/msgs/facilities.sql +++ b/src/msgs/facilities.sql @@ -1,5 +1,5 @@ /* MAX_NUMBER is the next number to be used, always one more than the highest message number. */ -INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2005-07-17 21:52:00', 'JRD', 0, 537); +INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2005-08-14 02:08:44', 'JRD', 0, 537); INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('1996-11-07 13:38:37', 'QLI', 1, 509); INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('1996-11-07 13:38:37', 'GDEF', 2, 345); INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2005-07-20 04:04:04', 'GFIX', 3, 115); diff --git a/src/msgs/history.sql b/src/msgs/history.sql index 4d3bfcfb88..848087e4ea 100644 --- a/src/msgs/history.sql +++ b/src/msgs/history.sql @@ -1125,6 +1125,7 @@ INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, O INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (1132, 'cvc', '2005-06-12 00:24:08', 0, 517, 'Invalid %s parameter to SUBSTRING. Only positive integers are allowed.', NULL, NULL, 'c_pg'); INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (1133, 'asf', '2005-06-13 22:54:00', 0, 268, 'COLLATION %s is not defined', NULL, NULL, 'c_pg'); INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (1134, 'cvc', '2005-07-31 02:18:54', 8, 223, 'Collation not installed', NULL, NULL, 'c_pg'); +INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (1135, 'cvc', '2005-08-14 02:08:44', 0, 197, 'exception %d', NULL, NULL, 'c_pg'); COMMIT WORK; diff --git a/src/msgs/messages.sql b/src/msgs/messages.sql index ccb9882d9e..8cd8ddc28c 100644 --- a/src/msgs/messages.sql +++ b/src/msgs/messages.sql @@ -1818,7 +1818,7 @@ INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FL INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES (NULL, 'get_exception', 'restore.e', NULL, 12, 199, NULL, 'restoring exception %s', NULL, NULL); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('codnotdef', 'par_condition', 'par.c', NULL, 0, 195, NULL, 'status code %s unknown', NULL, NULL); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('xcpnotdef', 'par_condition', 'par.c', NULL, 0, 196, NULL, 'exception %s not defined', NULL, NULL); -INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('except', 'looper', 'exe.c', NULL, 0, 197, NULL, 'exception %d', NULL, NULL); +INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('except', 'looper', 'exe.c', NULL, 0, 197, NULL, 'exception %s', NULL, NULL); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES (NULL, 'define_exception', 'dyn.e', NULL, 8, 142, NULL, 'DEFINE EXCEPTION failed', NULL, NULL); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES (NULL, 'delete_exception', 'dyn.e', NULL, 8, 143, NULL, 'ERASE EXCEPTION failed', NULL, NULL); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES (NULL, 'delete_exception', 'dyn.e', NULL, 8, 144, NULL, 'Exception not found', NULL, NULL); @@ -2954,7 +2954,7 @@ INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FL INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('TIME_ERR', 'add_row()', 'isql.epp', NULL, 17, 114, NULL, 'Bad TIMESTAMP: %s', NULL, NULL); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('gbak_activating_idx', 'RESTORE_restore', 'restore.epp', NULL, 12, 285, NULL, ' activating and creating deferred index %s', NULL, NULL); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('NO_COMMENTS', 'SHOW_metadata', 'show.epp', NULL, 17, 115, NULL, 'There are no comments for objects in this database', NULL, NULL); -INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('except2', 'looper', 'exe.cpp', NULL, 0, 528, NULL, 'exception %s', NULL, NULL); +INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('except2', 'looper', 'exe.cpp', NULL, 0, 528, NULL, 'exception %s', NULL, 'unused'); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('ONLY_FIRST_BLOBS', 'print_line', 'isql.epp', NULL, 17, 116, NULL, 'Printing only the first %d blobs.', NULL, NULL); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('MSG_TABLES', 'SHOW_metadata', 'show.epp', NULL, 17, 117, NULL, 'Tables:', NULL, NULL); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('MSG_FUNCTIONS', 'SHOW_metadata', 'show.epp', NULL, 17, 118, NULL, 'Functions:', NULL, NULL);