paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-07 19:50:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

odbc: fix international column names

Browse Source 
git-svn-id: trunk@43881 -
This commit is contained in:
ondrej 2020-01-07 09:41:20 +00:00
parent df6cf6637d
commit 166847c7c7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/fcl-db/src/sqldb/odbc/odbcconn.pas
View File

@ -925,7 +925,7 @@ var
i:integer;
ColNameLength,TypeNameLength,DataType,DecimalDigits,Nullable:SQLSMALLINT;
ColumnSize:SQLULEN;
ColName,TypeName:string;
ColName,TypeName:RawByteString;
FieldType:TFieldType;
FieldSize:word;
AutoIncAttr, FixedPrecScale, Unsigned, Updatable: SQLLEN;
@ -974,6 +974,9 @@ begin
SQL_HANDLE_STMT, ODBCCursor.FSTMTHandle, 'Could not get column name for column %d.',[i]
);
end;
// ColName is received in ANSI - convert to DefaultSystemCodePage
SetCodePage(ColName, CodePage, False);
SetCodePage(ColName, DefaultSystemCodePage, True);
// convert type
// NOTE: I made some guesses here after I found only limited information about TFieldType; please report any problems
@ -1127,6 +1130,9 @@ begin
SQL_HANDLE_STMT, ODBCCursor.FSTMTHandle, 'Could not get datasource dependent type name for column %s.',[ColName]
);
end;
// TypeName is received in ANSI - convert to DefaultSystemCodePage
SetCodePage(TypeName, CodePage, False);
SetCodePage(TypeName, DefaultSystemCodePage, True);
DatabaseErrorFmt('Column %s has an unknown or unsupported column type. Datasource dependent type name: %s. ODBC SQL data type code: %d.', [ColName, TypeName, DataType]);
end;

1
packages/fcl-db/src/sqldb/sqldb.pp
View File

@ -268,6 +268,7 @@ type
Property Statements : TThreadList Read FStatements;
property Port: cardinal read GetPort write SetPort;
property CodePage: TSystemCodePage read FCodePage;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;