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

* Fixed TField.Size handling

Browse Source 
* Fixed crash on string-parameters

git-svn-id: trunk@9085 -
This commit is contained in:
joost 2007-11-02 23:23:12 +00:00
parent 13d948c07b
commit 9ff58eb46f
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
View File

@ -115,7 +115,7 @@ type
procedure freebindstring(astring: pointer); cdecl; procedure freebindstring(astring: pointer); cdecl;
begin begin
FreeMem(AString); StrDispose(AString);
end; end;
procedure TSQLite3Cursor.checkerror(const aerror: integer); procedure TSQLite3Cursor.checkerror(const aerror: integer);
@ -304,29 +304,28 @@ Type
TFieldMap = Record TFieldMap = Record
N : String; N : String;
T : TFieldType; T : TFieldType;
S : Integer; end;
end;
Const Const
FieldMapCount = 15; FieldMapCount = 15;
FieldMap : Array [1..FieldMapCount] of TFieldMap = ( FieldMap : Array [1..FieldMapCount] of TFieldMap = (
(n:'INT'; t: ftInteger; S: SizeOf(Integer)), (n:'INT'; t: ftInteger),
(n:'LARGEINT'; t:ftlargeInt; S: SizeOf(Int64)), (n:'LARGEINT'; t:ftlargeInt),
(n:'WORD'; t: ftWord; S: SizeOf(Word)), (n:'WORD'; t: ftWord),
(n:'SMALLINT'; t: ftSmallint; S: SizeOf(SmallInt)), (n:'SMALLINT'; t: ftSmallint),
(n:'BOOLEAN'; t: ftBoolean; S: SizeOf(WordBool)), (n:'BOOLEAN'; t: ftBoolean),
(n:'REAL'; t: ftFloat; S: SizeOf(Double)), (n:'REAL'; t: ftFloat),
(n:'DOUBLE'; t: ftFloat; S: SizeOf(Double)), (n:'DOUBLE'; t: ftFloat),
(n:'DATETIME'; t: ftDateTime; S: SizeOf(TDateTime)), // MUST be before date (n:'DATETIME'; t: ftDateTime), // MUST be before date
(n:'DATE'; t: ftDate; S: SizeOf(TDateTime)), (n:'DATE'; t: ftDate),
(n:'TIME'; t: ftTime; S: SizeOf(TDateTime)), (n:'TIME'; t: ftTime),
(n:'CURRENCY'; t: ftCurrency; S: SizeOf(double)), (n:'CURRENCY'; t: ftCurrency),
(n:'VARCHAR'; t: ftString; S: 255), (n:'VARCHAR'; t: ftString),
(n:'NUMERIC'; t: ftBCD; S: SizeOf(Currency)), (n:'NUMERIC'; t: ftBCD),
(n:'TEXT'; t: ftmemo; S: 0), (n:'TEXT'; t: ftmemo),
(n:'BLOB'; t: ftBlob; S: 0) (n:'BLOB'; t: ftBlob)
{ Template: { Template:
(n:''; t: ft; S: SizeOf()) (n:''; t: ft)
} }
); );
@ -349,18 +348,14 @@ begin
FD:=uppercase(sqlite3_column_decltype(st,i)); FD:=uppercase(sqlite3_column_decltype(st,i));
ft1:= ftUnknown; ft1:= ftUnknown;
size1:= 0; size1:= 0;
fi:=1; for fi := 1 to FieldMapCount do if pos(FieldMap[fi].N,FD)=1 then
While (ft1=ftUnknown) and (fi<=FieldMapCount) do
begin begin
if pos(FieldMap[fi].N,FD)=1 then ft1:=FieldMap[fi].t;
begin break;
ft1:=FieldMap[fi].t;
size1:=FieldMap[fi].S;
end;
Inc(fi);
end; end;
// handle some specials. // handle some specials.
case ft1 of size1:=0;
case ft1 of
ftString: begin ftString: begin
fi:=pos('(',FD); fi:=pos('(',FD);
if (fi>0) then if (fi>0) then
@ -368,7 +363,18 @@ begin
System.Delete(FD,1,fi); System.Delete(FD,1,fi);
fi:=pos(')',FD); fi:=pos(')',FD);
size1:=StrToIntDef(trim(copy(FD,1,fi-1)),255); size1:=StrToIntDef(trim(copy(FD,1,fi-1)),255);
end; end
else size1 := 255;
end;
ftBCD: begin
fi:=pos(',',FD);
if (fi>0) then
begin
System.Delete(FD,1,fi);
fi:=pos(')',FD);
size1:=StrToIntDef(trim(copy(FD,1,fi-1)),255);
end
else size1 := 4;
end; end;
ftUnknown : DatabaseError('Unknown record type: '+FN); ftUnknown : DatabaseError('Unknown record type: '+FN);
end; // Case end; // Case