Fixed case-insensitive behavior in CONTAINING

Author: AlexPeshkoff

src/common/dsc.h

@@ -106,9 +106,10 @@ typedef struct dsc
 	UCHAR*	dsc_address = nullptr; // Used either as offset in a message or as a pointer
 
 #ifdef __cplusplus
-	SSHORT dsc_blob_ttype() const noexcept { return dsc_scale | (dsc_flags & 0xFF00);}
-	SSHORT& dsc_ttype() noexcept { return dsc_sub_type;}
-	SSHORT dsc_ttype() const noexcept { return dsc_sub_type;}
+	TTypeId dsc_blob_ttype() const noexcept
+	{
+		return TTypeId(dsc_scale | (dsc_flags & 0xFF00));
+	}
 
 	bool isNullable() const noexcept
 	{

src/dsql/BoolNodes.cpp

@@ -891,11 +891,19 @@ TriState ComparativeBoolNode::stringBoolean(thread_db* tdbb, Request* request,
 {
 	SET_TDBB(tdbb);
 
-	TTypeId type1 = desc1->getTextType();
+	TTypeId type1;
 
-	// No MATCHES support for blob
-	if (desc1->isBlob() && (blrOp == blr_matching))
-		return TriState(false);
+	if (!desc1->isBlob())
+		type1 = desc1->getTextType();
+	else
+	{
+		// No MATCHES support for blob
+		if (blrOp == blr_matching)
+			return TriState(false);
+
+		// Non-text blob is treated here as NONE, not OCTETS
+		type1 = desc1->dsc_sub_type == isc_blob_text ? desc1->dsc_blob_ttype() : ttype_none;
+	}
 
 	Collation* obj = INTL_texttype_lookup(tdbb, type1);
 	CharSet* charset = obj->getCharSet();

src/jrd/optimizer/Optimizer.cpp

@@ -1508,7 +1508,7 @@ void Optimizer::generateAggregateSort(AggNode* aggNode)
 
 		if (sortKey->skd_dtype == SKD_varying || sortKey->skd_dtype == SKD_cstring)
 		{
-			if (desc->dsc_ttype() == ttype_binary)
+			if (desc->getTextType() == ttype_binary)
 				sortKey->skd_flags |= SKD_binary;
 		}