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

Cleanup

Browse Source
This commit is contained in:
alexpeshkoff 2007-12-08 13:39:29 +00:00
parent 1ab05933c6
commit 5b2e8c3997
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jrd/execute_statement.cpp
View File

@ -198,7 +198,7 @@ err_handler:
} }
} }
bool ExecuteStatement::Fetch(thread_db* tdbb, jrd_nod** JrdVar) bool ExecuteStatement::Fetch(thread_db* tdbb, jrd_nod** jrdVar)
{ {
// If already bugged - we should never get here // If already bugged - we should never get here
fb_assert(! (tdbb->tdbb_status_vector[0] == 1 && fb_assert(! (tdbb->tdbb_status_vector[0] == 1 &&
@ -229,11 +229,10 @@ bool ExecuteStatement::Fetch(thread_db* tdbb, jrd_nod** JrdVar)
} }
const XSQLVAR *var = Sqlda->sqlvar; const XSQLVAR *var = Sqlda->sqlvar;
for (int i = 0; i < Sqlda->sqld; i++, var++, JrdVar++) { for (int i = 0; i < Sqlda->sqld; i++, var++) {
dsc* d = EVL_assign_to(tdbb, *JrdVar); dsc* d = EVL_assign_to(tdbb, jrdVar[i]);
if (d->dsc_dtype >= FB_NELEM(sqlType)) if (d->dsc_dtype >= FB_NELEM(sqlType) || sqlType[d->dsc_dtype] < 0)
{ {
rec_err:
tdbb->tdbb_status_vector[0] = isc_arg_gds; tdbb->tdbb_status_vector[0] = isc_arg_gds;
tdbb->tdbb_status_vector[1] = isc_exec_sql_invalid_var; tdbb->tdbb_status_vector[1] = isc_exec_sql_invalid_var;
tdbb->tdbb_status_vector[2] = isc_arg_number; tdbb->tdbb_status_vector[2] = isc_arg_number;
@ -245,9 +244,6 @@ rec_err:
Firebird::status_exception::raise(tdbb->tdbb_status_vector); Firebird::status_exception::raise(tdbb->tdbb_status_vector);
} }
if (sqlType[d->dsc_dtype] < 0)
goto rec_err;
// build the src descriptor // build the src descriptor
dsc src; dsc src;
src.clear(); src.clear();
@ -261,7 +257,7 @@ rec_err:
src.dsc_length += sizeof(SSHORT); src.dsc_length += sizeof(SSHORT);
// and assign to the target // and assign to the target
EXE_assignment(tdbb, *JrdVar, &src, (var->sqltype & 1) && (*var->sqlind < 0), NULL, NULL); EXE_assignment(tdbb, jrdVar[i], &src, (var->sqltype & 1) && (*var->sqlind < 0), NULL, NULL);
} }
if (SingleMode) { if (SingleMode) {