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

Fixed bug #7128 : Incorrect error message with isc_sql_interprete()

Browse Source
This commit is contained in:
Vlad Khorsun 2022-02-18 14:52:24 +02:00
parent cb94c72cbf
commit 2c201048d5
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/msgs/system_errors2.sql
View File

@ -846,7 +846,7 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA
(-502, '24', '000', 7, 20, 'dsql_cursor_exists', NULL, NULL)
(-502, '34', '000', 7, 21, 'dsql_cursor_rel_ambiguous', NULL, NULL)
(-502, '34', '000', 7, 22, 'dsql_cursor_rel_not_found', NULL, NULL)
(-502, '24', '000', 7, 23, 'dsql_cursor_not_open', NULL, NULL)
(-504, '24', '000', 7, 23, 'dsql_cursor_not_open', NULL, NULL)
(-607, 'HY', '004', 7, 24, 'dsql_type_not_supp_ext_tab', NULL, NULL)
(-804, '0A', '000', 7, 25, 'dsql_feature_not_supported_ods', NULL, NULL)
(-660, '22', '000', 7, 26, 'primary_key_required', NULL, NULL)

6
src/remote/server/server.cpp
View File

@ -3454,7 +3454,8 @@ ISC_STATUS rem_port::execute_statement(P_OP op, P_SQLDATA* sqldata, PACKET* send
if (statement->rsr_cursor)
{
Arg::Gds(isc_dsql_cursor_open_err).raise();
(Arg::Gds(isc_sqlerr) << Arg::Num(-502) <<
Arg::Gds(isc_dsql_cursor_open_err)).raise();
}
InternalMessageBuffer iMsgBuffer(sqldata->p_sqldata_blr.cstr_length,
@ -3570,7 +3571,8 @@ ISC_STATUS rem_port::fetch(P_SQLDATA * sqldata, PACKET* sendL)
sqldata->p_sqldata_blr.cstr_address, msg_length, NULL);
if (!msgBuffer.metadata)
Arg::Gds(isc_dsql_cursor_open_err).raise();
(Arg::Gds(isc_sqlerr) << Arg::Num(-502) <<
Arg::Gds(isc_dsql_cursor_open_err)).raise();
statement->rsr_cursor->setDelayedOutputFormat(&status_vector, msgBuffer.metadata);
check(&status_vector);

7
src/yvalve/why.cpp
View File

@ -1221,13 +1221,16 @@ namespace Why
void checkCursorOpened() const
{
if (!statement || !statement->cursor)
Arg::Gds(isc_dsql_cursor_not_open).raise();
(Arg::Gds(isc_sqlerr) << Arg::Num(-504) <<
Arg::Gds(isc_dsql_cursor_err) <<
Arg::Gds(isc_dsql_cursor_not_open)).raise();
}
void checkCursorClosed() const
{
if (statement && statement->cursor)
Arg::Gds(isc_dsql_cursor_open_err).raise();
(Arg::Gds(isc_sqlerr) << Arg::Num(-502) <<
Arg::Gds(isc_dsql_cursor_open_err)).raise();
}
AtomicAttPtr attachment;