ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/runtime/IBCustomDataSet.pas
(Generate patch)

Comparing ibx/trunk/runtime/IBCustomDataSet.pas (file contents):
Revision 58 by tony, Sat Mar 11 11:14:14 2017 UTC vs.
Revision 60 by tony, Mon Mar 27 15:21:02 2017 UTC

# Line 3819 | Line 3819 | begin
3819             their values }
3820            SQL_VARYING, SQL_TEXT:
3821            begin
3822 <            FirebirdAPI.CharSetWidth(getCharSetID,CharSetSize);
3823 <            CharSetName := FirebirdAPI.GetCharsetName(getCharSetID);
3824 <            FirebirdAPI.CharSetID2CodePage(getCharSetID,FieldCodePage);
3822 >            if not Database.Attachment.CharSetWidth(getCharSetID,CharSetSize) then
3823 >              CharSetSize := 1;
3824 >            CharSetName := Database.Attachment.GetCharsetName(getCharSetID);
3825 >            Database.Attachment.CharSetID2CodePage(getCharSetID,FieldCodePage);
3826              FieldSize := GetSize div CharSetSize;
3827              FieldType := ftString;
3828            end;
# Line 3883 | Line 3884 | begin
3884              FieldSize := sizeof (TISC_QUAD);
3885              if (getSubtype = 1) then
3886              begin
3887 <              FirebirdAPI.CharSetWidth(getCharSetID,CharSetSize);
3888 <              CharSetName := FirebirdAPI.GetCharsetName(getCharSetID);
3889 <              FirebirdAPI.CharSetID2CodePage(getCharSetID,FieldCodePage);
3887 >              if not Database.Attachment.CharSetWidth(getCharSetID,CharSetSize) then
3888 >                CharSetSize := 1;
3889 >              CharSetName := Database.Attachment.GetCharsetName(getCharSetID);
3890 >              Database.Attachment.CharSetID2CodePage(getCharSetID,FieldCodePage);
3891                FieldType := ftMemo;
3892              end
3893              else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines