Fixed bug CORE-6531 : COMPUTED BY column looses charset and collate of source field <F> when <F> is either of type BLOB or VARCHAR casted to BLOB.

hvlad · hvlad · commit 572c7332764b · 2021-04-03T08:47:08.000+03:00
Note: existing computed by columns should be recreated (or altered to the same expression) to fix wrong data at system catalog.
diff --git a/src/dsql/DdlNodes.epp b/src/dsql/DdlNodes.epp
@@ -399,6 +399,12 @@ void defineComputed(DsqlCompilerScratch* dsqlScratch, RelationSourceNode* relati
 			const USHORT bpc = METD_get_charset_bpc(dsqlScratch->getTransaction(), field->charSetId.value);
 			field->charLength = (field->length - adjust) / bpc;
 		}
+		else if (field->dtype == dtype_blob)
+		{
+			field->charSetId = desc.getCharSet();
+			field->collationId = desc.getCollation();
+			field->subType = desc.getBlobSubType();
+		}
 		else
 			field->subType = desc.dsc_sub_type;
 	}

Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,12 @@ void defineComputed(DsqlCompilerScratch* dsqlScratch, RelationSourceNode* relati`
`399`	`399`	`const USHORT bpc = METD_get_charset_bpc(dsqlScratch->getTransaction(), field->charSetId.value);`
`400`	`400`	`field->charLength = (field->length - adjust) / bpc;`
`401`	`401`	`}`
	`402`	`+ else if (field->dtype == dtype_blob)`
	`403`	`+ {`
	`404`	`+ field->charSetId = desc.getCharSet();`
	`405`	`+ field->collationId = desc.getCollation();`
	`406`	`+ field->subType = desc.getBlobSubType();`
	`407`	`+ }`
`402`	`408`	`else`
`403`	`409`	`field->subType = desc.dsc_sub_type;`
`404`	`410`	`}`