Fixed bug CORE-6532 : Results of сoncatenation with blob has no info about collation of source columns (which are declared with such info)

hvlad · hvlad · commit 9370c98222aa · 2021-04-03T08:44:34.000+03:00
diff --git a/src/jrd/DataTypeUtil.cpp b/src/jrd/DataTypeUtil.cpp
@@ -287,7 +287,7 @@ void DataTypeUtilBase::makeConcatenate(dsc* result, const dsc* value1, const dsc
 		result->dsc_length = length + static_cast<USHORT>(sizeof(USHORT));
 	}
 
-	result->dsc_flags = (value1->dsc_flags | value2->dsc_flags) & DSC_nullable;
+	result->setNullable(value1->isNullable() || value2->isNullable());
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ void DataTypeUtilBase::makeConcatenate(dsc* result, const dsc* value1, const dsc`
`287`	`287`	`result->dsc_length = length + static_cast<USHORT>(sizeof(USHORT));`
`288`	`288`	`}`
`289`	`289`
`290`		`- result->dsc_flags = (value1->dsc_flags \| value2->dsc_flags) & DSC_nullable;`
	`290`	`+ result->setNullable(value1->isNullable() \|\| value2->isNullable());`
`291`	`291`	`}`
`292`	`292`
`293`	`293`