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

* Patch from Luiz Americo to fix TField.Size issues

Browse Source 
git-svn-id: trunk@9245 -
This commit is contained in:
joost 2007-11-13 21:24:18 +00:00
parent 3860a73084
commit dd25f17f96
2 changed files with 40 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
packages/fcl-db/src/sqlite/sqlite3ds.pas
View File

@ -103,7 +103,7 @@ procedure TSqlite3Dataset.InternalInitFieldDefs;
var
vm:Pointer;
ColumnStr:String;
i,ColumnCount,FieldSize:Integer;
i,ColumnCount:Integer;
AType:TFieldType;
begin
{$ifdef DEBUG}
@ -118,71 +118,58 @@ begin
FRowBufferSize:=(SizeOf(PPChar)*ColumnCount);
//Prepare the array of pchar2sql functions
SetLength(FGetSqlStr,ColumnCount);
for i:= 0 to ColumnCount - 1 do
for i := 0 to ColumnCount - 1 do
begin
ColumnStr:= UpperCase(StrPas(sqlite3_column_decltype(vm,i)));
ColumnStr := UpperCase(StrPas(sqlite3_column_decltype(vm,i)));
if (ColumnStr = 'INTEGER') or (ColumnStr = 'INT') then
begin
if AutoIncrementKey and (UpperCase(StrPas(sqlite3_column_name(vm,i))) = UpperCase(PrimaryKey)) then
begin
AType:= ftAutoInc;
FAutoIncFieldNo:=i;
AType := ftAutoInc;
FAutoIncFieldNo := i;
end
else
AType:= ftInteger;
FieldSize:=SizeOf(LongInt);
AType := ftInteger;
end else if Pos('VARCHAR',ColumnStr) = 1 then
begin
AType:= ftString;
FieldSize:=0;
AType := ftString;
end else if Pos('BOOL',ColumnStr) = 1 then
begin
AType:= ftBoolean;
FieldSize:=SizeOf(WordBool);
AType := ftBoolean;
end else if Pos('AUTOINC',ColumnStr) = 1 then
begin
AType:= ftAutoInc;
FieldSize:=SizeOf(LongInt);
AType := ftAutoInc;
if FAutoIncFieldNo = -1 then
FAutoIncFieldNo:= i;
FAutoIncFieldNo := i;
end else if (Pos('FLOAT',ColumnStr)=1) or (Pos('NUMERIC',ColumnStr)=1) then
begin
AType:= ftFloat;
FieldSize:=SizeOf(Double);
AType := ftFloat;
end else if (ColumnStr = 'DATETIME') then
begin
AType:= ftDateTime;
FieldSize:=SizeOf(TDateTime);
AType := ftDateTime;
end else if (ColumnStr = 'DATE') then
begin
AType:= ftDate;
FieldSize:=SizeOf(TDateTime);
AType := ftDate;
end else if (ColumnStr = 'LARGEINT') then
begin
AType:= ftLargeInt;
FieldSize:=SizeOf(Int64);
AType := ftLargeInt;
end else if (ColumnStr = 'TIME') then
begin
AType:= ftTime;
FieldSize:=SizeOf(TDateTime);
AType := ftTime;
end else if (ColumnStr = 'TEXT') then
begin
AType:= ftMemo;
FieldSize:=0;
AType := ftMemo;
end else if (ColumnStr = 'CURRENCY') then
begin
AType:= ftCurrency;
FieldSize:=SizeOf(Double);
AType := ftCurrency;
end else if (ColumnStr = 'WORD') then
begin
AType:= ftWord;
FieldSize:=SizeOf(Word);
AType := ftWord;
end else
begin
AType:= ftString;
FieldSize:=0;
AType := ftString;
end;
FieldDefs.Add(StrPas(sqlite3_column_name(vm,i)), AType, FieldSize, False);
FieldDefs.Add(StrPas(sqlite3_column_name(vm,i)), AType, 0, False);
//Set the pchar2sql function
if AType in [ftString,ftMemo] then
FGetSqlStr[i]:=@Char2SqlStr

54
packages/fcl-db/src/sqlite/sqliteds.pas
View File

@ -104,14 +104,13 @@ end;
procedure TSqliteDataset.InternalInitFieldDefs;
var
ColumnCount,i:Integer;
FieldSize:Word;
AType:TFieldType;
vm:Pointer;
ColumnNames,ColumnValues:PPChar;
ColumnStr:String;
begin
FieldDefs.Clear;
FAutoIncFieldNo:=-1;
FAutoIncFieldNo := -1;
sqlite_compile(FSqliteHandle,PChar(FSql),nil,@vm,nil);
sqlite_step(vm,@ColumnCount,@ColumnValues,@ColumnNames);
//Prepare the array of pchar2sql functions
@ -123,72 +122,59 @@ begin
// exactly what is in Create Table statement
// here is a trick to get the datatype.
// If the field contains another type, may have problems
for i:= 0 to ColumnCount - 1 do
for i := 0 to ColumnCount - 1 do
begin
ColumnStr:= UpperCase(StrPas(ColumnNames[i + ColumnCount]));
ColumnStr := UpperCase(StrPas(ColumnNames[i + ColumnCount]));
if (ColumnStr = 'INTEGER') or (ColumnStr = 'INT') then
begin
if AutoIncrementKey and
(UpperCase(StrPas(ColumnNames[i])) = UpperCase(PrimaryKey)) then
begin
AType:= ftAutoInc;
FAutoIncFieldNo:=i;
AType := ftAutoInc;
FAutoIncFieldNo := i;
end
else
AType:= ftInteger;
FieldSize:=SizeOf(LongInt);
AType := ftInteger;
end else if Pos('VARCHAR',ColumnStr) = 1 then
begin
AType:= ftString;
FieldSize:=0;
AType := ftString;
end else if Pos('BOOL',ColumnStr) = 1 then
begin
AType:= ftBoolean;
FieldSize:=SizeOf(WordBool);
AType := ftBoolean;
end else if Pos('AUTOINC',ColumnStr) = 1 then
begin
AType:= ftAutoInc;
FieldSize:=SizeOf(LongInt);
AType := ftAutoInc;
if FAutoIncFieldNo = -1 then
FAutoIncFieldNo:= i;
FAutoIncFieldNo := i;
end else if (Pos('FLOAT',ColumnStr)=1) or (Pos('NUMERIC',ColumnStr)=1) then
begin
AType:= ftFloat;
FieldSize:=SizeOf(Double);
AType := ftFloat;
end else if (ColumnStr = 'DATETIME') then
begin
AType:= ftDateTime;
FieldSize:=SizeOf(TDateTime);
AType := ftDateTime;
end else if (ColumnStr = 'DATE') then
begin
AType:= ftDate;
FieldSize:=SizeOf(TDateTime);
AType := ftDate;
end else if (ColumnStr = 'TIME') then
begin
AType:= ftTime;
FieldSize:=SizeOf(TDateTime);
AType := ftTime;
end else if (ColumnStr = 'LARGEINT') then
begin
AType:= ftLargeInt;
FieldSize:=SizeOf(LargeInt);
AType := ftLargeInt;
end else if (ColumnStr = 'TEXT') then
begin
AType:= ftMemo;
FieldSize:=0;
AType := ftMemo;
end else if (ColumnStr = 'CURRENCY') then
begin
AType:= ftCurrency;
FieldSize:=SizeOf(Double);
AType := ftCurrency;
end else if (ColumnStr = 'WORD') then
begin
AType:= ftWord;
FieldSize:=SizeOf(Word);
AType := ftWord;
end else
begin
AType:=ftString;
FieldSize:=0;
AType := ftString;
end;
FieldDefs.Add(StrPas(ColumnNames[i]), AType, FieldSize, False);
FieldDefs.Add(StrPas(ColumnNames[i]), AType, 0, False);
//Set the pchar2sql function
if AType in [ftString,ftMemo] then
FGetSqlStr[i]:=@Char2SqlStr