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 e3d20a97075b · 2021-04-03T08:43:38.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
@@ -394,6 +394,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
`@@ -394,6 +394,12 @@ void defineComputed(DsqlCompilerScratch* dsqlScratch, RelationSourceNode* relati`
`394`	`394`	`const USHORT bpc = METD_get_charset_bpc(dsqlScratch->getTransaction(), field->charSetId.value);`
`395`	`395`	`field->charLength = (field->length - adjust) / bpc;`
`396`	`396`	`}`
	`397`	`+ else if (field->dtype == dtype_blob)`
	`398`	`+ {`
	`399`	`+ field->charSetId = desc.getCharSet();`
	`400`	`+ field->collationId = desc.getCollation();`
	`401`	`+ field->subType = desc.getBlobSubType();`
	`402`	`+ }`
`397`	`403`	`else`
`398`	`404`	`field->subType = desc.dsc_sub_type;`
`399`	`405`	`}`