ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/runtime/IBExtract.pas
(Generate patch)

Comparing ibx/trunk/runtime/IBExtract.pas (file contents):
Revision 47 by tony, Mon Jan 9 15:31:51 2017 UTC vs.
Revision 108 by tony, Thu Jan 18 14:37:46 2018 UTC

# Line 617 | Line 617 | begin
617          end;
618  
619          {Firebird 3 introduces IDENTITY columns. We need to check for them here}
620 <        if qryTables.HasField('RDB$GENERATOR_NAME') then
620 >        if qryTables.HasField('RDB$GENERATOR_NAME') and not qryTables.FieldByName('RDB$GENERATOR_NAME').IsNull then
621          begin
622            qryGenerators.ParamByName('GENERATOR').AsString :=  qryTables.FieldByName('RDB$GENERATOR_NAME').AsString;
623            qryGenerators.ExecQuery;
# Line 2614 | Line 2614 | end;
2614  
2615   procedure TIBExtract.SetDatabase(const Value: TIBDatabase);
2616   begin
2617 <  if FDatabase <> Value then
2617 >  if (csLoading in ComponentState) or (FDatabase <> Value) then
2618    begin
2619      FDatabase := Value;
2620      if (not Assigned(FTransaction)) and (FDatabase <> nil) then
# Line 3241 | Line 3241 | begin
3241        Database := FDatabase;
3242        SQL.Text := TableSQL;
3243        ExecQuery;
3244 +      FMetaData.Add('/* Data Starts */');
3245        while not EOF do
3246        begin
3247          ListData(Trim(FieldByName('RDB$RELATION_NAME').AsString));
3248          Next;
3249        end;
3250 +      FMetaData.Add('/* Data Ends */');
3251      finally
3252        Free;
3253      end;
# Line 3272 | Line 3274 | begin
3274      with TIBInsertStmtsOut.Create(self) do
3275      try
3276        Database := FDatabase;
3277 <      DataOut(Format('Select %s From %s',[FieldList,QuoteIdentifier(FDatabase.SQLDialect, ObjectName)]),
3278 <                Add2MetaData);
3279 <      FMetaData.Add('COMMIT;');
3277 >      if DataOut(Format('Select %s From %s',[FieldList,QuoteIdentifier(FDatabase.SQLDialect, ObjectName)]),
3278 >                Add2MetaData) then
3279 >        FMetaData.Add('COMMIT;');
3280      finally
3281        Free
3282      end;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines