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

Comparing ibx/trunk/design/IBDBReg.pas (file contents):
Revision 15 by tony, Thu Feb 28 16:56:14 2013 UTC vs.
Revision 143 by tony, Fri Feb 23 12:11:21 2018 UTC

# Line 27 | Line 27
27   {    IBX For Lazarus (Firebird Express)                                  }
28   {    Contributor: Tony Whyman, MWA Software http://www.mwasoftware.co.uk }
29   {    Portions created by MWA Software are copyright McCallum Whyman      }
30 < {    Associates Ltd 2011                                                 }
30 > {    Associates Ltd 2011 - 2018                                               }
31   {************************************************************************}
32  
33   unit IBDBReg;
# 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 84 | Line 83 | type
83      procedure GetValues(Proc: TGetStrProc); override;
84    end;
85  
86 +  { TIBPackageNameProperty
87 +    Editor for the TIBStoredProc.PackageName property.  Displays a drop-down list of all
88 +    the StoredProcedures in the Database.}
89 +  TIBPackageNameProperty = class(TIBNameProperty)
90 +  public
91 +    procedure GetValues(Proc: TGetStrProc); override;
92 +  end;
93 +
94    { TIBTableNameProperty
95      Editor for the TIBTable.TableName property.  Displays a drop-down list of all
96      the Tables in the Database.}
# Line 92 | Line 99 | type
99      procedure GetValues(Proc: TGetStrProc); override;
100    end;
101  
102 +  { TDBStringProperty }
103 +
104    TDBStringProperty = class(TStringProperty)
105 +  private
106 +    function ConnecttoDB: boolean;
107    public
108      function GetAttributes: TPropertyAttributes; override;
109      procedure GetValueList(List: TStrings); virtual;
110      procedure GetValues(Proc: TGetStrProc); override;
111 +    procedure Edit; override;
112    end;
113  
114 +  { TIBIndexFieldNamesProperty }
115 +
116    TIBIndexFieldNamesProperty = class(TDBStringProperty)
117    public
118      procedure GetValueList(List: TStrings); override;
# Line 126 | Line 140 | type
140      function GetVerbCount: Integer; override;
141    end;
142  
143 +  { TIBArrayGridEditor }
144 +
145 +  TIBArrayGridEditor = class(TComponentEditor)
146 +  public
147 +    procedure ExecuteVerb(Index: Integer); override;
148 +    function GetVerb(Index: Integer): string; override;
149 +    function GetVerbCount: Integer; override;
150 +  end;
151 +
152   { TIBQueryEditor }
153  
154    TIBQueryEditor = class(TFieldsComponentEditor)
# Line 181 | Line 204 | type
204    end;
205  
206    TIBStoredProcParamsProperty = class(TCollectionPropertyEditor)
184 –  public
185 –    procedure Edit; override;
207    end;
208 < (*
208 >
209 >  { TIBTableFieldLinkProperty }
210 >
211    TIBTableFieldLinkProperty = class(TFieldLinkProperty)
212    private
213      FTable: TIBTable;
214    protected
215 +    function GetIndexDefs: TIndexDefs; override;
216      function GetIndexFieldNames: string; override;
217      function GetMasterFields: string; override;
218      procedure SetIndexFieldNames(const Value: string); override;
# Line 196 | Line 220 | type
220    public
221      procedure Edit; override;
222    end;
223 < *)
223 >
224   { TSQLPropertyEditor }
225  
226    TSQLPropertyEditor = class(TStringsPropertyEditor)
# Line 298 | Line 322 | type
322      procedure Edit; override;
323    end;
324  
325 +  { TIBUpdateRefreshSQLProperty }
326 +
327 +  TIBUpdateRefreshSQLProperty = class(TSQLPropertyEditor)
328 +  protected
329 +    FIBUpdate: TIBUpdate;
330 +    FDatabase: TIBDatabase;
331 +    function GetObjects: boolean;
332 +  public
333 +    procedure Edit; override;
334 +  end;
335 +
336 +
337   { TIBEventListProperty }
338  
339    TIBEventListProperty = class(TClassProperty)
# Line 314 | Line 350 | type
350      procedure Edit; override;
351    end;
352  
353 +  { TDBDynamicGridFieldProperty }
354 +
355 +  TDBDynamicGridFieldProperty = class(TFieldProperty)
356 +  public
357 +    procedure FillValues(const Values: TStringList); override;
358 +  end;
359 +
360 +  { TDBLookupPropertiesGridFieldProperty }
361 +
362 +  TDBLookupPropertiesGridFieldProperty = class(TFieldProperty)
363 +  public
364 +    procedure FillValues(const Values: TStringList); override;
365 +  end;
366 +
367 +  { TIBTreeViewFieldProperty }
368 +
369 +  TIBTreeViewFieldProperty = class(TFieldProperty)
370 +  public
371 +    procedure FillValues(const Values: TStringList); override;
372 +  end;
373 +
374 +  { TIBDynamicGridIndexNamesProperty }
375 +
376 +  TIBDynamicGridIndexNamesProperty = class(TIndexFieldNamesProperty)
377 +  protected
378 +    function GetFieldDefs: TFieldDefs; override;
379 +    function GetIndexFieldNames: string; override;
380 +    procedure SetIndexFieldNames(const Value: string); override;
381 +  end;
382 +
383 +  { TIBFieldDefsProperty }
384 +
385 +  TIBFieldDefsProperty = class(TCollectionPropertyEditor)
386 +  public
387 +    procedure Edit; override;
388 +  end;
389 +
390 +  { TIBIndexDefsProperty }
391 +
392 +  TIBIndexDefsProperty = class(TCollectionPropertyEditor)
393 +  public
394 +    procedure Edit; override;
395 +  end;
396 +
397 +
398   procedure Register;
399  
400   implementation
401  
402 < uses IB, IBQuery, IBStoredProc, IBCustomDataSet,
403 <     IBIntf, IBSQL, IBSQLMonitor, IBDatabaseInfo, IBEvents,
402 > uses IB, IBQuery, IBStoredProc, IBCustomDataSet, FBMessages,
403 >     IBSQL, IBSQLMonitor, IBDatabaseInfo, IBEvents, IBTypes,
404       IBServices, IBDatabaseEdit, IBTransactionEdit,
405 <     IBBatchMove, DBLoginDlg, IBExtract,LResources, IBSelectSQLEditor,
405 >     IBBatchMove, IBExtract,LResources, IBSelectSQLEditor,
406       IBModifySQLEditor,IBDeleteSQLEditor,IBRefreshSQLEditor,
407       IBInsertSQLEditor, IBGeneratorEditor, IBUpdateSQLEditor, IBDataSetEditor,
408 <     IBSQLEditor, ibserviceeditor, LCLVersion;
409 <
410 <
408 >     IBSQLEditor, ibserviceeditor, LCLVersion, IBDynamicGrid, IBLookupComboEditBox,
409 >     IBTreeView, DBControlGrid, ibxscript, IBLocalDBSupport, IBDSDialogs,
410 >     IBArrayGrid, IBVersion, IBDataOutput;
411 >
412 > const
413 >  IBPalette1 = 'Firebird'; {do not localize}
414 >  IBPalette2 = 'Firebird Admin'; {do not localize}
415 >  IBPalette3 = 'Firebird Data Controls';   {do not localize}
416 >  
417 > resourcestring
418 >   SInterbaseExpressVersion = 'Firebird Express for Lazarus ' + IBX_VERSION;
419 >   SEditSQL = 'Edit SQL';
420 >   SIBSQLEditor = 'IBSQL Editor';
421 >   SIBServiceEditor = 'Edit IB Service';
422 >   SIBUpdateSQLEditor = '&UpdateSQL Editor...';
423 >   SIBDataSetEditor = '&Dataset Editor...';
424 >   SExecute = 'E&xecute';
425 >   SIBDatabaseEditor = 'Da&tabase Editor...';
426 >   SIBTransactionEditor = '&Transaction Editor...';
427 >   SIBUpdateLayout = 'Update Layout';
428  
429   procedure Register;
430   begin
# Line 336 | Line 434 | begin
434      Exit;
435    end;
436  
437 <  RegisterNoIcon([TIBStringField, TIBBCDField]);
437 >  RegisterNoIcon([TIBStringField, TIBBCDField, TIBMemoField, TIBArrayField,
438 >    TIBSmallintField, TIBIntegerField, TIBLargeIntField]);
439    {$if lcl_fullversion < 01010000}
440    {see http://bugs.freepascal.org/view.php?id=19035 }
441    RegisterNoIcon([TIntegerField]);
442    {$endif}
443    RegisterComponents(IBPalette1, [ TIBQuery, TIBDataSet,
444 <   TIBDatabase, TIBTransaction, TIBUpdateSQL, TIBEvents,
444 >   TIBDatabase, TIBTransaction, TIBUpdateSQL, TIBUpdate, TIBEvents,
445       TIBSQL, TIBDatabaseInfo, TIBSQLMonitor,
446 <       TIBStoredProc,TIBBatchMove,  TIBTable,TIBExtract]);
447 <  if IBServiceAPIPresent  then
446 >       TIBStoredProc,TIBBatchMove,  TIBTable,TIBExtract, TIBXScript, TIBLocalDBSupport,
447 >       TIBBlockFormatOut,TIBCSVDataOut,TIBInsertStmtsOut]);
448 >  if FirebirdAPI.HasServiceAPI  then
449      RegisterComponents(IBPalette2, [TIBConfigService, TIBBackupService,
450 <      TIBRestoreService, TIBValidationService, TIBStatisticalService,
450 >      TIBRestoreService, TIBValidationService, TIBOnlineValidationService, TIBStatisticalService,
451        TIBLogService, TIBSecurityService, TIBServerProperties]);
452 +
453 +
454 +  RegisterComponents(IBPalette3,[TIBLookupComboEditBox,TIBDynamicGrid,TIBTreeView,TDBControlGrid, TIBArrayGrid]);
455    RegisterPropertyEditor(TypeInfo(TIBFileName), TIBDatabase, 'DatabaseName', TIBFileNameProperty); {do not localize}
456    RegisterPropertyEditor(TypeInfo(string), TIBStoredProc, 'StoredProcName', TIBStoredProcNameProperty); {do not localize}
457 +  RegisterPropertyEditor(TypeInfo(string), TIBStoredProc, 'PackageName', TIBPackageNameProperty); {do not localize}
458    RegisterPropertyEditor(TypeInfo(TParams), TIBStoredProc, 'Params', TIBStoredProcParamsProperty);
459    RegisterPropertyEditor(TypeInfo(string), TIBTable, 'TableName', TIBTableNameProperty); {do not localize}
460    RegisterPropertyEditor(TypeInfo(string), TIBTable, 'IndexName', TIBIndexNameProperty); {do not localize}
461    RegisterPropertyEditor(TypeInfo(string), TIBTable, 'IndexFieldNames', TIBIndexFieldNamesProperty); {do not localize}
462 < //  RegisterPropertyEditor(TypeInfo(string), TIBTable, 'MasterFields', TIBTableFieldLinkProperty); {do not localize}
462 >  RegisterPropertyEditor(TypeInfo(string), TIBTable, 'MasterFields', TIBTableFieldLinkProperty); {do not localize}
463 >  RegisterPropertyEditor(TypeInfo(TFieldDefs), TIBTable, 'FieldDefs', TIBFieldDefsProperty); {do not localize}
464 >  RegisterPropertyEditor(TypeInfo(TIndexDefs), TIBTable, 'IndexDefs', TIBIndexDefsProperty); {do not localize}
465    RegisterPropertyEditor(TypeInfo(TStrings), TIBQuery, 'SQL', TIBQuerySQLProperty); {do not localize}
466    RegisterPropertyEditor(TypeInfo(TStrings), TIBDataSet, 'SelectSQL', TIBDatasetSQLProperty); {do not localize}
467    RegisterPropertyEditor(TypeInfo(TStrings), TIBDataSet, 'ModifySQL', TIBUpdateSQLProperty); {do not localize}
# Line 367 | Line 473 | begin
473    RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdateSQL, 'ModifySQL', TIBUpdateSQLUpdateProperty); {do not localize}
474    RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdateSQL, 'InsertSQL', TIBUpdateSQLInsertSQLProperty); {do not localize}
475    RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdateSQL, 'DeleteSQL', TIBUpdateSQLDeleteProperty); {do not localize}
476 +  RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdate, 'RefreshSQL', TIBUpdateRefreshSQLProperty); {do not localize}
477    RegisterPropertyEditor(TypeInfo(TStrings), TIBEvents, 'Events', TIBEventListProperty); {do not localize}
478    RegisterPropertyEditor(TypeInfo(TPersistent), TIBDataSet, 'GeneratorField', TIBGeneratorProperty);  {do not localize}
479    RegisterPropertyEditor(TypeInfo(TPersistent), TIBQuery, 'GeneratorField', TIBGeneratorProperty);  {do not localize}
480 +  RegisterPropertyEditor(TypeInfo(TPersistent), TIBTable, 'GeneratorField', TIBGeneratorProperty);  {do not localize}
481  
482    RegisterComponentEditor(TIBDatabase, TIBDatabaseEditor);
483    RegisterComponentEditor(TIBTransaction, TIBTransactionEditor);
# Line 379 | Line 487 | begin
487    RegisterComponentEditor(TIBStoredProc, TIBStoredProcEditor);
488    RegisterComponentEditor(TIBSQL, TIBSQLEditor);
489    RegisterComponentEditor(TIBCustomService, TIBServiceEditor);
490 +  RegisterComponentEditor(TIBArrayGrid, TIBArrayGridEditor);
491 +
492 +
493 +  {Firebird Data Access Controls}
494 +  RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'KeyField', TDBDynamicGridFieldProperty);
495 +  RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'ListField', TDBDynamicGridFieldProperty);
496 +  RegisterPropertyEditor(TypeInfo(string), TIBDynamicGrid, 'IndexFieldNames', TIBDynamicGridIndexNamesProperty);
497 +  RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'DataFieldName', TDBLookupPropertiesGridFieldProperty);
498 +  RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'KeyField', TIBTreeViewFieldProperty);
499 +  RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'TextField', TIBTreeViewFieldProperty);
500 +  RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'ParentField', TIBTreeViewFieldProperty);
501 +  RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'HasChildField', TIBTreeViewFieldProperty);
502 +  RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'ImageIndexField', TIBTreeViewFieldProperty);
503 +  RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'SelectedIndexField', TIBTreeViewFieldProperty);
504 +
505 +  IBGUIInterface :=  TIBDSLCLInterface.Create;
506 + end;
507 +
508 + procedure LoadDataSourceFields(DataSource: TDataSource; List: TStrings);
509 + var
510 +  DataSet: TDataSet;
511 +  i: Integer;
512 + begin
513 +  if Assigned(DataSource) then
514 +  begin
515 +    DataSet := DataSource.DataSet;
516 +    if Assigned(DataSet) then
517 +    begin
518 +      if DataSet.Fields.Count > 0 then
519 +        DataSet.GetFieldNames(List)
520 +      else
521 +      begin
522 +        DataSet.FieldDefs.Update;
523 +        for i := 0 to DataSet.FieldDefs.Count - 1 do
524 +          List.Add(DataSet.FieldDefs[i].Name);
525 +      end;
526 +    end;
527 +  end;
528 + end;
529 +
530 + { TIBUpdateRefreshSQLProperty }
531 +
532 + function TIBUpdateRefreshSQLProperty.GetObjects: boolean;
533 + begin
534 +  Result := false;
535 +  FIBUpdate := GetComponent(0) as TIBUpdate;
536 +  if not assigned(FIBUpdate) or not assigned(FIBUpdate.DataSet) then
537 +    Exit;
538 +  FDatabase := nil;
539 +  if FIBUpdate.DataSet is TIBQuery then
540 +  begin
541 +    FDatabase := (FIBUpdate.DataSet as TIBQuery).Database;
542 +    Result := true
543 +  end;
544 + end;
545 +
546 + procedure TIBUpdateRefreshSQLProperty.Edit;
547 + begin
548 +  GetObjects;
549 +  if IBRefreshSQLEditor.EditSQL(FIBUpdate.DataSet,FIBUpdate.RefreshSQL) then Modified;
550 + end;
551 +
552 + { TIBPackageNameProperty }
553 +
554 + procedure TIBPackageNameProperty.GetValues(Proc: TGetStrProc);
555 + var
556 +   StoredProc : TIBStoredProc;
557 +   i : integer;
558 + begin
559 +    StoredProc := GetComponent(0) as TIBStoredProc;
560 +    if StoredProc.Database = nil then
561 +      Exit;
562 +
563 +    with StoredProc do
564 +    try
565 +      for I := 0 to PackageNames.Count - 1 do
566 +        Proc (PackageNames[i]);
567 +    except on E: Exception do
568 +      MessageDlg(E.Message,mtError,[mbOK],0)
569 +    end;
570 + end;
571 +
572 + { TIBIndexDefsProperty }
573 +
574 + procedure TIBIndexDefsProperty.Edit;
575 + var IndexDefs: TIndexDefs;
576 + begin
577 +  IndexDefs := TIndexDefs(GetObjectValue);
578 +  if IndexDefs <> nil then
579 +    IndexDefs.Update;
580 +  inherited Edit;
581 + end;
582 +
583 + { TIBFieldDefsProperty }
584 +
585 + procedure TIBFieldDefsProperty.Edit;
586 + var FieldDefs: TFieldDefs;
587 + begin
588 +  FieldDefs := TFieldDefs(GetObjectValue);
589 +  if FieldDefs <> nil then
590 +    FieldDefs.Update;
591 +  inherited Edit;
592 + end;
593 +
594 + { TIBArrayGridEditor }
595 +
596 + procedure TIBArrayGridEditor.ExecuteVerb(Index: Integer);
597 + begin
598 +  if Index < inherited GetVerbCount then
599 +    inherited ExecuteVerb(Index)
600 +  else
601 +  case Index of
602 +    0: TIBArrayGrid(Component).UpdateLayout;
603 +  end;
604 + end;
605 +
606 + function TIBArrayGridEditor.GetVerb(Index: Integer): string;
607 + begin
608 +  if Index < inherited GetVerbCount then
609 +    Result := inherited GetVerb(Index) else
610 +  begin
611 +    Dec(Index, inherited GetVerbCount);
612 +    case Index of
613 +      0: Result := SIBUpdateLayout;
614 +      1 : Result := SInterbaseExpressVersion ;
615 +    end;
616 +  end;
617 + end;
618 +
619 + function TIBArrayGridEditor.GetVerbCount: Integer;
620 + begin
621 +  Result := 2;
622 + end;
623 +
624 + { TDBLookupPropertiesGridFieldProperty }
625 +
626 + procedure TDBLookupPropertiesGridFieldProperty.FillValues(
627 +  const Values: TStringList);
628 + var
629 +  P: TDBLookupProperties;
630 + begin
631 +  P :=TDBLookupProperties(GetComponent(0));
632 +  if not (P is TDBLookupProperties) then exit;
633 +  LoadDataSourceFields(TIBDynamicGrid(P.Owner.Grid).DataSource, Values);
634 + end;
635 +
636 + { TIBTreeViewFieldProperty }
637 +
638 + procedure TIBTreeViewFieldProperty.FillValues(const Values: TStringList);
639 + var ListSource: TDataSource;
640 + begin
641 +  ListSource :=  TIBTreeView(GetComponent(0)).DataSource;
642 +  LoadDataSourceFields(ListSource, Values);
643 + end;
644 +
645 + { TIBDynamicGridIndexNamesProperty }
646 +
647 + function TIBDynamicGridIndexNamesProperty.GetFieldDefs: TFieldDefs;
648 + var Grid: TIBDynamicGrid;
649 + begin
650 +  Result := nil;
651 +  Grid := TIBDynamicGrid(GetComponent(0));
652 +  if assigned(Grid.DataSource) and assigned(Grid.DataSource.DataSet) then
653 +     Result := Grid.DataSource.DataSet.FieldDefs
654 + end;
655 +
656 + function TIBDynamicGridIndexNamesProperty.GetIndexFieldNames: string;
657 + var Grid: TIBDynamicGrid;
658 + begin
659 +  Grid := TIBDynamicGrid(GetComponent(0));
660 +  Result := Grid.IndexFieldNames
661 + end;
662 +
663 + procedure TIBDynamicGridIndexNamesProperty.SetIndexFieldNames(
664 +  const Value: string);
665 + var Grid: TIBDynamicGrid;
666 + begin
667 +  Grid := TIBDynamicGrid(GetComponent(0));
668 +  Grid.IndexFieldNames := Value
669 + end;
670 +
671 + { TDBDynamicGridFieldProperty }
672 +
673 + procedure TDBDynamicGridFieldProperty.FillValues(const Values: TStringList);
674 + var
675 +  P: TDBLookupProperties;
676 + begin
677 +  P :=TDBLookupProperties(GetComponent(0));
678 +  if not (P is TDBLookupProperties) then exit;
679 +  LoadDataSourceFields(P.ListSource, Values);
680   end;
681  
682   { TIBServiceEditor }
# Line 463 | Line 761 | end;
761  
762   procedure TIBTableNameProperty.GetValues(Proc: TGetStrProc);
763   var
764 <   TableName : TIBTable;
764 >   Table : TIBTable;
765     i : integer;
766   begin
767 <  TableName := GetComponent(0) as TIBTable;
768 <  with TableName do
767 >  Table := GetComponent(0) as TIBTable;
768 >   if Table.Database = nil then
769 >      Exit;
770 >  with Table do
771      for I := 0 to TableNames.Count - 1 do
772        Proc (TableNames[i]);
773   end;
774  
775   { TDBStringProperty }
776  
777 + function TDBStringProperty.ConnecttoDB: boolean;
778 + var DataSet: TIBCustomDataSet;
779 + begin
780 +  Result := false;
781 +  DataSet := (GetComponent(0) as TIBCustomDataSet);
782 +  if assigned(Dataset.Database) then
783 +  begin
784 +    try
785 +      DataSet.Database.Connected := true;
786 +    except on E: Exception do
787 +      ShowMessage(E.Message)
788 +    end;
789 +    Result := DataSet.Database.Connected
790 +  end;
791 + end;
792 +
793   function TDBStringProperty.GetAttributes: TPropertyAttributes;
794   begin
795    Result := [paValueList, paSortList, paMultiSelect];
# Line 488 | Line 804 | var
804    I: Integer;
805    Values: TStringList;
806   begin
807 +  if not ConnecttoDB then Exit;
808    Values := TStringList.Create;
809    try
810      GetValueList(Values);
# Line 497 | Line 814 | begin
814    end;
815   end;
816  
817 + procedure TDBStringProperty.Edit;
818 + begin
819 +  if ConnecttoDB then
820 +    inherited Edit;
821 + end;
822 +
823   { Utility Functions }
824  
825   function GetPropertyValue(Instance: TPersistent; const PropName: string): TPersistent;
# Line 558 | Line 881 | var
881    Query: TIBQuery;
882   begin
883    Query := GetComponent(0) as TIBQuery;
884 <  if IBSelectSQLEditor.EditSQL(Query.Database,Query.SQL) then Modified;
884 >  if IBSelectSQLEditor.EditSQL(Query,Query.SQL) then Modified;
885   end;
886  
887   { TIBDatasetSQLProperty }
# Line 568 | Line 891 | var
891    IBDataset: TIBDataset;
892   begin
893    IBDataset := GetComponent(0) as TIBDataset;
894 <  if IBSelectSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.SelectSQL) then Modified;
894 >  if IBSelectSQLEditor.EditSQL(IBDataSet,IBDataSet.SelectSQL) then Modified;
895   end;
896  
897   { TIBSQLProperty }
# Line 578 | Line 901 | var
901    IBSQL: TIBSQL;
902   begin
903    IBSQL := GetComponent(0) as TIBSQL;
904 <  if IBSelectSQLEditor.EditSQL(IBSQL.Database,IBSQL.SQL) then Modified;
904 >  if IBSQLEditor.EditSQL(IBSQL) then Modified;
905   end;
906  
907   { TIBUpdateSQLEditor }
# Line 592 | Line 915 | function TIBUpdateSQLEditor.GetVerb(Inde
915   begin
916    case Index of
917      0 : Result := SIBUpdateSQLEditor;
918 <    1: Result := SInterbaseExpressVersion;
918 >    1: Result := SInterbaseExpressVersion ;
919    end;
920   end;
921  
# Line 604 | Line 927 | end;
927   { TIBDataSetEditor }
928  
929   procedure TIBDataSetEditor.ExecuteVerb(Index: Integer);
607 – var
608 –  IBDataset: TIBDataset;
930   begin
931    if Index < inherited GetVerbCount then
932      inherited ExecuteVerb(Index) else
# Line 629 | Line 950 | begin
950      case Index of
951        0: Result := SIBDataSetEditor;
952        1: Result := SExecute;
953 <      2: Result := SInterbaseExpressVersion;
953 >      2: Result := SInterbaseExpressVersion ;
954      end;
955    end;
956   end;
# Line 686 | Line 1007 | begin
1007      Dec(Index, inherited GetVerbCount);
1008      case Index of
1009        0: Result := SIBDatabaseEditor;
1010 <      1 : Result := SInterbaseExpressVersion;
1010 >      1 : Result := SInterbaseExpressVersion ;
1011      end;
1012    end;
1013   end;
# Line 709 | Line 1030 | function TIBTransactionEditor.GetVerb(In
1030   begin
1031    case Index of
1032      0: Result := SIBTransactionEditor;
1033 <    1: Result := SInterbaseExpressVersion;
1033 >    1: Result := SInterbaseExpressVersion ;
1034    end;
1035   end;
1036  
# Line 731 | Line 1052 | begin
1052      Dec(Index, inherited GetVerbCount);
1053      case Index of
1054        0: Query.ExecSQL;
1055 <      1: if ibselectsqleditor.EditSQL(Query.Database,Query.SQL) then Designer.Modified;
1055 >      1: if ibselectsqleditor.EditSQL(Query,Query.SQL) then Designer.Modified;
1056      end;
1057    end;
1058   end;
# Line 745 | Line 1066 | begin
1066      case Index of
1067        0: Result := SExecute;
1068        1: Result := SEditSQL;
1069 <      2: Result := SInterbaseExpressVersion;
1069 >      2: Result := SInterbaseExpressVersion ;
1070      end;
1071    end;
1072   end;
# Line 775 | Line 1096 | begin
1096      Dec(Index, inherited GetVerbCount);
1097      case Index of
1098        0: Result := SExecute;
1099 <      1: Result := SInterbaseExpressVersion;
1099 >      1: Result := SInterbaseExpressVersion ;
1100      end;
1101    end;
1102   end;
# Line 785 | Line 1106 | begin
1106    Result := inherited GetVerbCount + 2;
1107   end;
1108  
788 – { TIBStoredProcParamsProperty }
789 –
790 – procedure TIBStoredProcParamsProperty.Edit;
791 – var
792 –  StoredProc: TIBStoredProc;
793 –  Params: TParams;
794 – begin
795 –  StoredProc := (GetComponent(0) as TIBStoredProc);
796 –  Params := TParams.Create(nil);
797 –  try
798 –    StoredProc.CopyParams(Params);
799 –  finally
800 –    Params.Free;
801 –  end;
802 –  inherited Edit;
803 – end;
804 – (*
1109   { TIBTableFieldLinkProperty }
1110  
1111   procedure TIBTableFieldLinkProperty.Edit;
1112   begin
1113    FTable := DataSet as TIBTable;
1114 +  if assigned(FTable.Database) then
1115 +    FTable.Database.Connected := true;
1116    inherited Edit;
1117   end;
1118  
1119 + function TIBTableFieldLinkProperty.GetIndexDefs: TIndexDefs;
1120 + begin
1121 +  Result :=  FTable.IndexDefs
1122 + end;
1123 +
1124   function TIBTableFieldLinkProperty.GetIndexFieldNames: string;
1125   begin
1126    Result := FTable.IndexFieldNames;
# Line 828 | Line 1139 | end;
1139   procedure TIBTableFieldLinkProperty.SetMasterFields(const Value: string);
1140   begin
1141    FTable.MasterFields := Value;
1142 < end;*)
1142 > end;
1143  
1144   { TIBUpdateSQLProperty }
1145  
# Line 837 | Line 1148 | var
1148    IBDataset: TIBDataset;
1149   begin
1150    IBDataset := GetComponent(0) as TIBDataset;
1151 <  if IBModifySQLEditor.EditSQL(IBDataSet.Database,IBDataSet.ModifySQL) then Modified;
1151 >  if IBModifySQLEditor.EditSQL(IBDataSet,IBDataSet.ModifySQL) then Modified;
1152   end;
1153  
1154   { TIBUpdateSQLUpdateProperty }
# Line 845 | Line 1156 | end;
1156   procedure TIBUpdateSQLUpdateProperty.Edit;
1157   begin
1158    GetObjects;
1159 <  if IBModifySQLEditor.EditSQL(FDatabase,FIBUpdateSQL.ModifySQL) then Modified;
1159 >  if IBModifySQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.ModifySQL) then Modified;
1160   end;
1161  
1162   { TIBRefreshSQLProperty }
# Line 853 | Line 1164 | end;
1164   procedure TIBRefreshSQLProperty.Edit;
1165   var
1166    IBDataset: TIBDataset;
856 –  aDatabase: TIBDatabase;
1167   begin
1168    IBDataset := GetComponent(0) as TIBDataset;
1169 <  if IBRefreshSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.RefreshSQL) then Modified;
1169 >  if IBRefreshSQLEditor.EditSQL(IBDataSet,IBDataSet.RefreshSQL) then Modified;
1170   end;
1171  
1172   { TIBUpdateSQLRefreshSQLProperty }
# Line 864 | Line 1174 | end;
1174   procedure TIBUpdateSQLRefreshSQLProperty.Edit;
1175   begin
1176    GetObjects;
1177 <  if IBRefreshSQLEditor.EditSQL(FDatabase,FIBUpdateSQL.RefreshSQL) then Modified;
1177 >  if IBRefreshSQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.RefreshSQL) then Modified;
1178   end;
1179  
1180   { TIBDeleteSQLProperty }
1181  
1182   procedure TIBDeleteSQLProperty.Edit;
1183   var
1184 <  IBDataset: TIBDataset;
1184 >  IBDataset: TIBDataSet;
1185   begin
1186 <  IBDataset := GetComponent(0) as TIBDataset;
1187 <  if IBDeleteSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.DeleteSQL) then Modified;
1186 >  IBDataset := GetComponent(0) as TIBDataSet;
1187 >  if IBDeleteSQLEditor.EditSQL(IBDataSet,IBDataSet.DeleteSQL) then Modified;
1188   end;
1189  
1190   { TIBUpdateSQLDeleteProperty }
# Line 887 | Line 1197 | end;
1197   procedure TIBUpdateSQLDeleteProperty.Edit;
1198   begin
1199    GetObjects;
1200 <  if IBDeleteSQLEditor.EditSQL(FDatabase,FIBUpdateSQL.DeleteSQL) then Modified;
1200 >  if IBDeleteSQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.DeleteSQL) then Modified;
1201   end;
1202  
1203   { TUpdateSQLPropertyEditor }
# Line 910 | Line 1220 | end;
1220  
1221   procedure TIBInsertSQLProperty.Edit;
1222   var
1223 <  IBDataset: TIBDataset;
1223 >  IBDataset: TIBDataSet;
1224   begin
1225 <  IBDataset := GetComponent(0) as TIBDataset;
1226 <  if IBInsertSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.InsertSQL) then Modified;
1225 >  IBDataset := GetComponent(0) as TIBDataSet;
1226 >  if IBInsertSQLEditor.EditSQL(IBDataSet,IBDataSet.InsertSQL) then Modified;
1227   end;
1228  
1229   { TIBUpdateSQLInsertSQLProperty }
# Line 921 | Line 1231 | end;
1231   procedure TIBUpdateSQLInsertSQLProperty.Edit;
1232   begin
1233    GetObjects;
1234 <  if IBInsertSQLEditor.EditSQL(FDatabase,FIBUpdateSQL.InsertSQL) then Modified;
1234 >  if IBInsertSQLEditor.EditSQL(FIBUpdateSQL.Dataset,FIBUpdateSQL.InsertSQL) then Modified;
1235   end;
1236  
1237   { TIBGeneratorProperty }
# Line 940 | Line 1250 | end;
1250  
1251   procedure TIBSQLEditor.ExecuteVerb(Index: Integer);
1252   begin
1253 <  if IBSQLEditor.EditIBSQL(TIBSQL(Component)) then Modified;
1253 >  if IBSQLEditor.EditSQL(TIBSQL(Component)) then Modified;
1254   end;
1255  
1256   function TIBSQLEditor.GetVerb(Index: Integer): string;
1257   begin
1258    case Index of
1259      0 : Result := SIBSQLEditor;
1260 <    1: Result := SInterbaseExpressVersion;
1260 >    1: Result := SInterbaseExpressVersion ;
1261    end;
1262   end;
1263  
# Line 963 | Line 1273 | var
1273    IBSQL: TIBSQL;
1274   begin
1275    IBSQL := GetComponent(0) as TIBSQL;
1276 <  if IBSQLEditor.EditIBSQL(IBSQL) then Modified;
1276 >  if IBSQLEditor.EditSQL(IBSQL) then Modified;
1277   end;
1278  
1279   initialization

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines