8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:40:38 +01:00

Replace few hardcoded error messages by new error codes

This commit is contained in:
hvlad 2006-11-05 10:54:46 +00:00
parent d9b8e4bddf
commit 05b028628f
11 changed files with 199 additions and 93 deletions

View File

@ -1520,6 +1520,26 @@ C --
PARAMETER (GDS__dsql_derived_alias_field = 336397223)
INTEGER*4 GDS__dsql_auto_field_bad_pos
PARAMETER (GDS__dsql_auto_field_bad_pos = 336397224)
INTEGER*4 GDS__dsql_cte_wrong_reference
PARAMETER (GDS__dsql_cte_wrong_reference = 336397225)
INTEGER*4 GDS__dsql_cte_cycle
PARAMETER (GDS__dsql_cte_cycle = 336397226)
INTEGER*4 GDS__dsql_cte_outer_join
PARAMETER (GDS__dsql_cte_outer_join = 336397227)
INTEGER*4 GDS__dsql_cte_mult_references
PARAMETER (GDS__dsql_cte_mult_references = 336397228)
INTEGER*4 GDS__dsql_cte_not_a_union
PARAMETER (GDS__dsql_cte_not_a_union = 336397229)
INTEGER*4 GDS__dsql_cte_nonrecurs_after_recurs
PARAMETER (GDS__dsql_cte_nonrecurs_after_recurs = 336397230)
INTEGER*4 GDS__dsql_cte_wrong_clause
PARAMETER (GDS__dsql_cte_wrong_clause = 336397231)
INTEGER*4 GDS__dsql_cte_union_all
PARAMETER (GDS__dsql_cte_union_all = 336397232)
INTEGER*4 GDS__dsql_cte_miss_nonrecursive
PARAMETER (GDS__dsql_cte_miss_nonrecursive = 336397233)
INTEGER*4 GDS__dsql_cte_nested_with
PARAMETER (GDS__dsql_cte_nested_with = 336397234)
INTEGER*4 GDS__gsec_cant_open_db
PARAMETER (GDS__gsec_cant_open_db = 336723983)
INTEGER*4 GDS__gsec_switches_error

View File

@ -767,6 +767,16 @@ const
gds_dsql_derived_alias_select = 336397222;
gds_dsql_derived_alias_field = 336397223;
gds_dsql_auto_field_bad_pos = 336397224;
gds_dsql_cte_wrong_reference = 336397225;
gds_dsql_cte_cycle = 336397226;
gds_dsql_cte_outer_join = 336397227;
gds_dsql_cte_mult_references = 336397228;
gds_dsql_cte_not_a_union = 336397229;
gds_dsql_cte_nonrecurs_after_recurs = 336397230;
gds_dsql_cte_wrong_clause = 336397231;
gds_dsql_cte_union_all = 336397232;
gds_dsql_cte_miss_nonrecursive = 336397233;
gds_dsql_cte_nested_with = 336397234;
gds_gsec_cant_open_db = 336723983;
gds_gsec_switches_error = 336723984;
gds_gsec_no_op_spec = 336723985;

View File

@ -234,7 +234,6 @@ static dsql_nod* pass1_make_derived_field(dsql_req*, tsql*, dsql_nod*);
static dsql_nod* pass1_merge(dsql_req*, dsql_nod*, bool);
static dsql_nod* pass1_not(dsql_req*, const dsql_nod*, bool, bool);
static void pass1_put_args_on_stack(dsql_req*, dsql_nod*, DsqlNodStack&, bool);
static dsql_nod* pass1_recursive_cte(dsql_req* request, dsql_nod* input, bool proc_flag);
static dsql_nod* pass1_relation(dsql_req*, dsql_nod*);
static dsql_nod* pass1_replace(dsql_req*, dsql_nod*, bool);
static dsql_nod* pass1_returning(dsql_req*, const dsql_nod*, bool);
@ -760,8 +759,8 @@ dsql_nod* PASS1_node(dsql_req* request, dsql_nod* input, bool proc_flag)
(request->req_curr_ctes.object() == cte))
{
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "Recursive CTE member can refer itself only in FROM clause",
isc_arg_gds, isc_dsql_cte_wrong_reference, // Recursive CTE member (%s) can refer itself only in FROM clause
isc_arg_string, rel_name->str_data,
0);
}
@ -770,8 +769,8 @@ dsql_nod* PASS1_node(dsql_req* request, dsql_nod* input, bool proc_flag)
dsql_nod* cte1 = stack.object();
if (cte1 == cte) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "Cyclic CTEs dependencies found",
isc_arg_gds, isc_dsql_cte_cycle, // CTE %s have cyclic dependencies
isc_arg_string, rel_name->str_data,
0);
}
}
@ -4087,8 +4086,7 @@ static dsql_nod* pass1_join_is_recursive(dsql_req* request, dsql_nod*& input)
if (leftRecursive && join_type != nod_join_inner) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "recursive member of cte can''t be member of an outer join",
isc_arg_gds, isc_dsql_cte_outer_join, // Recursive member of CTE can''t be member of an outer join
0);
}
@ -4110,15 +4108,13 @@ static dsql_nod* pass1_join_is_recursive(dsql_req* request, dsql_nod*& input)
if (rightRecursive && join_type != nod_join_inner) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "recursive member of cte can''t be member of an outer join",
isc_arg_gds, isc_dsql_cte_outer_join, // Recursive member of CTE can''t be member of an outer join
0);
}
if (leftRecursive && rightRecursive) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "recursive member of cte can''t reference to itself more than once",
isc_arg_gds, isc_dsql_cte_mult_references, // Recursive member of CTE can''t reference itself more than once
0);
}
@ -4174,8 +4170,7 @@ static bool pass1_rse_is_recursive(dsql_req* request, dsql_nod* input)
{
if (found) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "recursive member of cte can''t reference to itself more than once",
isc_arg_gds, isc_dsql_cte_mult_references, // Recursive member of CTE can''t reference itself more than once
0);
}
found = true;
@ -4192,8 +4187,7 @@ static bool pass1_rse_is_recursive(dsql_req* request, dsql_nod* input)
{
if (found) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "recursive member of cte can''t reference to itself more than once",
isc_arg_gds, isc_dsql_cte_mult_references, // Recursive member of CTE can''t reference itself more than once
0);
}
found = true;
@ -4242,8 +4236,8 @@ static dsql_nod* pass1_recursive_cte(dsql_req* request, dsql_nod* input, bool pr
if (query->nod_type != nod_list && pass1_rse_is_recursive(request, query))
{
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "recursive cte must be union",
isc_arg_gds, isc_dsql_cte_not_a_union, // Recursive CTE (%s) must be an UNION
isc_arg_string, cte_alias->str_data,
0);
}
@ -4263,26 +4257,29 @@ static dsql_nod* pass1_recursive_cte(dsql_req* request, dsql_nod* input, bool pr
if (anchor_rse)
{
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "non-recursive query after recursive",
isc_arg_gds, isc_dsql_cte_nonrecurs_after_recurs, // CTE '%s' defined non-recursive member after recursive
isc_arg_string, cte_alias->str_data,
0);
}
if (rse->nod_arg[e_qry_distinct]) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "recursive query have DISTINCT clause",
isc_arg_gds, isc_dsql_cte_wrong_clause, // Recursive member of CTE '%s' have %s clause
isc_arg_string, cte_alias->str_data,
isc_arg_string, "DISTINCT",
0);
}
if (rse->nod_arg[e_qry_group]) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "recursive query have GROUP BY clause",
isc_arg_gds, isc_dsql_cte_wrong_clause, // Recursive member of CTE '%s' have %s clause
isc_arg_string, cte_alias->str_data,
isc_arg_string, "GROUP BY",
0);
}
if (rse->nod_arg[e_qry_having]) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "recursive query have HAVING clause",
isc_arg_gds, isc_dsql_cte_wrong_clause, // Recursive member of CTE '%s' have %s clause
isc_arg_string, cte_alias->str_data,
isc_arg_string, "HAVING",
0);
}
// hvlad: we need also forbid any aggregate function here
@ -4290,8 +4287,8 @@ static dsql_nod* pass1_recursive_cte(dsql_req* request, dsql_nod* input, bool pr
if ((qry->nod_type == nod_list) && !(qry->nod_flags & NOD_UNION_ALL)) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "recursive members of CTE must be linked with another members via UNION ALL",
isc_arg_gds, isc_dsql_cte_union_all, // Recursive members of CTE (%s) must be linked with another members via UNION ALL
isc_arg_string, cte_alias->str_data,
0);
}
if (!recursive_rse) {
@ -4315,8 +4312,8 @@ static dsql_nod* pass1_recursive_cte(dsql_req* request, dsql_nod* input, bool pr
}
if (!anchor_rse) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "non-recursive query is missing",
isc_arg_gds, isc_dsql_cte_miss_nonrecursive, // Non-recursive member is missing in CTE '%s'
isc_arg_string, cte_alias->str_data,
0);
}
@ -9661,8 +9658,7 @@ void dsql_req::addCTEs(dsql_nod* with)
if (req_ctes.getCount()) {
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_random,
isc_arg_string, "WITH clause can't be nested",
isc_arg_gds, isc_dsql_cte_nested_with, // WITH clause can't be nested
0);
}

