8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 18:43:03 +01:00
This commit is contained in:
asfernandes 2006-10-31 14:23:31 +00:00
parent 442f740bca
commit 88a9a84a01
6 changed files with 19 additions and 15 deletions

View File

@ -24,7 +24,6 @@
* Contributor(s): ______________________________________.
*
*
* $Id: vector.h,v 1.16 2006-10-31 11:24:02 alexpeshkoff Exp $
*
*/

View File

@ -409,8 +409,8 @@ public:
req_cursors(p),
req_curr_ctes(p),
req_ctes(p),
req_cte_aliases(p),
req_debug_data(p) { }
req_debug_data(p),
req_cte_aliases(p) { }
dsql_req* req_parent; //!< Source request, if cursor update
dsql_req* req_sibling; //!< Next sibling request, if cursor update

View File

@ -1238,11 +1238,11 @@ void GEN_statement( dsql_req* request, dsql_nod* node)
case nod_src_info:
request->put_debug_src_info(node->nod_line, node->nod_column);
/*
/*
stuff(request, blr_src_info);
stuff_word(request, node->nod_line);
stuff_word(request, node->nod_column);
*/
*/
return;
default:

View File

@ -1952,10 +1952,10 @@ void DYN_modify_trigger( Global* gbl, const UCHAR** ptr)
X.RDB$DESCRIPTION.NULL = TRUE;
break;
case isc_dyn_debug_info:
debug_info_ptr = *ptr;
DYN_skip_blr_blob(ptr);
break;
case isc_dyn_debug_info:
debug_info_ptr = *ptr;
DYN_skip_blr_blob(ptr);
break;
default:
--(*ptr);

View File

@ -1368,11 +1368,13 @@ void MET_load_trigger(thread_db* tdbb,
if (ENCODE_ODS(dbb->dbb_ods_version, dbb->dbb_minor_original) >= ODS_11_1)
{
jrd_req* debug_info_req = CMP_find_request(tdbb, irq_l_trg_dbg, IRQ_REQUESTS);
FOR(REQUEST_HANDLE debug_info_req)
TRG IN RDB$TRIGGERS WITH TRG.RDB$RELATION_NAME = relation->rel_name.c_str() AND
TRG.RDB$TRIGGER_NAME EQ trigger_name.c_str() AND
TRG.RDB$TRIGGER_TYPE > 0 AND
TRG.RDB$TRIGGER_TYPE < TRIGGER_COMBINED_MAX
TRG IN RDB$TRIGGERS
WITH TRG.RDB$RELATION_NAME EQ relation->rel_name.c_str() AND
TRG.RDB$TRIGGER_NAME EQ trigger_name.c_str() AND
TRG.RDB$TRIGGER_TYPE > 0 AND
TRG.RDB$TRIGGER_TYPE < TRIGGER_COMBINED_MAX
if (!REQUEST(irq_l_trg_dbg))
REQUEST(irq_l_trg_dbg) = debug_info_req;
@ -1380,6 +1382,9 @@ void MET_load_trigger(thread_db* tdbb,
if (TRG.RDB$DEBUG_INFO.NULL == FALSE)
debug_blob_id = TRG.RDB$DEBUG_INFO;
END_FOR;
if (!REQUEST(irq_l_trg_dbg))
REQUEST(irq_l_trg_dbg) = debug_info_req;
}
// Scan RDB$TRIGGERS next

View File

@ -2998,12 +2998,12 @@ static jrd_nod* parse(thread_db* tdbb, CompilerScratch* csb, USHORT expected,
node->nod_arg[e_seek_offset] = parse(tdbb, csb, VALUE);
break;
#endif
/*
/*
case blr_src_info:
node->nod_arg[0] = (jrd_nod*) (IPTR) BLR_WORD;
node->nod_arg[1] = (jrd_nod*) (IPTR) BLR_WORD;
break;
*/
*/
default:
syntax_error(csb, elements[expected]);
}