make.cpp (Firebird-3.0.2.32703-0.tar.bz2) | : | make.cpp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 251 | skipping to change at line 251 | |||
DEV_BLKCHK(field, dsql_type_fld); | DEV_BLKCHK(field, dsql_type_fld); | |||
desc->clear(); | desc->clear(); | |||
desc->dsc_dtype = static_cast<UCHAR>(field->dtype); | desc->dsc_dtype = static_cast<UCHAR>(field->dtype); | |||
desc->dsc_scale = static_cast<SCHAR>(field->scale); | desc->dsc_scale = static_cast<SCHAR>(field->scale); | |||
desc->dsc_sub_type = field->subType; | desc->dsc_sub_type = field->subType; | |||
desc->dsc_length = field->length; | desc->dsc_length = field->length; | |||
desc->dsc_flags = (field->flags & FLD_nullable) ? DSC_nullable : 0; | desc->dsc_flags = (field->flags & FLD_nullable) ? DSC_nullable : 0; | |||
if (desc->isText() || desc->isBlob()) | if (desc->isText() || desc->isBlob()) | |||
desc->setTextType(INTL_CS_COLL_TO_TTYPE(field->charSetId, field-> collationId)); | desc->setTextType(INTL_CS_COLL_TO_TTYPE(field->charSetId.value, f ield->collationId)); | |||
// UNICODE_FSS_HACK | // UNICODE_FSS_HACK | |||
// check if the field is a system domain and CHARACTER SET is UNICODE_FSS | // check if the field is a system domain and CHARACTER SET is UNICODE_FSS | |||
if (desc->isText() && (INTL_GET_CHARSET(desc) == CS_UNICODE_FSS) && (fiel d->flags & FLD_system)) | if (desc->isText() && (INTL_GET_CHARSET(desc) == CS_UNICODE_FSS) && (fiel d->flags & FLD_system)) | |||
DataTypeUtilBase::adjustSysFieldLength(desc); | DataTypeUtilBase::adjustSysFieldLength(desc); | |||
} | } | |||
/** | /** | |||
MAKE_desc_from_list | MAKE_desc_from_list | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |