fcl-db: base: add some of new Delphi field types into enumeration TFieldType

(ftOraTimeStamp, ftOraInterval, ftLongWord, ftShortint, ftByte, ftExtended)

git-svn-id: trunk@47217 -
This commit is contained in:
lacak 2020-10-27 10:01:30 +00:00
parent 6d5816085d
commit d68ce429ab
7 changed files with 57 additions and 11 deletions

View File

@ -109,7 +109,8 @@ type
ftParadoxOle, ftDBaseOle, ftTypedBinary, ftCursor, ftFixedChar, ftParadoxOle, ftDBaseOle, ftTypedBinary, ftCursor, ftFixedChar,
ftWideString, ftLargeint, ftADT, ftArray, ftReference, ftWideString, ftLargeint, ftADT, ftArray, ftReference,
ftDataSet, ftOraBlob, ftOraClob, ftVariant, ftInterface, ftDataSet, ftOraBlob, ftOraClob, ftVariant, ftInterface,
ftIDispatch, ftGuid, ftTimeStamp, ftFMTBcd, ftFixedWideChar, ftWideMemo); ftIDispatch, ftGuid, ftTimeStamp, ftFMTBcd, ftFixedWideChar, ftWideMemo,
ftOraTimeStamp, ftOraInterval, ftLongWord, ftShortint, ftByte, ftExtended);
{ Part of DBCommon, but temporarily defined here (bug 8206) } { Part of DBCommon, but temporarily defined here (bug 8206) }
@ -1297,6 +1298,7 @@ type
end; end;
{ TParams } { TParams }
TSQLParseOption = (spoCreate,spoEscapeSlash,spoEscapeRepeat,spoUseMacro); TSQLParseOption = (spoCreate,spoEscapeSlash,spoEscapeRepeat,spoUseMacro);
TSQLParseOptions = Set of TSQLParseOption; TSQLParseOptions = Set of TSQLParseOption;
@ -2126,7 +2128,7 @@ const
{ftCursor} varError, {ftCursor} varError,
{ftFixedChar} varOleStr, {ftFixedChar} varOleStr,
{ftWideString} varOleStr, {ftWideString} varOleStr,
{ftLargeint} varint64, {ftLargeint} varInt64,
{ftADT} varError, {ftADT} varError,
{ftArray} varError, {ftArray} varError,
{ftReference} varError, {ftReference} varError,
@ -2140,7 +2142,13 @@ const
{ftTimeStamp} varOleStr, {ftTimeStamp} varOleStr,
{ftFMTBcd} varDouble, {ftFMTBcd} varDouble,
{ftFixedWideChar} varOleStr, {ftFixedWideChar} varOleStr,
{ftWideMemo} varOleStr {ftWideMemo} varOleStr,
{ftOraTimeStamp} varUnknown,
{ftOraInterval} varUnknown,
{ftLongWord} varLongWord,
{ftShortint} varShortint,
{ftByte} varByte,
{ftExtended} varDouble
); );
@ -2186,7 +2194,13 @@ Const
{ftTimeStamp} 'TimeStamp', {ftTimeStamp} 'TimeStamp',
{ftFMTBcd} 'FMTBcd', {ftFMTBcd} 'FMTBcd',
{ftFixedWideChar} 'FixedWideChar', {ftFixedWideChar} 'FixedWideChar',
{ftWideMemo} 'WideMemo' {ftWideMemo} 'WideMemo',
{ftOraTimeStamp} 'OraTimeStamp',
{ftOraInterval} 'OraInterval',
{ftLongWord} 'LongWord',
{ftShortint} 'Shortint',
{ftByte} 'Byte',
{ftExtended} 'Extended'
); );
@ -2232,7 +2246,13 @@ const
{ ftTimeStamp} Nil, { ftTimeStamp} Nil,
{ ftFMTBcd} TFMTBCDField, { ftFMTBcd} TFMTBCDField,
{ ftFixedWideString} TWideStringField, { ftFixedWideString} TWideStringField,
{ ftWideMemo} TWideMemoField { ftWideMemo} TWideMemoField,
{ ftOraTimeStamp} nil,
{ ftOraInterval} nil,
{ ftLongWord} {TLongWordField}nil,
{ ftShortint} {TShortintField}nil,
{ ftByte} nil,
{ ftExtended} nil
); );
dsEditModes = [dsEdit, dsInsert, dsSetKey]; dsEditModes = [dsEdit, dsInsert, dsSetKey];

View File

@ -106,7 +106,13 @@ const
'', '',
'fixedFMT', // ftFmtBCD 'fixedFMT', // ftFmtBCD
'string.uni', // ftFixedWideChar 'string.uni', // ftFixedWideChar
'bin.hex:WideText' // ftWideMemo 'bin.hex:WideText', // ftWideMemo
'', // ftOraTimeStamp
'', // ftOraInterval
'', // ftLongWord
'', // ftShortint
'', // ftByte
'' // ftExtended
); );
resourcestring resourcestring

View File

@ -191,7 +191,13 @@ Const
{ftTimeStamp} 0, {ftTimeStamp} 0,
{ftFMTBcd} 0, {ftFMTBcd} 0,
{ftFixedWideChar} 0, {ftFixedWideChar} 0,
{ftWideMemo} 0 {ftWideMemo} 0,
{ftOraTimeStamp} 0,
{ftOraInterval} 0,
{ftLongWord} 10,
{ftShortint} 4,
{ftByte} 1,
{ftExtended} 20
); );
Function CalcLbool: integer; Function CalcLbool: integer;

View File

@ -151,7 +151,8 @@ Const
0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0,0); 0,0,0,0,0,0,
0,0,10,4,1,20);
Var Var
I : Integer; I : Integer;

View File

@ -173,7 +173,8 @@ Const
0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0,0); 0,0,0,0,0,0,
0,0,10,4,1,20);
Var Var
I : Integer; I : Integer;

View File

@ -869,7 +869,13 @@ const TypeStrings : array[TFieldType] of string =
'Unknown', // ftTimeStamp 'Unknown', // ftTimeStamp
'numeric', // ftFMTBcd 'numeric', // ftFMTBcd
'Unknown', // ftFixedWideChar 'Unknown', // ftFixedWideChar
'Unknown' // ftWideMemo 'Unknown', // ftWideMemo
'Unknown', // ftOraTimeStamp
'Unknown', // ftOraInterval
'Unknown', // ftLongWord
'Unknown', // ftShortint
'Unknown', // ftByte
'Unknown' // ftExtended
); );

View File

@ -127,7 +127,13 @@ const
{ftTimeStamp} 'TIMESTAMP', {ftTimeStamp} 'TIMESTAMP',
{ftFMTBcd} 'NUMERIC(18,6)', {ftFMTBcd} 'NUMERIC(18,6)',
{ftFixedWideChar} '', {ftFixedWideChar} '',
{ftWideMemo} '' {ftWideMemo} '',
{ftOraTimeStamp} '',
{ftOraInterval} '',
{ftLongWord} '',
{ftShortint} '',
{ftByte} '',
{ftExtended} ''
); );
// names as returned by ODBC SQLGetInfo(..., SQL_DBMS_NAME, ...) and GetConnectionInfo(citServerType) // names as returned by ODBC SQLGetInfo(..., SQL_DBMS_NAME, ...) and GetConnectionInfo(citServerType)