diff --git a/src/dsql/DdlNodes.epp b/src/dsql/DdlNodes.epp index 9843691325..467e153758 100644 --- a/src/dsql/DdlNodes.epp +++ b/src/dsql/DdlNodes.epp @@ -4630,7 +4630,7 @@ void RelationNode::FieldDefinition::modify(thread_db* tdbb, jrd_tra* transaction fieldPos = position.value; else { - DYN_UTIL_generate_field_position(tdbb, NULL, name, &fieldPos); + DYN_UTIL_generate_field_position(tdbb, NULL, relationName, &fieldPos); if (fieldPos >= 0) ++fieldPos; } @@ -4728,7 +4728,7 @@ void RelationNode::FieldDefinition::store(thread_db* tdbb, jrd_tra* transaction) fieldPos = position.value; else { - DYN_UTIL_generate_field_position(tdbb, NULL, name, &fieldPos); + DYN_UTIL_generate_field_position(tdbb, NULL, relationName, &fieldPos); if (fieldPos >= 0) ++fieldPos; } diff --git a/src/dsql/DdlNodes.h b/src/dsql/DdlNodes.h index 882b92d08a..a8c1be3738 100644 --- a/src/dsql/DdlNodes.h +++ b/src/dsql/DdlNodes.h @@ -978,8 +978,8 @@ public: descending(false), refRelation(p), refColumns(p), - refUpdateAction(RI_ACTION_NONE), - refDeleteAction(RI_ACTION_NONE), + refUpdateAction(RI_RESTRICT), + refDeleteAction(RI_RESTRICT), triggers(p), blrWritersHolder(p) {