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

Fixed CORE-1097 : isc_dsql_set_cursor_name() fails

Browse Source
This commit is contained in:
hvlad 2007-01-17 20:06:17 +00:00
parent 599947a743
commit cba92d53f3
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/remote/interface.cpp
View File

@ -2371,13 +2371,6 @@ ISC_STATUS GDS_DSQL_SET_CURSOR(ISC_STATUS* user_status,
return unsupported(user_status);
}
/* set up the packet for the other guy... */
PACKET* packet = &rdb->rdb_packet;
packet->p_operation = op_set_cursor;
P_SQLCUR* sqlcur = &packet->p_sqlcur;
sqlcur->p_sqlcur_statement = statement->rsr_id;
if (!cursor)
{
/** Return CURSOR unknown error **/
@ -2385,12 +2378,42 @@ ISC_STATUS GDS_DSQL_SET_CURSOR(ISC_STATUS* user_status,
return error(user_status);
}
/* set up the packet for the other guy... */
PACKET* packet = &rdb->rdb_packet;
if (statement->rsr_flags & RSR_lazy) {
packet->p_operation = op_allocate_statement;
packet->p_rlse.p_rlse_object = rdb->rdb_id;
if (!send_partial_packet(rdb->rdb_port, packet, user_status))
return error(user_status);
}
packet->p_operation = op_set_cursor;
P_SQLCUR* sqlcur = &packet->p_sqlcur;
sqlcur->p_sqlcur_statement = statement->rsr_id;
const USHORT name_l = strlen(cursor);
sqlcur->p_sqlcur_cursor_name.cstr_length = name_l + 1;
sqlcur->p_sqlcur_cursor_name.cstr_address = (UCHAR *) cursor; // const cast
sqlcur->p_sqlcur_type = type;
if (send_and_receive(rdb, packet, user_status)) {
if (!send_packet(rdb->rdb_port, packet, user_status)) {
return error(user_status);
}
if (statement->rsr_flags & RSR_lazy) {
if (!receive_response(rdb, packet))
return error(user_status);
statement->rsr_id = packet->p_resp.p_resp_object;
SET_OBJECT(rdb, statement, statement->rsr_id);
statement->rsr_flags &= ~RSR_lazy;
}
if (!receive_response(rdb, packet)) {
return error(user_status);
}
}