paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-09 19:57:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fcl-db: dbtestframework:

Browse Source 
* Fix dbf export test column name collisions; fixes "field not found" when exporting

git-svn-id: trunk@26967 -
This commit is contained in:
reiniero 2014-03-06 12:40:32 +00:00
parent fec4c6a6e2
commit b87b2add38
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/fcl-db/tests/sqldbtoolsunit.pas
View File

@ -406,7 +406,6 @@ var
function String2Hex(Source: string): string;
// Converts ASCII codes into hex
// Inverse of hex2string
var
i: integer;
begin

7
packages/fcl-db/tests/testdbexport.pas
View File

@ -127,12 +127,10 @@ begin
if not FieldSupported(
Exporter.Dataset.Fields[i].DataType,
ExportFormat) then
FieldMapping.Delete(i);
FieldMapping.Delete(i);
end;
for i:=0 to FieldMapping.Count-1 do
begin
Exporter.ExportFields.Add.Assign(FieldMapping[i]);
end;
NumberExported := Exporter.Execute;
Exporter.Dataset.Last;
Exporter.Dataset.First;
@ -186,6 +184,7 @@ begin
try
ExportFormat:=efDBaseVII;
ExportSettings.TableFormat:=tfDBaseVII;
ExportSettings.AutoRenameFields:=true; //rename conflicting column names
// Use export subtype position to differentiate output filenames:
Exporter.FileName := FExportTempDir + inttostr(ord(ExportFormat)) +
lowercase(rightstr(TestName,5)) +
@ -213,6 +212,7 @@ begin
try
ExportFormat:=efDBaseIV;
ExportSettings.TableFormat:=tfDBaseIV;
ExportSettings.AutoRenameFields:=true; //rename conflicting column names
Exporter.FileName := FExportTempDir + inttostr(ord(ExportFormat)) +
lowercase(rightstr(TestName,5)) +
TDetailedExportExtensions[ExportFormat];
@ -239,6 +239,7 @@ begin
try
ExportFormat:=efFoxpro;
ExportSettings.TableFormat:=tfFoxPro;
ExportSettings.AutoRenameFields:=true; //rename conflicting column names
Exporter.FileName := FExportTempDir + inttostr(ord(ExportFormat)) +
lowercase(rightstr(TestName,5)) +
TDetailedExportExtensions[ExportFormat];