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

* Fix compilation after Lacos changes to TFieldType

Browse Source 
git-svn-id: trunk@47223 -
(cherry picked from commit 7f6d0fec96)
This commit is contained in:
michael 2020-10-27 14:27:49 +00:00 committed by florian
parent 746f1ffcc8
commit be620090ad
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/fcl-sdo/src/das/sdo_das_utils.pas
View File

@ -58,10 +58,14 @@ const
//ftOraTimeStamp, ftOraInterval //ftOraTimeStamp, ftOraInterval
{$IFEND } {$IFEND }
{$IF Declared(ftLongWord)} {$IF Declared(ftLongWord)}
, StringType, StringType, StringType, StringType, StringType, StringType, StringType, , StringType, StringType, StringType, StringType
//ftLongWord, ftShortint, ftByte, ftExtended, ftConnection, ftParams, ftStream, //ftLongWord, ftShortint, ftByte, ftExtended,
{$IFNDEF FPC}
, StringType, StringType, StringType,
// ftConnection, ftParams, ftStream,
StringType, StringType, StringType StringType, StringType, StringType
//ftTimeStampOffset, ftObject, ftSingle //ftTimeStampOffset, ftObject, ftSingle
{$ENDIF}
{$IFEND } {$IFEND }
); );

9
packages/fcl-web/src/restbridge/sqldbrestschema.pp
View File

@ -1220,13 +1220,14 @@ class function TSQLDBRestResource.FieldTypeToRestFieldType(
Const Const
Map : Array[TFieldType] of TRestFieldType = Map : Array[TFieldType] of TRestFieldType =
(rftUnknown, rftString, rftInteger, rftInteger, rftInteger, // ftUnknown, ftString, ftSmallint, ftInteger, ftWord, (rftUnknown, rftString, rftInteger, rftInteger, rftInteger, // ftUnknown, ftString, ftSmallint, ftInteger, ftWord,
rftBoolean, rftFloat, rftFloat, rftFloat, rftDate, rftTime, rftDateTime, // ftBoolean, ftFloat, ftCurrency, ftBCD, ftDate, ftTime, ftDateTime, rftBoolean, rftFloat, rftFloat, rftFloat, rftDate, rftTime, rftDateTime, // ftBoolean, ftFloat, ftCurrency, ftBCD, ftDate, ftTime, ftDateTime,
rftBlob, rftBlob, rftInteger, rftBlob, rftString, rftUnknown, rftString, // ftBytes, ftVarBytes, ftAutoInc, ftBlob, ftMemo, ftGraphic, ftFmtMemo, rftBlob, rftBlob, rftInteger, rftBlob, rftString, rftUnknown, rftString, // ftBytes, ftVarBytes, ftAutoInc, ftBlob, ftMemo, ftGraphic, ftFmtMemo,
rftUnknown, rftUnknown, rftUnknown, rftUnknown, rftString, // ftParadoxOle, ftDBaseOle, ftTypedBinary, ftCursor, ftFixedChar, rftUnknown, rftUnknown, rftUnknown, rftUnknown, rftString, // ftParadoxOle, ftDBaseOle, ftTypedBinary, ftCursor, ftFixedChar,
rftString, rftLargeInt, rftUnknown, rftUnknown, rftUnknown, // ftWideString, ftLargeint, ftADT, ftArray, ftReference, rftString, rftLargeInt, rftUnknown, rftUnknown, rftUnknown, // ftWideString, ftLargeint, ftADT, ftArray, ftReference,
rftUnknown, rftBlob, rftBlob, rftUnknown, rftUnknown, // ftDataSet, ftOraBlob, ftOraClob, ftVariant, ftInterface, rftUnknown, rftBlob, rftBlob, rftUnknown, rftUnknown, // ftDataSet, ftOraBlob, ftOraClob, ftVariant, ftInterface,
rftUnknown, rftString, rftDateTime, rftFloat, rftString, rftString /// ftIDispatch, ftGuid, ftTimeStamp, ftFMTBcd, ftFixedWideChar, ftWideMemo rftUnknown, rftString, rftDateTime, rftFloat, rftString, rftString, // ftIDispatch, ftGuid, ftTimeStamp, ftFMTBcd, ftFixedWideChar, ftWideMemo
rftDateTime, rftDateTime, rftInteger, rftInteger, rftInteger, rftFloat // ftOraTimeStamp, ftOraInterval, ftLongWord, ftShortint, ftByte, ftExtended
); );
begin begin