Fixed one more case when type of field, used in the index, was ALTERed

Author: AlexPeshkoff

src/jrd/Relation.h

@@ -496,7 +496,7 @@ class IndexPermanent : public Firebird::PermanentStorage
 	RelationPermanent*	idp_relation;
 	MetaId				idp_id;
 	TraNumber			idp_tranum = 0;
-	UCHAR				idp_state = 0;		// Makes sense only for expression/conditional indices
+	UCHAR				idp_state = 0;		// Makes limited sense for segmented indices
 	UCHAR				idp_formatNumber = 0;
 
 	[[noreturn]] void errIndexGone();
@@ -523,11 +523,6 @@ class IndexPermanent : public Firebird::PermanentStorage
 		idp_state = state;
 	}
 
-	UCHAR getState() const noexcept
-	{
-		return idp_state;
-	}
-
 	UCHAR getFormat() const noexcept
 	{
 		return idp_formatNumber;

src/jrd/btr.cpp

@@ -696,8 +696,9 @@ idx_e IndexKey::compose(Record* record, bool skipNewFormat)
 
 	if (skipNewFormat)
 	{
-		auto* idp = m_relation->getPermanent()->lookupIndex(m_tdbb, m_index->idx_id, CacheFlag::AUTOCREATE);
-		if (idp && (idp->getState() == Ods::irt_drop) && idp->getFormat() &&
+		auto* idp = m_relation->getPermanent()->lookupIndex(m_tdbb, m_index->idx_id,
+			CacheFlag::AUTOCREATE | CacheFlag::ERASED);
+		if (idp && (m_index->idx_state == Ods::irt_drop) && idp->getFormat() &&
 			(record->getFormat()->fmt_version > idp->getFormat()))
 		{
 			// tried to insert fresh formatted record into old index - skip this