Browse Source

* Demo database is created on demand (Patch from Graeme Geldenhuys, Bug ID #32360)

git-svn-id: trunk@37106 -
michael 8 years ago
parent
commit
f40c23fcc8
1 changed files with 9 additions and 5 deletions
  1. 9 5
      packages/fcl-report/demos/rptdataset.pp

+ 9 - 5
packages/fcl-report/demos/rptdataset.pp

@@ -126,13 +126,15 @@ var
   fields: TDbfFieldDefs;
   lDataSet : TDBF;
 begin
+  if FileExists('test.dbf') then
+  begin
+    DeleteFile('test.dbf');
+    DeleteFile('test.dbt');
+  end;
+
   lDataSet := TDBF.Create(Self);
   lDataSet.TableName := 'test.dbf';
-  Dataset:=lDataset;
-  lReportData.DataSet:= DataSet;
 
-  if FileExists('test.dbf') then
-    exit;
   // If you wanted to create a new DBF table
   fields := TDbfFieldDefs.Create(nil);
   fields.Add('Name', ftString, 50);
@@ -140,6 +142,7 @@ begin
   fields.Add('Age', ftInteger);
   fields.Add('Photo', ftBlob);
   lDataSet.CreateTableEx(fields); // <== Now we have an empty db table
+  fields.Free;
 
   lDataSet.Open;
 
@@ -178,7 +181,8 @@ begin
   TBlobField(lDataSet.FieldByName('Photo')).LoadFromFile(ExpandFileName('../common/pictures/man05.png'));
   lDataSet.Post;
 
-  fields.Free;
+  Dataset := lDataset;
+  lReportData.DataSet := DataSet;
 end;
 
 constructor TDatasetDemo.Create(AOwner : TComponent);