ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/public/ibx/trunk/design/IBDBReg.pas

Comparing ibx/trunk/design/IBDBReg.pas (file contents):
Revision 5 by tony, Fri Feb 18 16:26:16 2011 UTC vs.
Revision 45 by tony, Tue Dec 6 10:33:46 2016 UTC

#	Line 24 | Line 24
24		{       Corporation. All Rights Reserved.                                }
25		{    Contributor(s): Jeff Overcash                                       }
26		{                                                                        }
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                                                 }
31		{************************************************************************}
32
33		unit IBDBReg;
#	Line 35 | Line 39 | unit IBDBReg;
39		*)
40		{$A+}                           (* Aligned records: On *)
41		{$B-}                           (* Short circuit boolean expressions: Off *)
38	–	{$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 43 | Line 46 | unit IBDBReg;
46		{$Q-}                           (* Overflow checks: Off *)
47		{$R-}                           (* Range checks: Off *)
48		{$T+}                           (* Typed address: On *)
46	–	{$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,
56	<	DB, IBTable, IBDatabase,  IBEventsEditor,
57	<	IBUpdateSQL, IBXConst, ComponentEditors, PropEdits, DBPropEdits, FieldsEditor;
55	>	uses SysUtils, Classes, Graphics, Dialogs, Controls, Forms, TypInfo,
56	>	DB, IBTable, IBDatabase,  IBEventsEditor,  LazarusPackageIntf,
57	>	IBUpdateSQL, ComponentEditors, PropEdits, DBPropEdits, FieldsEditor,
58	>	dbFieldLinkPropEditor, dbFieldListPropEditor, IBDialogs;
59
60		type
61
#	Line 88 | 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 122 | 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(TComponentEditor)
146	>	TIBQueryEditor = class(TFieldsComponentEditor)
147		public
148		procedure ExecuteVerb(Index: Integer); override;
149		function GetVerb(Index: Integer): string; override;
#	Line 133 | Line 152 | type
152
153		{ TIBStoredProcEditor }
154
155	<	TIBStoredProcEditor = class(TComponentEditor)
155	>	TIBStoredProcEditor = class(TFieldsComponentEditor)
156		public
157		procedure ExecuteVerb(Index: Integer); override;
158		function GetVerb(Index: Integer): string; override;
#	Line 142 | Line 161 | type
161
162		{ TIBDataSetEditor }
163
164	<	TIBDataSetEditor = class(TComponentEditor)
164	>	TIBDataSetEditor = class(TFieldsComponentEditor)
165		public
166		procedure ExecuteVerb(Index: Integer); override;
167		function GetVerb(Index: Integer): string; override;
#	Line 158 | Line 177 | type
177		function GetVerbCount: Integer; override;
178		end;
179
180	+	{ TIBSQLEditor }
181	+
182	+	TIBSQLEditor  = class(TComponentEditor)
183	+	public
184	+	procedure ExecuteVerb(Index: Integer); override;
185	+	function GetVerb(Index: Integer): string; override;
186	+	function GetVerbCount: Integer; override;
187	+	end;
188	+
189	+	{ TIBServiceEditor}
190	+
191	+	TIBServiceEditor = class(TComponentEditor)
192	+	public
193	+	procedure ExecuteVerb(Index: Integer); override;
194	+	function GetVerb(Index: Integer): string; override;
195	+	function GetVerbCount: Integer; override;
196	+	end;
197	+
198		TIBStoredProcParamsProperty = class(TCollectionPropertyEditor)
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 174 | Line 214 | type
214		public
215		procedure Edit; override;
216		end;
217	<	*)
217	>
218		{ TSQLPropertyEditor }
219
220		TSQLPropertyEditor = class(TStringsPropertyEditor)
#	Line 189 | Line 229 | type
229		procedure Edit; override;
230		end;
231
232	+	{TIBSQLSQLPropertyEditor }
233	+
234	+	TIBSQLSQLPropertyEditor = class(TSQLPropertyEditor)
235	+	public
236	+	procedure Edit; override;
237	+	end;
238	+
239		{ TIBDatasetSQLProperty }
240
241		TIBDatasetSQLProperty = class(TSQLPropertyEditor)
#	Line 285 | 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,
386	<	IBServices, (*IBInstall,*) IBDatabaseEdit, IBTransactionEdit,
387	<	IBBatchMove, DBLoginDlg, IBExtract,LResources, IBSelectSQLEditor,
384	>	uses IB, IBQuery, IBStoredProc, IBCustomDataSet, FBMessages,
385	>	IBSQL, IBSQLMonitor, IBDatabaseInfo, IBEvents, IBTypes,
386	>	IBServices, IBDatabaseEdit, IBTransactionEdit,
387	>	IBBatchMove, IBExtract,LResources, IBSelectSQLEditor,
388		IBModifySQLEditor,IBDeleteSQLEditor,IBRefreshSQLEditor,
389	<	IBInsertSQLEditor, IBGeneratorEditor, IBUpdateSQLEditor, IBDataSetEditor;
389	>	IBInsertSQLEditor, IBGeneratorEditor, IBUpdateSQLEditor, IBDataSetEditor,
390	>	IBSQLEditor, ibserviceeditor, LCLVersion, IBDynamicGrid, IBLookupComboEditBox,
391	>	IBTreeView, DBControlGrid, ibxscript, IBLocalDBSupport, IBDSDialogs,
392	>	IBArrayGrid;
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 2.0.0';
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	<	RegisterComponents(IBPalette1, [TIBTable, TIBQuery,
414	<	TIBStoredProc, TIBDatabase, TIBTransaction, TIBUpdateSQL, TIBBatchMove,
415	<	TIBDataSet, TIBSQL, TIBDatabaseInfo, (*TIBSQLMonitor,*) TIBEvents, TIBExtract]);
416	<	if (TryIBLoad) and IBServiceAPIPresent  then
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, TIBMemoField, TIBArrayField]);
420	>	{$if lcl_fullversion < 01010000}
421	>	{see http://bugs.freepascal.org/view.php?id=19035 }
422	>	RegisterNoIcon([TIntegerField]);
423	>	{$endif}
424	>	RegisterComponents(IBPalette1, [ TIBQuery, TIBDataSet,
425	>	TIBDatabase, TIBTransaction, TIBUpdateSQL, TIBEvents,
426	>	TIBSQL, TIBDatabaseInfo, TIBSQLMonitor,
427	>	TIBStoredProc,TIBBatchMove,  TIBTable,TIBExtract, TIBXScript, TIBLocalDBSupport]);
428	>	if FirebirdAPI.HasServiceAPI  then
429		RegisterComponents(IBPalette2, [TIBConfigService, TIBBackupService,
430		TIBRestoreService, TIBValidationService, TIBStatisticalService,
431		TIBLogService, TIBSecurityService, TIBServerProperties]);
432	<	RegisterClasses([TIBStringField, TIBBCDField]);
433	<	//  RegisterFields([TIBStringField, TIBBCDField]); --not sure if this is needed in lazarus
432	>
433	>
434	>	RegisterComponents(IBPalette3,[TIBLookupComboEditBox,TIBDynamicGrid,TIBTreeView,TDBControlGrid, TIBArrayGrid]);
435		RegisterPropertyEditor(TypeInfo(TIBFileName), TIBDatabase, 'DatabaseName', TIBFileNameProperty); {do not localize}
436		RegisterPropertyEditor(TypeInfo(string), TIBStoredProc, 'StoredProcName', TIBStoredProcNameProperty); {do not localize}
437		RegisterPropertyEditor(TypeInfo(TParams), TIBStoredProc, 'Params', TIBStoredProcParamsProperty);
438		RegisterPropertyEditor(TypeInfo(string), TIBTable, 'TableName', TIBTableNameProperty); {do not localize}
439		RegisterPropertyEditor(TypeInfo(string), TIBTable, 'IndexName', TIBIndexNameProperty); {do not localize}
440		RegisterPropertyEditor(TypeInfo(string), TIBTable, 'IndexFieldNames', TIBIndexFieldNamesProperty); {do not localize}
441	<	//  RegisterPropertyEditor(TypeInfo(string), TIBTable, 'MasterFields', TIBTableFieldLinkProperty); {do not localize}
441	>	RegisterPropertyEditor(TypeInfo(string), TIBTable, 'MasterFields', TIBTableFieldLinkProperty); {do not localize}
442	>	RegisterPropertyEditor(TypeInfo(TFieldDefs), TIBTable, 'FieldDefs', TIBFieldDefsProperty); {do not localize}
443	>	RegisterPropertyEditor(TypeInfo(TIndexDefs), TIBTable, 'IndexDefs', TIBIndexDefsProperty); {do not localize}
444		RegisterPropertyEditor(TypeInfo(TStrings), TIBQuery, 'SQL', TIBQuerySQLProperty); {do not localize}
445		RegisterPropertyEditor(TypeInfo(TStrings), TIBDataSet, 'SelectSQL', TIBDatasetSQLProperty); {do not localize}
446		RegisterPropertyEditor(TypeInfo(TStrings), TIBDataSet, 'ModifySQL', TIBUpdateSQLProperty); {do not localize}
447		RegisterPropertyEditor(TypeInfo(TStrings), TIBDataSet, 'InsertSQL', TIBInsertSQLProperty); {do not localize}
448		RegisterPropertyEditor(TypeInfo(TStrings), TIBDataSet, 'RefreshSQL', TIBRefreshSQLProperty); {do not localize}
449		RegisterPropertyEditor(TypeInfo(TStrings), TIBDataSet, 'DeleteSQL', TIBDeleteSQLProperty); {do not localize}
450	<	RegisterPropertyEditor(TypeInfo(TStrings), TIBSQL, 'SQL', TIBSQLProperty); {do not localize}
450	>	RegisterPropertyEditor(TypeInfo(TStrings), TIBSQL, 'SQL', TIBSQLSQLPropertyEditor); {do not localize}
451		RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdateSQL, 'RefreshSQL', TIBUpdateSQLRefreshSQLProperty); {do not localize}
452		RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdateSQL, 'ModifySQL', TIBUpdateSQLUpdateProperty); {do not localize}
453		RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdateSQL, 'InsertSQL', TIBUpdateSQLInsertSQLProperty); {do not localize}
454		RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdateSQL, 'DeleteSQL', TIBUpdateSQLDeleteProperty); {do not localize}
455		RegisterPropertyEditor(TypeInfo(TStrings), TIBEvents, 'Events', TIBEventListProperty); {do not localize}
456	<	RegisterPropertyEditor(TypeInfo(TPersistent), TIBDataSet, 'Generator', TIBGeneratorProperty);  {do not localize}
456	>	RegisterPropertyEditor(TypeInfo(TPersistent), TIBDataSet, 'GeneratorField', TIBGeneratorProperty);  {do not localize}
457	>	RegisterPropertyEditor(TypeInfo(TPersistent), TIBQuery, 'GeneratorField', TIBGeneratorProperty);  {do not localize}
458
459		RegisterComponentEditor(TIBDatabase, TIBDatabaseEditor);
460		RegisterComponentEditor(TIBTransaction, TIBTransactionEditor);
#	Line 334 | Line 462 | begin
462		RegisterComponentEditor(TIBDataSet, TIBDataSetEditor);
463		RegisterComponentEditor(TIBQuery, TIBQueryEditor);
464		RegisterComponentEditor(TIBStoredProc, TIBStoredProcEditor);
465	+	RegisterComponentEditor(TIBSQL, TIBSQLEditor);
466	+	RegisterComponentEditor(TIBCustomService, TIBServiceEditor);
467	+	RegisterComponentEditor(TIBArrayGrid, TIBArrayGridEditor);
468	+
469	+
470	+	{Firebird Data Access Controls}
471	+	RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'KeyField', TDBDynamicGridFieldProperty);
472	+	RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'ListField', TDBDynamicGridFieldProperty);
473	+	RegisterPropertyEditor(TypeInfo(string), TIBDynamicGrid, 'IndexFieldNames', TIBDynamicGridIndexNamesProperty);
474	+	RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'DataFieldName', TDBLookupPropertiesGridFieldProperty);
475	+	RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'KeyField', TIBTreeViewFieldProperty);
476	+	RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'TextField', TIBTreeViewFieldProperty);
477	+	RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'ParentField', TIBTreeViewFieldProperty);
478	+	RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'HasChildField', TIBTreeViewFieldProperty);
479	+
480	+	IBGUIInterface :=  TIBDSLCLInterface.Create;
481	+	end;
482	+
483	+	procedure LoadDataSourceFields(DataSource: TDataSource; List: TStrings);
484	+	var
485	+	DataSet: TDataSet;
486	+	i: Integer;
487	+	begin
488	+	if Assigned(DataSource) then
489	+	begin
490	+	DataSet := DataSource.DataSet;
491	+	if Assigned(DataSet) then
492	+	begin
493	+	if DataSet.Fields.Count > 0 then
494	+	DataSet.GetFieldNames(List)
495	+	else
496	+	begin
497	+	DataSet.FieldDefs.Update;
498	+	for i := 0 to DataSet.FieldDefs.Count - 1 do
499	+	List.Add(DataSet.FieldDefs[i].Name);
500	+	end;
501	+	end;
502	+	end;
503	+	end;
504	+
505	+	{ TIBIndexDefsProperty }
506	+
507	+	procedure TIBIndexDefsProperty.Edit;
508	+	var IndexDefs: TIndexDefs;
509	+	begin
510	+	IndexDefs := TIndexDefs(GetObjectValue);
511	+	if IndexDefs <> nil then
512	+	IndexDefs.Update;
513	+	inherited Edit;
514	+	end;
515	+
516	+	{ TIBFieldDefsProperty }
517	+
518	+	procedure TIBFieldDefsProperty.Edit;
519	+	var FieldDefs: TFieldDefs;
520	+	begin
521	+	FieldDefs := TFieldDefs(GetObjectValue);
522	+	if FieldDefs <> nil then
523	+	FieldDefs.Update;
524	+	inherited Edit;
525	+	end;
526	+
527	+	{ TIBArrayGridEditor }
528	+
529	+	procedure TIBArrayGridEditor.ExecuteVerb(Index: Integer);
530	+	begin
531	+	if Index < inherited GetVerbCount then
532	+	inherited ExecuteVerb(Index)
533	+	else
534	+	case Index of
535	+	0: TIBArrayGrid(Component).UpdateLayout;
536	+	end;
537	+	end;
538	+
539	+	function TIBArrayGridEditor.GetVerb(Index: Integer): string;
540	+	begin
541	+	if Index < inherited GetVerbCount then
542	+	Result := inherited GetVerb(Index) else
543	+	begin
544	+	Dec(Index, inherited GetVerbCount);
545	+	case Index of
546	+	0: Result := SIBUpdateLayout;
547	+	1 : Result := SInterbaseExpressVersion ;
548	+	end;
549	+	end;
550	+	end;
551	+
552	+	function TIBArrayGridEditor.GetVerbCount: Integer;
553	+	begin
554	+	Result := 2;
555	+	end;
556	+
557	+	{ TDBLookupPropertiesGridFieldProperty }
558	+
559	+	procedure TDBLookupPropertiesGridFieldProperty.FillValues(
560	+	const Values: TStringList);
561	+	var
562	+	P: TDBLookupProperties;
563	+	begin
564	+	P :=TDBLookupProperties(GetComponent(0));
565	+	if not (P is TDBLookupProperties) then exit;
566	+	LoadDataSourceFields(TIBDynamicGrid(P.Owner.Grid).DataSource, Values);
567	+	end;
568	+
569	+	{ TIBTreeViewFieldProperty }
570	+
571	+	procedure TIBTreeViewFieldProperty.FillValues(const Values: TStringList);
572	+	var ListSource: TDataSource;
573	+	begin
574	+	ListSource :=  TIBTreeView(GetComponent(0)).DataSource;
575	+	LoadDataSourceFields(ListSource, Values);
576	+	end;
577	+
578	+	{ TIBDynamicGridIndexNamesProperty }
579	+
580	+	function TIBDynamicGridIndexNamesProperty.GetFieldDefs: TFieldDefs;
581	+	var Grid: TIBDynamicGrid;
582	+	begin
583	+	Result := nil;
584	+	Grid := TIBDynamicGrid(GetComponent(0));
585	+	if assigned(Grid.DataSource) and assigned(Grid.DataSource.DataSet) then
586	+	Result := Grid.DataSource.DataSet.FieldDefs
587	+	end;
588	+
589	+	function TIBDynamicGridIndexNamesProperty.GetIndexFieldNames: string;
590	+	var Grid: TIBDynamicGrid;
591	+	begin
592	+	Grid := TIBDynamicGrid(GetComponent(0));
593	+	Result := Grid.IndexFieldNames
594	+	end;
595	+
596	+	procedure TIBDynamicGridIndexNamesProperty.SetIndexFieldNames(
597	+	const Value: string);
598	+	var Grid: TIBDynamicGrid;
599	+	begin
600	+	Grid := TIBDynamicGrid(GetComponent(0));
601	+	Grid.IndexFieldNames := Value
602	+	end;
603	+
604	+	{ TDBDynamicGridFieldProperty }
605	+
606	+	procedure TDBDynamicGridFieldProperty.FillValues(const Values: TStringList);
607	+	var
608	+	P: TDBLookupProperties;
609	+	begin
610	+	P :=TDBLookupProperties(GetComponent(0));
611	+	if not (P is TDBLookupProperties) then exit;
612	+	LoadDataSourceFields(P.ListSource, Values);
613	+	end;
614	+
615	+	{ TIBServiceEditor }
616	+
617	+	procedure TIBServiceEditor.ExecuteVerb(Index: Integer);
618	+	begin
619	+	if Index < inherited GetVerbCount then
620	+	inherited ExecuteVerb(Index) else
621	+	begin
622	+	Dec(Index, inherited GetVerbCount);
623	+	case Index of
624	+	0 : if ibserviceeditor.EditIBService(TIBCustomService(Component)) then Designer.Modified;
625	+	end;
626	+	end;
627	+	end;
628	+
629	+	function TIBServiceEditor.GetVerb(Index: Integer): string;
630	+	begin
631	+	if Index < inherited GetVerbCount then
632	+	Result := inherited GetVerb(Index) else
633	+	begin
634	+	Dec(Index, inherited GetVerbCount);
635	+	case Index of
636	+	0: Result := SIBServiceEditor;
637	+	1 : Result := SInterbaseExpressVersion;
638	+	end;
639	+	end;
640	+	end;
641	+
642	+	function TIBServiceEditor.GetVerbCount: Integer;
643	+	begin
644	+	Result := inherited GetVerbCount + 2;
645		end;
646
647		{ TIBFileNameProperty }
#	Line 342 | Line 650 | begin
650		with TOpenDialog.Create(Application) do
651		try
652		InitialDir := ExtractFilePath(GetStrValue);
653	<	Filter := 'Database Files|*.gdb'; {do not localize}
653	>	Filter := SDatabaseFilter; {do not localize}
654		if Execute then
655		SetStrValue(FileName);
656		finally
#	Line 370 | Line 678 | var
678		i : integer;
679		begin
680		StoredProc := GetComponent(0) as TIBStoredProc;
681	+	if StoredProc.Database = nil then
682	+	Exit;
683	+
684		with StoredProc do
685	+	try
686		for I := 0 to StoredProcedureNames.Count - 1 do
687		Proc (StoredProcedureNames[i]);
688	+	except on E: Exception do
689	+	MessageDlg(E.Message,mtError,[mbOK],0)
690	+	end;
691		end;
692
693		{ TIBTableNameProperty }
694
695		procedure TIBTableNameProperty.GetValues(Proc: TGetStrProc);
696		var
697	<	TableName : TIBTable;
697	>	Table : TIBTable;
698		i : integer;
699		begin
700	<	TableName := GetComponent(0) as TIBTable;
701	<	with TableName do
700	>	Table := GetComponent(0) as TIBTable;
701	>	if Table.Database = nil then
702	>	Exit;
703	>	with Table do
704		for I := 0 to TableNames.Count - 1 do
705		Proc (TableNames[i]);
706		end;
707
708		{ TDBStringProperty }
709
710	+	function TDBStringProperty.ConnecttoDB: boolean;
711	+	var DataSet: TIBCustomDataSet;
712	+	begin
713	+	Result := false;
714	+	DataSet := (GetComponent(0) as TIBCustomDataSet);
715	+	if assigned(Dataset.Database) then
716	+	begin
717	+	try
718	+	DataSet.Database.Connected := true;
719	+	except on E: Exception do
720	+	ShowMessage(E.Message)
721	+	end;
722	+	Result := DataSet.Database.Connected
723	+	end;
724	+	end;
725	+
726		function TDBStringProperty.GetAttributes: TPropertyAttributes;
727		begin
728		Result := [paValueList, paSortList, paMultiSelect];
#	Line 404 | Line 737 | var
737		I: Integer;
738		Values: TStringList;
739		begin
740	+	if not ConnecttoDB then Exit;
741		Values := TStringList.Create;
742		try
743		GetValueList(Values);
#	Line 413 | Line 747 | begin
747		end;
748		end;
749
750	+	procedure TDBStringProperty.Edit;
751	+	begin
752	+	if ConnecttoDB then
753	+	inherited Edit;
754	+	end;
755	+
756		{ Utility Functions }
757
758		function GetPropertyValue(Instance: TPersistent; const PropName: string): TPersistent;
#	Line 474 | Line 814 | var
814		Query: TIBQuery;
815		begin
816		Query := GetComponent(0) as TIBQuery;
817	<	if Assigned(Query.Database) and
478	<	IBSelectSQLEditor.EditSQL(Query.Database,Query.Transaction,Query.SQL) then Modified;
817	>	if IBSelectSQLEditor.EditSQL(Query,Query.SQL) then Modified;
818		end;
819
820		{ TIBDatasetSQLProperty }
#	Line 485 | Line 824 | var
824		IBDataset: TIBDataset;
825		begin
826		IBDataset := GetComponent(0) as TIBDataset;
827	<	if Assigned(IBDataSet.Database) and
489	<	IBSelectSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.Transaction,IBDataSet.SelectSQL) then Modified;
827	>	if IBSelectSQLEditor.EditSQL(IBDataSet,IBDataSet.SelectSQL) then Modified;
828		end;
829
830		{ TIBSQLProperty }
#	Line 496 | Line 834 | var
834		IBSQL: TIBSQL;
835		begin
836		IBSQL := GetComponent(0) as TIBSQL;
837	<	if IBSelectSQLEditor.EditSQL(IBSQL.Database,IBSQL.Transaction,IBSQL.SQL) then Modified;
837	>	if IBSQLEditor.EditIBSQL(IBSQL) then Modified;
838		end;
839
840		{ TIBUpdateSQLEditor }
#	Line 510 | Line 848 | function TIBUpdateSQLEditor.GetVerb(Inde
848		begin
849		case Index of
850		0 : Result := SIBUpdateSQLEditor;
851	<	1: Result := SInterbaseExpressVersion;
851	>	1: Result := SInterbaseExpressVersion ;
852		end;
853		end;
854
855		function TIBUpdateSQLEditor.GetVerbCount: Integer;
856		begin
857	<	Result := 2;
857	>	Result :=  2;
858		end;
859
860		{ TIBDataSetEditor }
861
862		procedure TIBDataSetEditor.ExecuteVerb(Index: Integer);
525	–	var
526	–	IBDataset: TIBDataset;
863		begin
864	+	if Index < inherited GetVerbCount then
865	+	inherited ExecuteVerb(Index) else
866	+	begin
867	+	Dec(Index, inherited GetVerbCount);
868		case Index of
869		0:
870		if IBDataSetEditor.EditIBDataSet(TIBDataSet(Component)) then
871		Designer.Modified;
872		1: (Component as TIBDataSet).ExecSQL;
873		end;
874	+	end;
875		end;
876
877		function TIBDataSetEditor.GetVerb(Index: Integer): string;
#	Line 542 | Line 883 | begin
883		case Index of
884		0: Result := SIBDataSetEditor;
885		1: Result := SExecute;
886	<	2: Result := SInterbaseExpressVersion;
886	>	2: Result := SInterbaseExpressVersion ;
887		end;
888		end;
889		end;
890
891		function TIBDataSetEditor.GetVerbCount: Integer;
892		begin
893	<	Result := 3;
893	>	Result := inherited GetVerbCount + 3;
894		end;
895
896		{ TIBEventListProperty }
#	Line 568 | Line 909 | begin
909		Events := TStringList.Create;
910		try
911		Events.Assign( IBEvents.Events);
912	<	if EditAlerterEvents( Events) then IBEvents.Events.Assign(Events);
912	>	if EditAlerterEvents( Events) then
913	>	begin
914	>	IBEvents.Events.Assign(Events);
915	>	Modified
916	>	end;
917		finally
918		Events.Free;
919		end;
#	Line 595 | Line 940 | begin
940		Dec(Index, inherited GetVerbCount);
941		case Index of
942		0: Result := SIBDatabaseEditor;
943	<	1 : Result := SInterbaseExpressVersion;
943	>	1 : Result := SInterbaseExpressVersion ;
944		end;
945		end;
946		end;
#	Line 618 | Line 963 | function TIBTransactionEditor.GetVerb(In
963		begin
964		case Index of
965		0: Result := SIBTransactionEditor;
966	<	1: Result := SInterbaseExpressVersion;
966	>	1: Result := SInterbaseExpressVersion ;
967		end;
968		end;
969
#	Line 633 | Line 978 | procedure TIBQueryEditor.ExecuteVerb(Ind
978		var
979		Query: TIBQuery;
980		begin
981	+	if Index < inherited GetVerbCount then
982	+	inherited ExecuteVerb(Index) else
983	+	begin
984		Query := Component as TIBQuery;
985		Dec(Index, inherited GetVerbCount);
986		case Index of
987		0: Query.ExecSQL;
988	<	1: if ibselectsqleditor.EditSQL(Query.Database,Query.Transaction,Query.SQL) then Designer.Modified;
988	>	1: if ibselectsqleditor.EditSQL(Query,Query.SQL) then Designer.Modified;
989		end;
990	+	end;
991		end;
992
993		function TIBQueryEditor.GetVerb(Index: Integer): string;
#	Line 650 | Line 999 | begin
999		case Index of
1000		0: Result := SExecute;
1001		1: Result := SEditSQL;
1002	<	2: Result := SInterbaseExpressVersion;
1002	>	2: Result := SInterbaseExpressVersion ;
1003		end;
1004		end;
1005		end;
1006
1007		function TIBQueryEditor.GetVerbCount: Integer;
1008		begin
1009	<	Result :=  3;
1009	>	Result := inherited GetVerbCount + 3;
1010		end;
1011
1012		{ TIBStoredProcEditor }
1013
1014		procedure TIBStoredProcEditor.ExecuteVerb(Index: Integer);
1015		begin
1016	+	if Index < inherited GetVerbCount then
1017	+	inherited ExecuteVerb(Index) else
1018	+	begin
1019	+	Dec(Index, inherited GetVerbCount);
1020		if Index = 0 then (Component as TIBStoredProc).ExecProc;
1021	+	end;
1022		end;
1023
1024		function TIBStoredProcEditor.GetVerb(Index: Integer): string;
1025		begin
1026	+	if Index < inherited GetVerbCount then
1027	+	Result := inherited GetVerb(Index) else
1028	+	begin
1029	+	Dec(Index, inherited GetVerbCount);
1030		case Index of
1031		0: Result := SExecute;
1032	<	1: Result := SInterbaseExpressVersion;
1032	>	1: Result := SInterbaseExpressVersion ;
1033		end;
1034	+	end;
1035		end;
1036
1037		function TIBStoredProcEditor.GetVerbCount: Integer;
#	Line 696 | Line 1055 | begin
1055		end;
1056		inherited Edit;
1057		end;
1058	<	(*
1058	>
1059		{ TIBTableFieldLinkProperty }
1060
1061		procedure TIBTableFieldLinkProperty.Edit;
1062		begin
1063		FTable := DataSet as TIBTable;
1064	+	if assigned(FTable.Database) then
1065	+	FTable.Database.Connected := true;
1066		inherited Edit;
1067		end;
1068
1069	+	function TIBTableFieldLinkProperty.GetIndexDefs: TIndexDefs;
1070	+	begin
1071	+	Result :=  FTable.IndexDefs
1072	+	end;
1073	+
1074		function TIBTableFieldLinkProperty.GetIndexFieldNames: string;
1075		begin
1076		Result := FTable.IndexFieldNames;
#	Line 723 | Line 1089 | end;
1089		procedure TIBTableFieldLinkProperty.SetMasterFields(const Value: string);
1090		begin
1091		FTable.MasterFields := Value;
1092	<	end;*)
1092	>	end;
1093
1094		{ TIBUpdateSQLProperty }
1095
#	Line 732 | Line 1098 | var
1098		IBDataset: TIBDataset;
1099		begin
1100		IBDataset := GetComponent(0) as TIBDataset;
1101	<	if Assigned(IBDataSet.Database) and
736	<	IBModifySQLEditor.EditSQL(IBDataSet.Database,IBDataSet.Transaction,IBDataSet.ModifySQL) then Modified;
1101	>	if IBModifySQLEditor.EditSQL(IBDataSet,IBDataSet.ModifySQL) then Modified;
1102		end;
1103
1104		{ TIBUpdateSQLUpdateProperty }
1105
1106		procedure TIBUpdateSQLUpdateProperty.Edit;
1107		begin
1108	<	if not GetObjects then
1109	<	ShowMessage('Not Linked to an IBQuery object or Database not assigned')
745	<	else
746	<	if IBModifySQLEditor.EditSQL(FDatabase,FDatabase.DefaultTransaction,FIBUpdateSQL.ModifySQL) then Modified;
1108	>	GetObjects;
1109	>	if IBModifySQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.ModifySQL) then Modified;
1110		end;
1111
1112		{ TIBRefreshSQLProperty }
#	Line 753 | Line 1116 | var
1116		IBDataset: TIBDataset;
1117		begin
1118		IBDataset := GetComponent(0) as TIBDataset;
1119	<	if Assigned(IBDataSet.Database) and
757	<	IBRefreshSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.Transaction,IBDataSet.RefreshSQL) then Modified;
1119	>	if IBRefreshSQLEditor.EditSQL(IBDataSet,IBDataSet.RefreshSQL) then Modified;
1120		end;
1121
1122		{ TIBUpdateSQLRefreshSQLProperty }
1123
1124		procedure TIBUpdateSQLRefreshSQLProperty.Edit;
1125		begin
1126	<	if not GetObjects then
1127	<	ShowMessage('Not Linked to an IBQuery object or Database not assigned')
766	<	else
767	<	if IBRefreshSQLEditor.EditSQL(FDatabase,FDatabase.DefaultTransaction,FIBUpdateSQL.RefreshSQL) then Modified;
1126	>	GetObjects;
1127	>	if IBRefreshSQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.RefreshSQL) then Modified;
1128		end;
1129
1130		{ TIBDeleteSQLProperty }
1131
1132		procedure TIBDeleteSQLProperty.Edit;
1133		var
1134	<	IBDataset: TIBDataset;
1134	>	IBDataset: TIBDataSet;
1135		begin
1136	<	IBDataset := GetComponent(0) as TIBDataset;
1137	<	if Assigned(IBDataSet.Database) and
778	<	IBDeleteSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.Transaction,IBDataSet.DeleteSQL) then Modified;
1136	>	IBDataset := GetComponent(0) as TIBDataSet;
1137	>	if IBDeleteSQLEditor.EditSQL(IBDataSet,IBDataSet.DeleteSQL) then Modified;
1138		end;
1139
1140		{ TIBUpdateSQLDeleteProperty }
#	Line 787 | Line 1146 | end;
1146
1147		procedure TIBUpdateSQLDeleteProperty.Edit;
1148		begin
1149	<	if not GetObjects then
1150	<	ShowMessage('Not Linked to an IBQuery object or Database not assigned')
792	<	else
793	<	if IBDeleteSQLEditor.EditSQL(FDatabase,FDatabase.DefaultTransaction,FIBUpdateSQL.DeleteSQL) then Modified;
1149	>	GetObjects;
1150	>	if IBDeleteSQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.DeleteSQL) then Modified;
1151		end;
1152
1153		{ TUpdateSQLPropertyEditor }
#	Line 801 | Line 1158 | begin
1158		FIBUpdateSQL := GetComponent(0) as TIBUpdateSQL;
1159		if not assigned(FIBUpdateSQL) or not assigned(FIBUpdateSQL.DataSet) then
1160		Exit;
1161	+	FDatabase := nil;
1162		if FIBUpdateSQL.DataSet is TIBQuery then
1163		begin
1164		FDatabase := (FIBUpdateSQL.DataSet as TIBQuery).Database;
#	Line 812 | Line 1170 | end;
1170
1171		procedure TIBInsertSQLProperty.Edit;
1172		var
1173	<	IBDataset: TIBDataset;
1173	>	IBDataset: TIBDataSet;
1174		begin
1175	<	IBDataset := GetComponent(0) as TIBDataset;
1176	<	if Assigned(IBDataSet.Database) and
819	<	IBInsertSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.Transaction,IBDataSet.InsertSQL) then Modified;
1175	>	IBDataset := GetComponent(0) as TIBDataSet;
1176	>	if IBInsertSQLEditor.EditSQL(IBDataSet,IBDataSet.InsertSQL) then Modified;
1177		end;
1178
1179		{ TIBUpdateSQLInsertSQLProperty }
1180
1181		procedure TIBUpdateSQLInsertSQLProperty.Edit;
1182		begin
1183	<	if not GetObjects then
1184	<	ShowMessage('Not Linked to an IBQuery object or Database not assigned')
828	<	else
829	<	if IBInsertSQLEditor.EditSQL(FDatabase,FDatabase.DefaultTransaction,FIBUpdateSQL.InsertSQL) then Modified;
1183	>	GetObjects;
1184	>	if IBInsertSQLEditor.EditSQL(FIBUpdateSQL.Dataset,FIBUpdateSQL.InsertSQL) then Modified;
1185		end;
1186
1187		{ TIBGeneratorProperty }
#	Line 841 | Line 1196 | begin
1196		if IBGeneratorEditor.EditGenerator(GetPersistentReference as TIBGenerator) then Modified;
1197		end;
1198
1199	+	{ TIBSQLEditor }
1200	+
1201	+	procedure TIBSQLEditor.ExecuteVerb(Index: Integer);
1202	+	begin
1203	+	if IBSQLEditor.EditIBSQL(TIBSQL(Component)) then Modified;
1204	+	end;
1205	+
1206	+	function TIBSQLEditor.GetVerb(Index: Integer): string;
1207	+	begin
1208	+	case Index of
1209	+	0 : Result := SIBSQLEditor;
1210	+	1: Result := SInterbaseExpressVersion ;
1211	+	end;
1212	+	end;
1213	+
1214	+	function TIBSQLEditor.GetVerbCount: Integer;
1215	+	begin
1216	+	Result:= 2
1217	+	end;
1218	+
1219	+	{ TIBSQLSQLPropertyEditor }
1220	+
1221	+	procedure TIBSQLSQLPropertyEditor.Edit;
1222	+	var
1223	+	IBSQL: TIBSQL;
1224	+	begin
1225	+	IBSQL := GetComponent(0) as TIBSQL;
1226	+	if IBSQLEditor.EditIBSQL(IBSQL) then Modified;
1227	+	end;
1228	+
1229		initialization
1230		{$I IBDBReg.lrs}
1231		end.

Diff Legend

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