paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-21 11:49:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed ODBC-Widestring fields

Browse Source 
git-svn-id: trunk@13118 -
This commit is contained in:
joost 2009-05-09 14:55:22 +00:00
parent be72be8c8e
commit 1ce9d05b78
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,10 +695,9 @@ begin
// Note: optionally we can implement the use of SQLBindCol later for even more speed // Note: optionally we can implement the use of SQLBindCol later for even more speed
// TODO: finish this // TODO: finish this
case FieldDef.DataType of case FieldDef.DataType of
{$IF (FPC_VERSION>=2) AND (FPC_RELEASE>=1)} ftWideString,ftFixedWideChar: // mapped to TWideStringField
ftGuid,ftWideString,ftFixedWideChar, Res:=SQLGetData(ODBCCursor.FSTMTHandle, FieldDef.Index+1, SQL_C_WCHAR, buffer, FieldDef.Size, @StrLenOrInd);
{$ENDIF} ftGuid, ftFixedChar,ftString: // are mapped to a TStringField (including TGuidField)
ftFixedChar,ftString: // are mapped to a TStringField (including TGuidField, TWideStringField)
Res:=SQLGetData(ODBCCursor.FSTMTHandle, FieldDef.Index+1, SQL_C_CHAR, buffer, FieldDef.Size, @StrLenOrInd); Res:=SQLGetData(ODBCCursor.FSTMTHandle, FieldDef.Index+1, SQL_C_CHAR, buffer, FieldDef.Size, @StrLenOrInd);
ftSmallint: // mapped to TSmallintField ftSmallint: // mapped to TSmallintField
Res:=SQLGetData(ODBCCursor.FSTMTHandle, FieldDef.Index+1, SQL_C_SSHORT, buffer, SizeOf(Smallint), @StrLenOrInd); Res:=SQLGetData(ODBCCursor.FSTMTHandle, FieldDef.Index+1, SQL_C_SSHORT, buffer, SizeOf(Smallint), @StrLenOrInd);
@ -987,8 +986,8 @@ begin
SQL_VARCHAR: begin FieldType:=ftString; FieldSize:=ColumnSize+1; end; SQL_VARCHAR: begin FieldType:=ftString; FieldSize:=ColumnSize+1; end;
SQL_LONGVARCHAR: begin FieldType:=ftMemo; FieldSize:=BLOB_BUF_SIZE; end; // is a blob SQL_LONGVARCHAR: begin FieldType:=ftMemo; FieldSize:=BLOB_BUF_SIZE; end; // is a blob
{$IF (FPC_VERSION>=2) AND (FPC_RELEASE>=1)} {$IF (FPC_VERSION>=2) AND (FPC_RELEASE>=1)}
SQL_WCHAR: begin FieldType:=ftWideString; FieldSize:=ColumnSize+1; end; // NB if TFieldDef.Size should be nr. of characters, then we should change this SQL_WCHAR: begin FieldType:=ftFixedWideChar; FieldSize:=(ColumnSize+1)*sizeof(Widechar); end;
SQL_WVARCHAR: begin FieldType:=ftWideString; FieldSize:=ColumnSize+1; end; SQL_WVARCHAR: begin FieldType:=ftWideString; FieldSize:=(ColumnSize+1)*sizeof(Widechar); end;
SQL_WLONGVARCHAR: begin FieldType:=ftWideMemo; FieldSize:=BLOB_BUF_SIZE; end; // is a blob SQL_WLONGVARCHAR: begin FieldType:=ftWideMemo; FieldSize:=BLOB_BUF_SIZE; end; // is a blob
{$ENDIF} {$ENDIF}
SQL_DECIMAL: begin FieldType:=ftFloat; FieldSize:=0; end; SQL_DECIMAL: begin FieldType:=ftFloat; FieldSize:=0; end;

1
packages/odbc/src/odbcsql.inc
View File

@ -184,6 +184,7 @@ const
{ C datatype to SQL datatype mapping } { C datatype to SQL datatype mapping }
SQL_C_CHAR = SQL_CHAR; SQL_C_CHAR = SQL_CHAR;
SQL_C_WCHAR = SQL_WCHAR;
SQL_C_LONG = SQL_INTEGER; SQL_C_LONG = SQL_INTEGER;
SQL_C_SHORT = SQL_SMALLINT; SQL_C_SHORT = SQL_SMALLINT;
SQL_C_FLOAT = SQL_REAL; SQL_C_FLOAT = SQL_REAL;