More complete fix for CORE-1451

FirebirdSQL · Sep 27, 2007 · d51c478 · d51c478
1 parent d7e5bc6
commit d51c478
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/dsql/pass1.cpp b/src/dsql/pass1.cpp
@@ -4014,6 +4014,13 @@ static dsql_nod* pass1_dbkey( dsql_req* request, dsql_nod* input)
 				continue;
 			}
 
+			if (!context->ctx_relation)
+			{
+				ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) -607,
+						  isc_arg_gds, isc_dsql_dbkey_from_non_table,
+						  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;