View File

@ -756,6 +756,16 @@ static const struct {
{"dsql_derived_alias_select", 336397222},
{"dsql_derived_alias_field", 336397223},
{"dsql_auto_field_bad_pos", 336397224},
{"dsql_cte_wrong_reference", 336397225},
{"dsql_cte_cycle", 336397226},
{"dsql_cte_outer_join", 336397227},
{"dsql_cte_mult_references", 336397228},
{"dsql_cte_not_a_union", 336397229},
{"dsql_cte_nonrecurs_after_recurs", 336397230},
{"dsql_cte_wrong_clause", 336397231},
{"dsql_cte_union_all", 336397232},
{"dsql_cte_miss_nonrecursive", 336397233},
{"dsql_cte_nested_with", 336397234},
{"gsec_cant_open_db", 336723983},
{"gsec_switches_error", 336723984},
{"gsec_no_op_spec", 336723985},

View File

@ -789,6 +789,16 @@ const ISC_LONG isc_dsql_derived_field_dup_name = 336397221L;
const ISC_LONG isc_dsql_derived_alias_select = 336397222L;
const ISC_LONG isc_dsql_derived_alias_field = 336397223L;
const ISC_LONG isc_dsql_auto_field_bad_pos = 336397224L;
const ISC_LONG isc_dsql_cte_wrong_reference = 336397225L;
const ISC_LONG isc_dsql_cte_cycle = 336397226L;
const ISC_LONG isc_dsql_cte_outer_join = 336397227L;
const ISC_LONG isc_dsql_cte_mult_references = 336397228L;
const ISC_LONG isc_dsql_cte_not_a_union = 336397229L;
const ISC_LONG isc_dsql_cte_nonrecurs_after_recurs = 336397230L;
const ISC_LONG isc_dsql_cte_wrong_clause = 336397231L;
const ISC_LONG isc_dsql_cte_union_all = 336397232L;
const ISC_LONG isc_dsql_cte_miss_nonrecursive = 336397233L;
const ISC_LONG isc_dsql_cte_nested_with = 336397234L;
const ISC_LONG isc_gsec_cant_open_db = 336723983L;
const ISC_LONG isc_gsec_switches_error = 336723984L;
const ISC_LONG isc_gsec_no_op_spec = 336723985L;
@ -848,7 +858,7 @@ const ISC_LONG isc_gstat_unexpected_eof = 336920580L;
const ISC_LONG isc_gstat_open_err = 336920605L;
const ISC_LONG isc_gstat_read_err = 336920606L;
const ISC_LONG isc_gstat_sysmemex = 336920607L;
const ISC_LONG isc_err_max = 793;
const ISC_LONG isc_err_max = 803;
#else /* c definitions */
@ -1607,6 +1617,16 @@ const ISC_LONG isc_err_max = 793;
#define isc_dsql_derived_alias_select 336397222L
#define isc_dsql_derived_alias_field 336397223L
#define isc_dsql_auto_field_bad_pos 336397224L
#define isc_dsql_cte_wrong_reference 336397225L
#define isc_dsql_cte_cycle 336397226L
#define isc_dsql_cte_outer_join 336397227L
#define isc_dsql_cte_mult_references 336397228L
#define isc_dsql_cte_not_a_union 336397229L
#define isc_dsql_cte_nonrecurs_after_recurs 336397230L
#define isc_dsql_cte_wrong_clause 336397231L
#define isc_dsql_cte_union_all 336397232L
#define isc_dsql_cte_miss_nonrecursive 336397233L
#define isc_dsql_cte_nested_with 336397234L
#define isc_gsec_cant_open_db 336723983L
#define isc_gsec_switches_error 336723984L
#define isc_gsec_no_op_spec 336723985L
@ -1666,7 +1686,7 @@ const ISC_LONG isc_err_max = 793;
#define isc_gstat_open_err 336920605L
#define isc_gstat_read_err 336920606L
#define isc_gstat_sysmemex 336920607L
#define isc_err_max 793
#define isc_err_max 803
#endif

View File

@ -756,64 +756,74 @@ static const struct {
{336397222, "Internal dsql error: alias type expected by pass1_expand_select_node"}, /* 732, dsql_derived_alias_select */
{336397223, "Internal dsql error: alias type expected by pass1_field"}, /* 733, dsql_derived_alias_field */
{336397224, "Internal dsql error: column position out of range in pass1_union_auto_cast"}, /* 734, dsql_auto_field_bad_pos */
{336723983, "unable to open database"}, /* 735, gsec_cant_open_db */
{336723984, "error in switch specifications"}, /* 736, gsec_switches_error */
{336723985, "no operation specified"}, /* 737, gsec_no_op_spec */
{336723986, "no user name specified"}, /* 738, gsec_no_usr_name */
{336723987, "add record error"}, /* 739, gsec_err_add */
{336723988, "modify record error"}, /* 740, gsec_err_modify */
{336723989, "find/modify record error"}, /* 741, gsec_err_find_mod */
{336723990, "record not found for user: %s"}, /* 742, gsec_err_rec_not_found */
{336723991, "delete record error"}, /* 743, gsec_err_delete */
{336723992, "find/delete record error"}, /* 744, gsec_err_find_del */
{336723996, "find/display record error"}, /* 745, gsec_err_find_disp */
{336723997, "invalid parameter, no switch defined"}, /* 746, gsec_inv_param */
{336723998, "operation already specified"}, /* 747, gsec_op_specified */
{336723999, "password already specified"}, /* 748, gsec_pw_specified */
{336724000, "uid already specified"}, /* 749, gsec_uid_specified */
{336724001, "gid already specified"}, /* 750, gsec_gid_specified */
{336724002, "project already specified"}, /* 751, gsec_proj_specified */
{336724003, "organization already specified"}, /* 752, gsec_org_specified */
{336724004, "first name already specified"}, /* 753, gsec_fname_specified */
{336724005, "middle name already specified"}, /* 754, gsec_mname_specified */
{336724006, "last name already specified"}, /* 755, gsec_lname_specified */
{336724008, "invalid switch specified"}, /* 756, gsec_inv_switch */
{336724009, "ambiguous switch specified"}, /* 757, gsec_amb_switch */
{336724010, "no operation specified for parameters"}, /* 758, gsec_no_op_specified */
{336724011, "no parameters allowed for this operation"}, /* 759, gsec_params_not_allowed */
{336724012, "incompatible switches specified"}, /* 760, gsec_incompat_switch */
{336724044, "Invalid user name (maximum 31 bytes allowed)"}, /* 761, gsec_inv_username */
{336724045, "Warning - maximum 8 significant bytes of password used"}, /* 762, gsec_inv_pw_length */
{336724046, "database already specified"}, /* 763, gsec_db_specified */
{336724047, "database administrator name already specified"}, /* 764, gsec_db_admin_specified */
{336724048, "database administrator password already specified"}, /* 765, gsec_db_admin_pw_specified */
{336724049, "SQL role name already specified"}, /* 766, gsec_sql_role_specified */
{336789504, "The license file does not exist or could not be opened for read"}, /* 767, license_no_file */
{336789523, "operation already specified"}, /* 768, license_op_specified */
{336789524, "no operation specified"}, /* 769, license_op_missing */
{336789525, "invalid switch"}, /* 770, license_inv_switch */
{336789526, "invalid switch combination"}, /* 771, license_inv_switch_combo */
{336789527, "illegal operation/switch combination"}, /* 772, license_inv_op_combo */
{336789528, "ambiguous switch"}, /* 773, license_amb_switch */
{336789529, "invalid parameter, no switch specified"}, /* 774, license_inv_parameter */
{336789530, "switch does not take any parameter"}, /* 775, license_param_specified */
{336789531, "switch requires a parameter"}, /* 776, license_param_req */
{336789532, "syntax error in command line"}, /* 777, license_syntx_error */
{336789534, "The certificate was not added. A duplicate ID exists in the license file."}, /* 778, license_dup_id */
{336789535, "The certificate was not added. Invalid certificate ID / Key combination."}, /* 779, license_inv_id_key */
{336789536, "The certificate was not removed. The key does not exist or corresponds to a temporary evaluation license."}, /* 780, license_err_remove */
{336789537, "An error occurred updating the license file. Operation cancelled."}, /* 781, license_err_update */
{336789538, "The certificate could not be validated based on the information given. Please recheck the ID and key information."}, /* 782, license_err_convert */
{336789539, "Operation failed. An unknown error occurred."}, /* 783, license_err_unk */
{336789540, "Add license operation failed, KEY: %s ID: %s"}, /* 784, license_svc_err_add */
{336789541, "Remove license operation failed, KEY: %s"}, /* 785, license_svc_err_remove */
{336789563, "The evaluation license has already been used on this server. You need to purchase a non-evaluation license."}, /* 786, license_eval_exists */
{336920577, "found unknown switch"}, /* 787, gstat_unknown_switch */
{336920578, "please retry, giving a database name"}, /* 788, gstat_retry */
{336920579, "Wrong ODS version, expected %d, encountered %d"}, /* 789, gstat_wrong_ods */
{336920580, "Unexpected end of database file."}, /* 790, gstat_unexpected_eof */
{336920605, "Can't open database file %s"}, /* 791, gstat_open_err */
{336920606, "Can't read a database page"}, /* 792, gstat_read_err */
{336920607, "System memory exhausted"}, /* 793, gstat_sysmemex */
{336397225, "Recursive CTE member (%s) can refer itself only in FROM clause"}, /* 735, dsql_cte_wrong_reference */
{336397226, "CTE '%s' have cyclic dependencies"}, /* 736, dsql_cte_cycle */
{336397227, "Recursive member of CTE can't be member of an outer join"}, /* 737, dsql_cte_outer_join */
{336397228, "Recursive member of CTE can't reference itself more than once"}, /* 738, dsql_cte_mult_references */
{336397229, "Recursive CTE (%s) must be an UNION"}, /* 739, dsql_cte_not_a_union */
{336397230, "CTE '%s' defined non-recursive member after recursive"}, /* 740, dsql_cte_nonrecurs_after_recurs */
{336397231, "Recursive member of CTE '%s' have %s clause"}, /* 741, dsql_cte_wrong_clause */
{336397232, "Recursive members of CTE (%s) must be linked with another members via UNION ALL"}, /* 742, dsql_cte_union_all */
{336397233, "Non-recursive member is missing in CTE '%s'"}, /* 743, dsql_cte_miss_nonrecursive */
{336397234, "WITH clause can't be nested"}, /* 744, dsql_cte_nested_with */
{336723983, "unable to open database"}, /* 745, gsec_cant_open_db */
{336723984, "error in switch specifications"}, /* 746, gsec_switches_error */
{336723985, "no operation specified"}, /* 747, gsec_no_op_spec */
{336723986, "no user name specified"}, /* 748, gsec_no_usr_name */
{336723987, "add record error"}, /* 749, gsec_err_add */
{336723988, "modify record error"}, /* 750, gsec_err_modify */
{336723989, "find/modify record error"}, /* 751, gsec_err_find_mod */
{336723990, "record not found for user: %s"}, /* 752, gsec_err_rec_not_found */
{336723991, "delete record error"}, /* 753, gsec_err_delete */
{336723992, "find/delete record error"}, /* 754, gsec_err_find_del */
{336723996, "find/display record error"}, /* 755, gsec_err_find_disp */
{336723997, "invalid parameter, no switch defined"}, /* 756, gsec_inv_param */
{336723998, "operation already specified"}, /* 757, gsec_op_specified */
{336723999, "password already specified"}, /* 758, gsec_pw_specified */
{336724000, "uid already specified"}, /* 759, gsec_uid_specified */
{336724001, "gid already specified"}, /* 760, gsec_gid_specified */
{336724002, "project already specified"}, /* 761, gsec_proj_specified */
{336724003, "organization already specified"}, /* 762, gsec_org_specified */
{336724004, "first name already specified"}, /* 763, gsec_fname_specified */
{336724005, "middle name already specified"}, /* 764, gsec_mname_specified */
{336724006, "last name already specified"}, /* 765, gsec_lname_specified */
{336724008, "invalid switch specified"}, /* 766, gsec_inv_switch */
{336724009, "ambiguous switch specified"}, /* 767, gsec_amb_switch */
{336724010, "no operation specified for parameters"}, /* 768, gsec_no_op_specified */
{336724011, "no parameters allowed for this operation"}, /* 769, gsec_params_not_allowed */
{336724012, "incompatible switches specified"}, /* 770, gsec_incompat_switch */
{336724044, "Invalid user name (maximum 31 bytes allowed)"}, /* 771, gsec_inv_username */
{336724045, "Warning - maximum 8 significant bytes of password used"}, /* 772, gsec_inv_pw_length */
{336724046, "database already specified"}, /* 773, gsec_db_specified */
{336724047, "database administrator name already specified"}, /* 774, gsec_db_admin_specified */
{336724048, "database administrator password already specified"}, /* 775, gsec_db_admin_pw_specified */
{336724049, "SQL role name already specified"}, /* 776, gsec_sql_role_specified */
{336789504, "The license file does not exist or could not be opened for read"}, /* 777, license_no_file */
{336789523, "operation already specified"}, /* 778, license_op_specified */
{336789524, "no operation specified"}, /* 779, license_op_missing */
{336789525, "invalid switch"}, /* 780, license_inv_switch */
{336789526, "invalid switch combination"}, /* 781, license_inv_switch_combo */
{336789527, "illegal operation/switch combination"}, /* 782, license_inv_op_combo */
{336789528, "ambiguous switch"}, /* 783, license_amb_switch */
{336789529, "invalid parameter, no switch specified"}, /* 784, license_inv_parameter */
{336789530, "switch does not take any parameter"}, /* 785, license_param_specified */
{336789531, "switch requires a parameter"}, /* 786, license_param_req */
{336789532, "syntax error in command line"}, /* 787, license_syntx_error */
{336789534, "The certificate was not added. A duplicate ID exists in the license file."}, /* 788, license_dup_id */
{336789535, "The certificate was not added. Invalid certificate ID / Key combination."}, /* 789, license_inv_id_key */
{336789536, "The certificate was not removed. The key does not exist or corresponds to a temporary evaluation license."}, /* 790, license_err_remove */
{336789537, "An error occurred updating the license file. Operation cancelled."}, /* 791, license_err_update */
{336789538, "The certificate could not be validated based on the information given. Please recheck the ID and key information."}, /* 792, license_err_convert */
{336789539, "Operation failed. An unknown error occurred."}, /* 793, license_err_unk */
{336789540, "Add license operation failed, KEY: %s ID: %s"}, /* 794, license_svc_err_add */
{336789541, "Remove license operation failed, KEY: %s"}, /* 795, license_svc_err_remove */
{336789563, "The evaluation license has already been used on this server. You need to purchase a non-evaluation license."}, /* 796, license_eval_exists */
{336920577, "found unknown switch"}, /* 797, gstat_unknown_switch */
{336920578, "please retry, giving a database name"}, /* 798, gstat_retry */
{336920579, "Wrong ODS version, expected %d, encountered %d"}, /* 799, gstat_wrong_ods */
{336920580, "Unexpected end of database file."}, /* 800, gstat_unexpected_eof */
{336920605, "Can't open database file %s"}, /* 801, gstat_open_err */
{336920606, "Can't read a database page"}, /* 802, gstat_read_err */
{336920607, "System memory exhausted"}, /* 803, gstat_sysmemex */
{0, NULL}
};

View File

@ -812,4 +812,14 @@ static SLONG user_codes[] = {
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
};

View File

@ -755,6 +755,16 @@ static const struct {
{336397222, -104}, /* 934 dsql_derived_alias_select */
{336397223, -104}, /* 935 dsql_derived_alias_field */
{336397224, -104}, /* 936 dsql_auto_field_bad_pos */
{336397225, -104}, /* 937 dsql_cte_wrong_reference */
{336397226, -104}, /* 938 dsql_cte_cycle */
{336397227, -104}, /* 939 dsql_cte_outer_join */
{336397228, -104}, /* 940 dsql_cte_mult_references */
{336397229, -104}, /* 941 dsql_cte_not_a_union */
{336397230, -104}, /* 942 dsql_cte_nonrecurs_after_recurs */
{336397231, -104}, /* 943 dsql_cte_wrong_clause */
{336397232, -104}, /* 944 dsql_cte_union_all */
{336397233, -104}, /* 945 dsql_cte_miss_nonrecursive */
{336397234, -104}, /* 946 dsql_cte_nested_with */
{336723983, -901}, /* 15 gsec_cant_open_db */
{336723984, -901}, /* 16 gsec_switches_error */
{336723985, -901}, /* 17 gsec_no_op_spec */

View File

@ -16,7 +16,7 @@ INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('19
INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('1996-11-07 13:39:40', 'INSTALL', 10, 1);
INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('1996-11-07 13:38:41', 'TEST', 11, 4);
INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2006-07-28 06:38:03', 'GBAK', 12, 294);
INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2006-10-17 02:37:43', 'SQLERR', 13, 937);
INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2006-11-05 11:20:00', 'SQLERR', 13, 947);
INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('1996-11-07 13:38:42', 'SQLWARN', 14, 102);
INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2006-09-10 03:04:31', 'JRD_BUGCHK', 15, 307);
/*

View File

@ -3090,5 +3090,15 @@ 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 ('dsql_auto_field_bad_pos', 'pass1_union_auto_cast', 'pass1.cpp', NULL, 13, 936, NULL, 'Internal dsql error: column position out of range in pass1_union_auto_cast', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('bad_debug_format', 'DBG_parse_debug_info', 'DebugInterface.cpp', NULL, 0, 555, NULL, 'Bad debug info format', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('bad_proc_BLR', 'MET_procedure', 'met.cpp', NULL, 0, 556, NULL, 'Error while parsing procedure %s''s BLR', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('dsql_cte_wrong_reference', 'PASS1_node', 'dsql.cpp', NULL, 13, 937, NULL, 'Recursive CTE member (%s) can refer itself only in FROM clause', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('dsql_cte_cycle', 'PASS1_node', 'dsql.cpp', NULL, 13, 938, NULL, 'CTE ''%s'' have cyclic dependencies', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('dsql_cte_outer_join', 'pass1_join_is_recursive', 'dsql.cpp', NULL, 13, 939, NULL, 'Recursive member of CTE can''t be member of an outer join', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('dsql_cte_mult_references', 'pass1_join_is_recursive', 'dsql.cpp', NULL, 13, 940, NULL, 'Recursive member of CTE can''t reference itself more than once', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('dsql_cte_not_a_union', 'pass1_recursive_cte', 'dsql.cpp', NULL, 13, 941, NULL, 'Recursive CTE (%s) must be an UNION', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('dsql_cte_nonrecurs_after_recurs', 'pass1_recursive_cte', 'dsql.cpp', NULL, 13, 942, NULL, 'CTE ''%s'' defined non-recursive member after recursive', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('dsql_cte_wrong_clause', 'pass1_recursive_cte', 'dsql.cpp', NULL, 13, 943, NULL, 'Recursive member of CTE ''%s'' have %s clause', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('dsql_cte_union_all', 'pass1_recursive_cte', 'dsql.cpp', NULL, 13, 944, NULL, 'Recursive members of CTE (%s) must be linked with another members via UNION ALL', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('dsql_cte_miss_nonrecursive', 'pass1_recursive_cte', 'dsql.cpp', NULL, 13, 945, NULL, 'Non-recursive member is missing in CTE ''%s''', NULL, NULL);
INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('dsql_cte_nested_with', 'dsql_req::addCTEs', 'dsql.cpp', NULL, 13, 946, NULL, 'WITH clause can''t be nested', NULL, NULL);
COMMIT WORK;

View File

@ -792,5 +792,15 @@ INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE,
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-104, NULL, NULL, 936, 13, NULL, 'dsql_auto_field_bad_pos', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (0, NULL, NULL, 555, 0, NULL, 'bad_debug_format', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-901, NULL, NULL, 556, 0, NULL, 'bad_proc_BLR', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-104, NULL, NULL, 937, 13, NULL, 'dsql_cte_wrong_reference', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-104, NULL, NULL, 938, 13, NULL, 'dsql_cte_cycle', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-104, NULL, NULL, 939, 13, NULL, 'dsql_cte_outer_join', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-104, NULL, NULL, 940, 13, NULL, 'dsql_cte_mult_references', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-104, NULL, NULL, 941, 13, NULL, 'dsql_cte_not_a_union', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-104, NULL, NULL, 942, 13, NULL, 'dsql_cte_nonrecurs_after_recurs', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-104, NULL, NULL, 943, 13, NULL, 'dsql_cte_wrong_clause', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-104, NULL, NULL, 944, 13, NULL, 'dsql_cte_union_all', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-104, NULL, NULL, 945, 13, NULL, 'dsql_cte_miss_nonrecursive', NULL, NULL);
INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-104, NULL, NULL, 946, 13, NULL, 'dsql_cte_nested_with', NULL, NULL);
COMMIT WORK;