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

Comparing ibx/trunk/design/IBDBReg.pas (file contents):
Revision 13 by tony, Thu Nov 22 22:53:40 2012 UTC vs.
Revision 106 by tony, Thu Jan 18 14:37:35 2018 UTC

# Line 39 | Line 39 | unit IBDBReg;
39   *)
40   {$A+}                           (* Aligned records: On *)
41   {$B-}                           (* Short circuit boolean expressions: Off *)
42 {$G+}                           (* Imported data: On *)
42   {$H+}                           (* Huge Strings: On *)
43   {$J-}                           (* Modification of Typed Constants: Off *)
44   {$M+}                           (* Generate run-time type information: On *)
# Line 47 | Line 46 | unit IBDBReg;
46   {$Q-}                           (* Overflow checks: Off *)
47   {$R-}                           (* Range checks: Off *)
48   {$T+}                           (* Typed address: On *)
50 {$U+}                           (* Pentim-safe FDIVs: On *)
49   {$W-}                           (* Always generate stack frames: Off *)
50   {$X+}                           (* Extended syntax: On *)
51   {$Z1}                           (* Minimum Enumeration Size: 1 Byte *)
52  
53   interface
54  
55 < uses {Windows,} SysUtils, Classes, Graphics, Dialogs, Controls, Forms, TypInfo,
55 > uses SysUtils, Classes, Graphics, Dialogs, Controls, Forms, TypInfo,
56       DB, IBTable, IBDatabase,  IBEventsEditor,  LazarusPackageIntf,
57 <      IBUpdateSQL, IBXConst, ComponentEditors, PropEdits, DBPropEdits, FieldsEditor;
57 >      IBUpdateSQL, IBUpdate, ComponentEditors, PropEdits, DBPropEdits, FieldsEditor,
58 >     dbFieldLinkPropEditor, dbFieldListPropEditor, IBDialogs;
59  
60   type
61  
# Line 92 | Line 91 | type
91      procedure GetValues(Proc: TGetStrProc); override;
92    end;
93  
94 +  { TDBStringProperty }
95 +
96    TDBStringProperty = class(TStringProperty)
97 +  private
98 +    function ConnecttoDB: boolean;
99    public
100      function GetAttributes: TPropertyAttributes; override;
101      procedure GetValueList(List: TStrings); virtual;
102      procedure GetValues(Proc: TGetStrProc); override;
103 +    procedure Edit; override;
104    end;
105  
106 +  { TIBIndexFieldNamesProperty }
107 +
108    TIBIndexFieldNamesProperty = class(TDBStringProperty)
109    public
110      procedure GetValueList(List: TStrings); override;
# Line 126 | Line 132 | type
132      function GetVerbCount: Integer; override;
133    end;
134  
135 +  { TIBArrayGridEditor }
136 +
137 +  TIBArrayGridEditor = class(TComponentEditor)
138 +  public
139 +    procedure ExecuteVerb(Index: Integer); override;
140 +    function GetVerb(Index: Integer): string; override;
141 +    function GetVerbCount: Integer; override;
142 +  end;
143 +
144   { TIBQueryEditor }
145  
146    TIBQueryEditor = class(TFieldsComponentEditor)
# Line 184 | Line 199 | type
199    public
200      procedure Edit; override;
201    end;
202 < (*
202 >
203 >  { TIBTableFieldLinkProperty }
204 >
205    TIBTableFieldLinkProperty = class(TFieldLinkProperty)
206    private
207      FTable: TIBTable;
208    protected
209 +    function GetIndexDefs: TIndexDefs; override;
210      function GetIndexFieldNames: string; override;
211      function GetMasterFields: string; override;
212      procedure SetIndexFieldNames(const Value: string); override;
# Line 196 | Line 214 | type
214    public
215      procedure Edit; override;
216    end;
217 < *)
217 >
218   { TSQLPropertyEditor }
219  
220    TSQLPropertyEditor = class(TStringsPropertyEditor)
# Line 314 | Line 332 | type
332      procedure Edit; override;
333    end;
334  
335 +  { TDBDynamicGridFieldProperty }
336 +
337 +  TDBDynamicGridFieldProperty = class(TFieldProperty)
338 +  public
339 +    procedure FillValues(const Values: TStringList); override;
340 +  end;
341 +
342 +  { TDBLookupPropertiesGridFieldProperty }
343 +
344 +  TDBLookupPropertiesGridFieldProperty = class(TFieldProperty)
345 +  public
346 +    procedure FillValues(const Values: TStringList); override;
347 +  end;
348 +
349 +  { TIBTreeViewFieldProperty }
350 +
351 +  TIBTreeViewFieldProperty = class(TFieldProperty)
352 +  public
353 +    procedure FillValues(const Values: TStringList); override;
354 +  end;
355 +
356 +  { TIBDynamicGridIndexNamesProperty }
357 +
358 +  TIBDynamicGridIndexNamesProperty = class(TIndexFieldNamesProperty)
359 +  protected
360 +    function GetFieldDefs: TFieldDefs; override;
361 +    function GetIndexFieldNames: string; override;
362 +    procedure SetIndexFieldNames(const Value: string); override;
363 +  end;
364 +
365 +  { TIBFieldDefsProperty }
366 +
367 +  TIBFieldDefsProperty = class(TCollectionPropertyEditor)
368 +  public
369 +    procedure Edit; override;
370 +  end;
371 +
372 +  { TIBIndexDefsProperty }
373 +
374 +  TIBIndexDefsProperty = class(TCollectionPropertyEditor)
375 +  public
376 +    procedure Edit; override;
377 +  end;
378 +
379 +
380   procedure Register;
381  
382   implementation
383  
384 < uses IB, IBQuery, IBStoredProc, IBCustomDataSet,
385 <     IBIntf, IBSQL, IBSQLMonitor, IBDatabaseInfo, IBEvents,
384 > uses IB, IBQuery, IBStoredProc, IBCustomDataSet, FBMessages,
385 >     IBSQL, IBSQLMonitor, IBDatabaseInfo, IBEvents, IBTypes,
386       IBServices, IBDatabaseEdit, IBTransactionEdit,
387 <     IBBatchMove, DBLoginDlg, IBExtract,LResources, IBSelectSQLEditor,
387 >     IBBatchMove, IBExtract,LResources, IBSelectSQLEditor,
388       IBModifySQLEditor,IBDeleteSQLEditor,IBRefreshSQLEditor,
389       IBInsertSQLEditor, IBGeneratorEditor, IBUpdateSQLEditor, IBDataSetEditor,
390 <     IBSQLEditor, ibserviceeditor, LCLVersion;
391 <
392 <
390 >     IBSQLEditor, ibserviceeditor, LCLVersion, IBDynamicGrid, IBLookupComboEditBox,
391 >     IBTreeView, DBControlGrid, ibxscript, IBLocalDBSupport, IBDSDialogs,
392 >     IBArrayGrid, IBVersion, IBDataOutput;
393 >
394 > const
395 >  IBPalette1 = 'Firebird'; {do not localize}
396 >  IBPalette2 = 'Firebird Admin'; {do not localize}
397 >  IBPalette3 = 'Firebird Data Controls';   {do not localize}
398 >  
399 > resourcestring
400 >   SInterbaseExpressVersion = 'Firebird Express for Lazarus ' + IBX_VERSION;
401 >   SEditSQL = 'Edit SQL';
402 >   SIBSQLEditor = 'IBSQL Editor';
403 >   SIBServiceEditor = 'Edit IB Service';
404 >   SIBUpdateSQLEditor = '&UpdateSQL Editor...';
405 >   SIBDataSetEditor = '&Dataset Editor...';
406 >   SExecute = 'E&xecute';
407 >   SIBDatabaseEditor = 'Da&tabase Editor...';
408 >   SIBTransactionEditor = '&Transaction Editor...';
409 >   SIBUpdateLayout = 'Update Layout';
410  
411   procedure Register;
412   begin
413 <  if not TryIBLoad then Exit;
413 >  if not TryIBLoad then
414 >  begin
415 >    MessageDlg('IBX is unable to locate the Firebird Library - have you remembered to install it?',mtError,[mbOK],0);
416 >    Exit;
417 >  end;
418  
419 <  RegisterNoIcon([TIBStringField, TIBBCDField]);
419 >  RegisterNoIcon([TIBStringField, TIBBCDField, TIBMemoField, TIBArrayField,
420 >    TIBSmallintField, TIBIntegerField, TIBLargeIntField]);
421    {$if lcl_fullversion < 01010000}
422    {see http://bugs.freepascal.org/view.php?id=19035 }
423    RegisterNoIcon([TIntegerField]);
424    {$endif}
425    RegisterComponents(IBPalette1, [ TIBQuery, TIBDataSet,
426 <   TIBDatabase, TIBTransaction, TIBUpdateSQL, TIBEvents,
426 >   TIBDatabase, TIBTransaction, TIBUpdateSQL, TIBUpdate, TIBEvents,
427       TIBSQL, TIBDatabaseInfo, TIBSQLMonitor,
428 <       TIBStoredProc,TIBBatchMove,  TIBTable,TIBExtract]);
429 <  if IBServiceAPIPresent  then
428 >       TIBStoredProc,TIBBatchMove,  TIBTable,TIBExtract, TIBXScript, TIBLocalDBSupport,
429 >       TIBBlockFormatOut,TIBCSVDataOut,TIBInsertStmtsOut]);
430 >  if FirebirdAPI.HasServiceAPI  then
431      RegisterComponents(IBPalette2, [TIBConfigService, TIBBackupService,
432        TIBRestoreService, TIBValidationService, TIBStatisticalService,
433        TIBLogService, TIBSecurityService, TIBServerProperties]);
434 +
435 +
436 +  RegisterComponents(IBPalette3,[TIBLookupComboEditBox,TIBDynamicGrid,TIBTreeView,TDBControlGrid, TIBArrayGrid]);
437    RegisterPropertyEditor(TypeInfo(TIBFileName), TIBDatabase, 'DatabaseName', TIBFileNameProperty); {do not localize}
438    RegisterPropertyEditor(TypeInfo(string), TIBStoredProc, 'StoredProcName', TIBStoredProcNameProperty); {do not localize}
439    RegisterPropertyEditor(TypeInfo(TParams), TIBStoredProc, 'Params', TIBStoredProcParamsProperty);
440    RegisterPropertyEditor(TypeInfo(string), TIBTable, 'TableName', TIBTableNameProperty); {do not localize}
441    RegisterPropertyEditor(TypeInfo(string), TIBTable, 'IndexName', TIBIndexNameProperty); {do not localize}
442    RegisterPropertyEditor(TypeInfo(string), TIBTable, 'IndexFieldNames', TIBIndexFieldNamesProperty); {do not localize}
443 < //  RegisterPropertyEditor(TypeInfo(string), TIBTable, 'MasterFields', TIBTableFieldLinkProperty); {do not localize}
443 >  RegisterPropertyEditor(TypeInfo(string), TIBTable, 'MasterFields', TIBTableFieldLinkProperty); {do not localize}
444 >  RegisterPropertyEditor(TypeInfo(TFieldDefs), TIBTable, 'FieldDefs', TIBFieldDefsProperty); {do not localize}
445 >  RegisterPropertyEditor(TypeInfo(TIndexDefs), TIBTable, 'IndexDefs', TIBIndexDefsProperty); {do not localize}
446    RegisterPropertyEditor(TypeInfo(TStrings), TIBQuery, 'SQL', TIBQuerySQLProperty); {do not localize}
447    RegisterPropertyEditor(TypeInfo(TStrings), TIBDataSet, 'SelectSQL', TIBDatasetSQLProperty); {do not localize}
448    RegisterPropertyEditor(TypeInfo(TStrings), TIBDataSet, 'ModifySQL', TIBUpdateSQLProperty); {do not localize}
# Line 375 | Line 466 | begin
466    RegisterComponentEditor(TIBStoredProc, TIBStoredProcEditor);
467    RegisterComponentEditor(TIBSQL, TIBSQLEditor);
468    RegisterComponentEditor(TIBCustomService, TIBServiceEditor);
469 +  RegisterComponentEditor(TIBArrayGrid, TIBArrayGridEditor);
470 +
471 +
472 +  {Firebird Data Access Controls}
473 +  RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'KeyField', TDBDynamicGridFieldProperty);
474 +  RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'ListField', TDBDynamicGridFieldProperty);
475 +  RegisterPropertyEditor(TypeInfo(string), TIBDynamicGrid, 'IndexFieldNames', TIBDynamicGridIndexNamesProperty);
476 +  RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'DataFieldName', TDBLookupPropertiesGridFieldProperty);
477 +  RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'KeyField', TIBTreeViewFieldProperty);
478 +  RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'TextField', TIBTreeViewFieldProperty);
479 +  RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'ParentField', TIBTreeViewFieldProperty);
480 +  RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'HasChildField', TIBTreeViewFieldProperty);
481 +
482 +  IBGUIInterface :=  TIBDSLCLInterface.Create;
483 + end;
484 +
485 + procedure LoadDataSourceFields(DataSource: TDataSource; List: TStrings);
486 + var
487 +  DataSet: TDataSet;
488 +  i: Integer;
489 + begin
490 +  if Assigned(DataSource) then
491 +  begin
492 +    DataSet := DataSource.DataSet;
493 +    if Assigned(DataSet) then
494 +    begin
495 +      if DataSet.Fields.Count > 0 then
496 +        DataSet.GetFieldNames(List)
497 +      else
498 +      begin
499 +        DataSet.FieldDefs.Update;
500 +        for i := 0 to DataSet.FieldDefs.Count - 1 do
501 +          List.Add(DataSet.FieldDefs[i].Name);
502 +      end;
503 +    end;
504 +  end;
505 + end;
506 +
507 + { TIBIndexDefsProperty }
508 +
509 + procedure TIBIndexDefsProperty.Edit;
510 + var IndexDefs: TIndexDefs;
511 + begin
512 +  IndexDefs := TIndexDefs(GetObjectValue);
513 +  if IndexDefs <> nil then
514 +    IndexDefs.Update;
515 +  inherited Edit;
516 + end;
517 +
518 + { TIBFieldDefsProperty }
519 +
520 + procedure TIBFieldDefsProperty.Edit;
521 + var FieldDefs: TFieldDefs;
522 + begin
523 +  FieldDefs := TFieldDefs(GetObjectValue);
524 +  if FieldDefs <> nil then
525 +    FieldDefs.Update;
526 +  inherited Edit;
527 + end;
528 +
529 + { TIBArrayGridEditor }
530 +
531 + procedure TIBArrayGridEditor.ExecuteVerb(Index: Integer);
532 + begin
533 +  if Index < inherited GetVerbCount then
534 +    inherited ExecuteVerb(Index)
535 +  else
536 +  case Index of
537 +    0: TIBArrayGrid(Component).UpdateLayout;
538 +  end;
539 + end;
540 +
541 + function TIBArrayGridEditor.GetVerb(Index: Integer): string;
542 + begin
543 +  if Index < inherited GetVerbCount then
544 +    Result := inherited GetVerb(Index) else
545 +  begin
546 +    Dec(Index, inherited GetVerbCount);
547 +    case Index of
548 +      0: Result := SIBUpdateLayout;
549 +      1 : Result := SInterbaseExpressVersion ;
550 +    end;
551 +  end;
552 + end;
553 +
554 + function TIBArrayGridEditor.GetVerbCount: Integer;
555 + begin
556 +  Result := 2;
557 + end;
558 +
559 + { TDBLookupPropertiesGridFieldProperty }
560 +
561 + procedure TDBLookupPropertiesGridFieldProperty.FillValues(
562 +  const Values: TStringList);
563 + var
564 +  P: TDBLookupProperties;
565 + begin
566 +  P :=TDBLookupProperties(GetComponent(0));
567 +  if not (P is TDBLookupProperties) then exit;
568 +  LoadDataSourceFields(TIBDynamicGrid(P.Owner.Grid).DataSource, Values);
569 + end;
570 +
571 + { TIBTreeViewFieldProperty }
572 +
573 + procedure TIBTreeViewFieldProperty.FillValues(const Values: TStringList);
574 + var ListSource: TDataSource;
575 + begin
576 +  ListSource :=  TIBTreeView(GetComponent(0)).DataSource;
577 +  LoadDataSourceFields(ListSource, Values);
578 + end;
579 +
580 + { TIBDynamicGridIndexNamesProperty }
581 +
582 + function TIBDynamicGridIndexNamesProperty.GetFieldDefs: TFieldDefs;
583 + var Grid: TIBDynamicGrid;
584 + begin
585 +  Result := nil;
586 +  Grid := TIBDynamicGrid(GetComponent(0));
587 +  if assigned(Grid.DataSource) and assigned(Grid.DataSource.DataSet) then
588 +     Result := Grid.DataSource.DataSet.FieldDefs
589 + end;
590 +
591 + function TIBDynamicGridIndexNamesProperty.GetIndexFieldNames: string;
592 + var Grid: TIBDynamicGrid;
593 + begin
594 +  Grid := TIBDynamicGrid(GetComponent(0));
595 +  Result := Grid.IndexFieldNames
596 + end;
597 +
598 + procedure TIBDynamicGridIndexNamesProperty.SetIndexFieldNames(
599 +  const Value: string);
600 + var Grid: TIBDynamicGrid;
601 + begin
602 +  Grid := TIBDynamicGrid(GetComponent(0));
603 +  Grid.IndexFieldNames := Value
604 + end;
605 +
606 + { TDBDynamicGridFieldProperty }
607 +
608 + procedure TDBDynamicGridFieldProperty.FillValues(const Values: TStringList);
609 + var
610 +  P: TDBLookupProperties;
611 + begin
612 +  P :=TDBLookupProperties(GetComponent(0));
613 +  if not (P is TDBLookupProperties) then exit;
614 +  LoadDataSourceFields(P.ListSource, Values);
615   end;
616  
617   { TIBServiceEditor }
# Line 459 | Line 696 | end;
696  
697   procedure TIBTableNameProperty.GetValues(Proc: TGetStrProc);
698   var
699 <   TableName : TIBTable;
699 >   Table : TIBTable;
700     i : integer;
701   begin
702 <  TableName := GetComponent(0) as TIBTable;
703 <  with TableName do
702 >  Table := GetComponent(0) as TIBTable;
703 >   if Table.Database = nil then
704 >      Exit;
705 >  with Table do
706      for I := 0 to TableNames.Count - 1 do
707        Proc (TableNames[i]);
708   end;
709  
710   { TDBStringProperty }
711  
712 + function TDBStringProperty.ConnecttoDB: boolean;
713 + var DataSet: TIBCustomDataSet;
714 + begin
715 +  Result := false;
716 +  DataSet := (GetComponent(0) as TIBCustomDataSet);
717 +  if assigned(Dataset.Database) then
718 +  begin
719 +    try
720 +      DataSet.Database.Connected := true;
721 +    except on E: Exception do
722 +      ShowMessage(E.Message)
723 +    end;
724 +    Result := DataSet.Database.Connected
725 +  end;
726 + end;
727 +
728   function TDBStringProperty.GetAttributes: TPropertyAttributes;
729   begin
730    Result := [paValueList, paSortList, paMultiSelect];
# Line 484 | Line 739 | var
739    I: Integer;
740    Values: TStringList;
741   begin
742 +  if not ConnecttoDB then Exit;
743    Values := TStringList.Create;
744    try
745      GetValueList(Values);
# Line 493 | Line 749 | begin
749    end;
750   end;
751  
752 + procedure TDBStringProperty.Edit;
753 + begin
754 +  if ConnecttoDB then
755 +    inherited Edit;
756 + end;
757 +
758   { Utility Functions }
759  
760   function GetPropertyValue(Instance: TPersistent; const PropName: string): TPersistent;
# Line 554 | Line 816 | var
816    Query: TIBQuery;
817   begin
818    Query := GetComponent(0) as TIBQuery;
819 <  if IBSelectSQLEditor.EditSQL(Query.Database,Query.SQL) then Modified;
819 >  if IBSelectSQLEditor.EditSQL(Query,Query.SQL) then Modified;
820   end;
821  
822   { TIBDatasetSQLProperty }
# Line 564 | Line 826 | var
826    IBDataset: TIBDataset;
827   begin
828    IBDataset := GetComponent(0) as TIBDataset;
829 <  if IBSelectSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.SelectSQL) then Modified;
829 >  if IBSelectSQLEditor.EditSQL(IBDataSet,IBDataSet.SelectSQL) then Modified;
830   end;
831  
832   { TIBSQLProperty }
# Line 574 | Line 836 | var
836    IBSQL: TIBSQL;
837   begin
838    IBSQL := GetComponent(0) as TIBSQL;
839 <  if IBSelectSQLEditor.EditSQL(IBSQL.Database,IBSQL.SQL) then Modified;
839 >  if IBSQLEditor.EditSQL(IBSQL) then Modified;
840   end;
841  
842   { TIBUpdateSQLEditor }
# Line 588 | Line 850 | function TIBUpdateSQLEditor.GetVerb(Inde
850   begin
851    case Index of
852      0 : Result := SIBUpdateSQLEditor;
853 <    1: Result := SInterbaseExpressVersion;
853 >    1: Result := SInterbaseExpressVersion ;
854    end;
855   end;
856  
# Line 600 | Line 862 | end;
862   { TIBDataSetEditor }
863  
864   procedure TIBDataSetEditor.ExecuteVerb(Index: Integer);
603 var
604  IBDataset: TIBDataset;
865   begin
866    if Index < inherited GetVerbCount then
867      inherited ExecuteVerb(Index) else
# Line 625 | Line 885 | begin
885      case Index of
886        0: Result := SIBDataSetEditor;
887        1: Result := SExecute;
888 <      2: Result := SInterbaseExpressVersion;
888 >      2: Result := SInterbaseExpressVersion ;
889      end;
890    end;
891   end;
# Line 682 | Line 942 | begin
942      Dec(Index, inherited GetVerbCount);
943      case Index of
944        0: Result := SIBDatabaseEditor;
945 <      1 : Result := SInterbaseExpressVersion;
945 >      1 : Result := SInterbaseExpressVersion ;
946      end;
947    end;
948   end;
# Line 705 | Line 965 | function TIBTransactionEditor.GetVerb(In
965   begin
966    case Index of
967      0: Result := SIBTransactionEditor;
968 <    1: Result := SInterbaseExpressVersion;
968 >    1: Result := SInterbaseExpressVersion ;
969    end;
970   end;
971  
# Line 727 | Line 987 | begin
987      Dec(Index, inherited GetVerbCount);
988      case Index of
989        0: Query.ExecSQL;
990 <      1: if ibselectsqleditor.EditSQL(Query.Database,Query.SQL) then Designer.Modified;
990 >      1: if ibselectsqleditor.EditSQL(Query,Query.SQL) then Designer.Modified;
991      end;
992    end;
993   end;
# Line 741 | Line 1001 | begin
1001      case Index of
1002        0: Result := SExecute;
1003        1: Result := SEditSQL;
1004 <      2: Result := SInterbaseExpressVersion;
1004 >      2: Result := SInterbaseExpressVersion ;
1005      end;
1006    end;
1007   end;
# Line 771 | Line 1031 | begin
1031      Dec(Index, inherited GetVerbCount);
1032      case Index of
1033        0: Result := SExecute;
1034 <      1: Result := SInterbaseExpressVersion;
1034 >      1: Result := SInterbaseExpressVersion ;
1035      end;
1036    end;
1037   end;
# Line 797 | Line 1057 | begin
1057    end;
1058    inherited Edit;
1059   end;
1060 < (*
1060 >
1061   { TIBTableFieldLinkProperty }
1062  
1063   procedure TIBTableFieldLinkProperty.Edit;
1064   begin
1065    FTable := DataSet as TIBTable;
1066 +  if assigned(FTable.Database) then
1067 +    FTable.Database.Connected := true;
1068    inherited Edit;
1069   end;
1070  
1071 + function TIBTableFieldLinkProperty.GetIndexDefs: TIndexDefs;
1072 + begin
1073 +  Result :=  FTable.IndexDefs
1074 + end;
1075 +
1076   function TIBTableFieldLinkProperty.GetIndexFieldNames: string;
1077   begin
1078    Result := FTable.IndexFieldNames;
# Line 824 | Line 1091 | end;
1091   procedure TIBTableFieldLinkProperty.SetMasterFields(const Value: string);
1092   begin
1093    FTable.MasterFields := Value;
1094 < end;*)
1094 > end;
1095  
1096   { TIBUpdateSQLProperty }
1097  
# Line 833 | Line 1100 | var
1100    IBDataset: TIBDataset;
1101   begin
1102    IBDataset := GetComponent(0) as TIBDataset;
1103 <  if IBModifySQLEditor.EditSQL(IBDataSet.Database,IBDataSet.ModifySQL) then Modified;
1103 >  if IBModifySQLEditor.EditSQL(IBDataSet,IBDataSet.ModifySQL) then Modified;
1104   end;
1105  
1106   { TIBUpdateSQLUpdateProperty }
# Line 841 | Line 1108 | end;
1108   procedure TIBUpdateSQLUpdateProperty.Edit;
1109   begin
1110    GetObjects;
1111 <  if IBModifySQLEditor.EditSQL(FDatabase,FIBUpdateSQL.ModifySQL) then Modified;
1111 >  if IBModifySQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.ModifySQL) then Modified;
1112   end;
1113  
1114   { TIBRefreshSQLProperty }
# Line 849 | Line 1116 | end;
1116   procedure TIBRefreshSQLProperty.Edit;
1117   var
1118    IBDataset: TIBDataset;
852  aDatabase: TIBDatabase;
1119   begin
1120    IBDataset := GetComponent(0) as TIBDataset;
1121 <  if IBRefreshSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.RefreshSQL) then Modified;
1121 >  if IBRefreshSQLEditor.EditSQL(IBDataSet,IBDataSet.RefreshSQL) then Modified;
1122   end;
1123  
1124   { TIBUpdateSQLRefreshSQLProperty }
# Line 860 | Line 1126 | end;
1126   procedure TIBUpdateSQLRefreshSQLProperty.Edit;
1127   begin
1128    GetObjects;
1129 <  if IBRefreshSQLEditor.EditSQL(FDatabase,FIBUpdateSQL.RefreshSQL) then Modified;
1129 >  if IBRefreshSQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.RefreshSQL) then Modified;
1130   end;
1131  
1132   { TIBDeleteSQLProperty }
1133  
1134   procedure TIBDeleteSQLProperty.Edit;
1135   var
1136 <  IBDataset: TIBDataset;
1136 >  IBDataset: TIBDataSet;
1137   begin
1138 <  IBDataset := GetComponent(0) as TIBDataset;
1139 <  if IBDeleteSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.DeleteSQL) then Modified;
1138 >  IBDataset := GetComponent(0) as TIBDataSet;
1139 >  if IBDeleteSQLEditor.EditSQL(IBDataSet,IBDataSet.DeleteSQL) then Modified;
1140   end;
1141  
1142   { TIBUpdateSQLDeleteProperty }
# Line 883 | Line 1149 | end;
1149   procedure TIBUpdateSQLDeleteProperty.Edit;
1150   begin
1151    GetObjects;
1152 <  if IBDeleteSQLEditor.EditSQL(FDatabase,FIBUpdateSQL.DeleteSQL) then Modified;
1152 >  if IBDeleteSQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.DeleteSQL) then Modified;
1153   end;
1154  
1155   { TUpdateSQLPropertyEditor }
# Line 906 | Line 1172 | end;
1172  
1173   procedure TIBInsertSQLProperty.Edit;
1174   var
1175 <  IBDataset: TIBDataset;
1175 >  IBDataset: TIBDataSet;
1176   begin
1177 <  IBDataset := GetComponent(0) as TIBDataset;
1178 <  if IBInsertSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.InsertSQL) then Modified;
1177 >  IBDataset := GetComponent(0) as TIBDataSet;
1178 >  if IBInsertSQLEditor.EditSQL(IBDataSet,IBDataSet.InsertSQL) then Modified;
1179   end;
1180  
1181   { TIBUpdateSQLInsertSQLProperty }
# Line 917 | Line 1183 | end;
1183   procedure TIBUpdateSQLInsertSQLProperty.Edit;
1184   begin
1185    GetObjects;
1186 <  if IBInsertSQLEditor.EditSQL(FDatabase,FIBUpdateSQL.InsertSQL) then Modified;
1186 >  if IBInsertSQLEditor.EditSQL(FIBUpdateSQL.Dataset,FIBUpdateSQL.InsertSQL) then Modified;
1187   end;
1188  
1189   { TIBGeneratorProperty }
# Line 936 | Line 1202 | end;
1202  
1203   procedure TIBSQLEditor.ExecuteVerb(Index: Integer);
1204   begin
1205 <  if IBSQLEditor.EditIBSQL(TIBSQL(Component)) then Modified;
1205 >  if IBSQLEditor.EditSQL(TIBSQL(Component)) then Modified;
1206   end;
1207  
1208   function TIBSQLEditor.GetVerb(Index: Integer): string;
1209   begin
1210    case Index of
1211      0 : Result := SIBSQLEditor;
1212 <    1: Result := SInterbaseExpressVersion;
1212 >    1: Result := SInterbaseExpressVersion ;
1213    end;
1214   end;
1215  
# Line 959 | Line 1225 | var
1225    IBSQL: TIBSQL;
1226   begin
1227    IBSQL := GetComponent(0) as TIBSQL;
1228 <  if IBSQLEditor.EditIBSQL(IBSQL) then Modified;
1228 >  if IBSQLEditor.EditSQL(IBSQL) then Modified;
1229   end;
1230  
1231   initialization

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines