More problematic cases of CORE-1798 - thanks to Dmitry

FirebirdSQL · Mar 21, 2008 · 21a1365 · 21a1365
1 parent d0fe52f
commit 21a1365
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/dsql/pass1.cpp b/src/dsql/pass1.cpp
@@ -4052,6 +4052,9 @@ static dsql_nod* pass1_dbkey( dsql_req* request, dsql_nod* input)
 						  0);
 			}
 
+			if (context->ctx_flags & CTX_null)
+				return MAKE_node(nod_null, 0);
+
 			dsql_nod* node = MAKE_node(nod_dbkey, 1);
 			dsql_nod* rel_node = MAKE_node(nod_relation, e_rel_count);
 			rel_node->nod_arg[0] = (dsql_nod*) context;
@@ -4081,6 +4084,9 @@ static dsql_nod* pass1_dbkey( dsql_req* request, dsql_nod* input)
 						  0);
 			}
 
+			if (context->ctx_flags & CTX_null)
+				return MAKE_node(nod_null, 0);
+
 			dsql_nod* node = MAKE_node(nod_dbkey, 1);
 			dsql_nod* rel_node = MAKE_node(nod_relation, e_rel_count);
 			rel_node->nod_arg[0] = (dsql_nod*) context;

diff --git a/src/jrd/exe.cpp b/src/jrd/exe.cpp
@@ -2989,6 +2989,9 @@ static jrd_nod* modify(thread_db* tdbb, jrd_nod* node, SSHORT which_trig)
 				}
 			}
 
+			new_rpb->rpb_number = org_rpb->rpb_number;
+			new_rpb->rpb_number.setValid(true);
+
 			jrd_req* trigger;
 			if (relation->rel_post_modify &&
 				which_trig != PRE_TRIG &&