Replace magic numbers with enumeration/enumerated type

backuprestore.lfm

@@ -68,14 +68,14 @@ object fmBackupRestore: TfmBackupRestore
       OnEditingDone = edBackupEditingDone
       TabOrder = 3
     end
-    object SpeedButton1: TSpeedButton
+    object sbBroseBackupFile: TSpeedButton
       Left = 416
       Height = 22
       Top = 133
       Width = 23
       Anchors = [akTop, akRight]
       Caption = '...'
-      OnClick = SpeedButton1Click
+      OnClick = sbBroseBackupFileClick
     end
     object bbStart: TBitBtn
       Left = 354

backuprestore.lrs

@@ -18,51 +18,51 @@ LazarusResources.Add('TfmBackupRestore','FORMDATA',[
   +#3#137#0#5'Width'#2'5'#7'Caption'#6#11'Backup File'#11'ParentColor'#8#0#0#5
   +'TEdit'#8'edBackup'#4'Left'#2'f'#6'Height'#2#21#3'Top'#3#137#0#5'Width'#3'1'
   +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#13'OnEditingDone'#7#19'edBa'
-  +'ckupEditingDone'#8'TabOrder'#2#3#0#0#12'TSpeedButton'#12'SpeedButton1'#4'Le'
-  +'ft'#3#160#1#6'Height'#2#22#3'Top'#3#133#0#5'Width'#2#23#7'Anchors'#11#5'akT'
-  +'op'#7'akRight'#0#7'Caption'#6#3'...'#7'OnClick'#7#17'SpeedButton1Click'#0#0
-  +#7'TBitBtn'#7'bbStart'#4'Left'#3'b'#1#6'Height'#2'('#3'Top'#3#1#1#5'Width'#3
-  +#131#0#7'Caption'#6#5'Start'#5'Color'#4#219#242#247#0#4'Kind'#7#5'bkAll'#7'O'
-  +'nClick'#7#12'bbStartClick'#8'TabOrder'#2#6#0#0#5'TEdit'#16'edTargetDatabase'
-  +#4'Left'#3#142#0#6'Height'#2#21#3'Top'#2'V'#5'Width'#3#8#1#7'Anchors'#11#5'a'
-  +'kTop'#6'akLeft'#7'akRight'#0#14'ParentBidiMode'#8#13'OnEditingDone'#7#27'ed'
-  +'TargetDatabaseEditingDone'#8'TabOrder'#2#2#0#0#12'TSpeedButton'#16'sbBrowse'
-  +'Targetdb'#4'Left'#3#160#1#6'Height'#2#22#3'Top'#2'U'#5'Width'#2#23#7'Anchor'
-  +'s'#11#5'akTop'#7'akRight'#0#7'Caption'#6#3'...'#7'OnClick'#7#21'sbBrowseTar'
-  +'getdbClick'#0#0#6'TLabel'#6'Label4'#4'Left'#2#14#6'Height'#2#13#3'Top'#3#176
-  +#0#5'Width'#2'3'#7'Caption'#6#9'User name'#11'ParentColor'#8#0#0#5'TEdit'#10
-  +'edUserName'#4'Left'#2'f'#6'Height'#2#21#3'Top'#3#176#0#5'Width'#3#145#0#8'T'
-  +'abOrder'#2#4#0#0#6'TLabel'#6'Label5'#4'Left'#2#12#6'Height'#2#13#3'Top'#3
-  +#216#0#5'Width'#2'.'#7'Caption'#6#8'Password'#11'ParentColor'#8#0#0#5'TEdit'
-  +#10'edPassword'#4'Left'#2'f'#6'Height'#2#21#3'Top'#3#216#0#5'Width'#3#145#0#8
-  +'EchoMode'#7#10'emPassword'#12'PasswordChar'#6#1'-'#8'TabOrder'#2#5#0#0#6'TL'
-  +'abel'#6'Label6'#4'Left'#2#14#6'Height'#2#13#3'Top'#2'0'#5'Width'#2#22#7'Cap'
-  +'tion'#6#4'Host'#11'ParentColor'#8#0#0#5'TEdit'#6'edHost'#4'Left'#3#142#0#6
-  +'Height'#2#21#3'Top'#2'0'#5'Width'#3#6#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#14'ParentBidiMode'#8#8'TabOrder'#2#1#0#0#6'TImage'#6'Image1'#4'L'
-  +'eft'#3#152#1#6'Height'#2'L'#3'Top'#2#0#5'Width'#2'O'#12'Picture.Data'#10#166
-  +#20#0#0#23'TPortableNetworkGraphic'#138#20#0#0#137'PNG'#13#10#26#10#0#0#0#13
-  +'IHDR'#0#0#0'H'#0#0#0'H'#8#6#0#0#0'U'#237#179'G'#0#0#0#4'sBIT'#8#8#8#8'|'#8
-  +'d'#136#0#0#0#9'pHYs'#0#0#15#146#0#0#15#146#1#4#168'~'#160#0#0#0#25'tEXtSoft'
-  +'ware'#0'www.inkscape.org'#155#238'<'#26#0#0#0#25'tEXtTitle'#0'DataBase (2 B'
-  +'locks)ne'#254#165#0#0#0#24'tEXtAuthor'#0'Jean-Victor Balin'#236'J'#17'L'#0#0
-  +#0'''tEXtDescription'#0'[email protected]'#216#218#231'Q'#0#0#0#24
-  +'tEXtCreation Time'#0'2009-11-09b%w,'#0#0#0'ItEXtCopyright'#0'Public Domain '
-  +'http://creativecommons.org/licenses/publicdomain/Y'#195#254#202#0#0#19#18'I'
-  +'DATx'#156#237'\[l\'#215'u]'#251#156's'#31#243' 9'#148'8|'#201#146'('#217#150
-  +#31#138#31'q\'#191#146'8J'#147#166'V'#13#168'I]'#165#8#144#254#4#133#209'~'
-  +#20'H'#220'&'#1#250#209#140#16#160'('#250#213#244#171'-'#242'B'#2'''m'#245#19
-  +#164'i'#131#166#142#205'8~6'#150#237#216#154#216#150#173'GD'#153#20'9$g'#200
-  +'y'#221#199'9{'#247'c'#134#20')Q'#145'-'#139#164'>'#178#128#11#14'f'#238#229
-  +#217'w'#205#222#251#156#189#206#190'C"'#130#223#226#226'P'#155'm'#192#213#142
-  +#223#18't'#9#152#203#189#240#200#145'''>'#208#138#232'o'#172#179#187#156#181
-  +#131#214#185'^v.t'#206#25#199#142#156'c0;q'#214'9'#235'\'#228#156#173';'#230
-  +#138#136#156#18#197'_'#251#179'?'#253#243#199#175#228#141#172#23'h'#173#28'D'
-  +'D'#4#0#165'R'#137'V'#190#255#208'C'#7'nu"'#255#20''''#209#221#173'V'#203'w'
-  +#206#129#153#225#152#193#29'B'#192#204#157#247#28'/'#191'fv`'#215'='#175'{'
-  +#164#137#181'Z'#211#203'a&x'#228#248#177#211'O'#175#28#167'T*'#9#0#200'U'#144
-  +' '#215'"'#136'>'#253#233'O'#171'J'#165'B{'#246#236'!'#0#248#171'/}'#225'['
-  +#237#168'y'#176#213'l'#249#214#185#229#27'^&'#227'2'#8'Z:'#191#243#158#164
+  +'ckupEditingDone'#8'TabOrder'#2#3#0#0#12'TSpeedButton'#17'sbBroseBackupFile'
+  +#4'Left'#3#160#1#6'Height'#2#22#3'Top'#3#133#0#5'Width'#2#23#7'Anchors'#11#5
+  +'akTop'#7'akRight'#0#7'Caption'#6#3'...'#7'OnClick'#7#22'sbBroseBackupFileCl'
+  +'ick'#0#0#7'TBitBtn'#7'bbStart'#4'Left'#3'b'#1#6'Height'#2'('#3'Top'#3#1#1#5
+  +'Width'#3#131#0#7'Caption'#6#5'Start'#5'Color'#4#219#242#247#0#4'Kind'#7#5'b'
+  +'kAll'#7'OnClick'#7#12'bbStartClick'#8'TabOrder'#2#6#0#0#5'TEdit'#16'edTarge'
+  +'tDatabase'#4'Left'#3#142#0#6'Height'#2#21#3'Top'#2'V'#5'Width'#3#8#1#7'Anch'
+  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#14'ParentBidiMode'#8#13'OnEditingDo'
+  +'ne'#7#27'edTargetDatabaseEditingDone'#8'TabOrder'#2#2#0#0#12'TSpeedButton'
+  +#16'sbBrowseTargetdb'#4'Left'#3#160#1#6'Height'#2#22#3'Top'#2'U'#5'Width'#2
+  +#23#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#3'...'#7'OnClick'#7#21
+  +'sbBrowseTargetdbClick'#0#0#6'TLabel'#6'Label4'#4'Left'#2#14#6'Height'#2#13#3
+  +'Top'#3#176#0#5'Width'#2'3'#7'Caption'#6#9'User name'#11'ParentColor'#8#0#0#5
+  +'TEdit'#10'edUserName'#4'Left'#2'f'#6'Height'#2#21#3'Top'#3#176#0#5'Width'#3
+  +#145#0#8'TabOrder'#2#4#0#0#6'TLabel'#6'Label5'#4'Left'#2#12#6'Height'#2#13#3
+  +'Top'#3#216#0#5'Width'#2'.'#7'Caption'#6#8'Password'#11'ParentColor'#8#0#0#5
+  +'TEdit'#10'edPassword'#4'Left'#2'f'#6'Height'#2#21#3'Top'#3#216#0#5'Width'#3
+  +#145#0#8'EchoMode'#7#10'emPassword'#12'PasswordChar'#6#1'-'#8'TabOrder'#2#5#0
+  +#0#6'TLabel'#6'Label6'#4'Left'#2#14#6'Height'#2#13#3'Top'#2'0'#5'Width'#2#22
+  +#7'Caption'#6#4'Host'#11'ParentColor'#8#0#0#5'TEdit'#6'edHost'#4'Left'#3#142
+  +#0#6'Height'#2#21#3'Top'#2'0'#5'Width'#3#6#1#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#14'ParentBidiMode'#8#8'TabOrder'#2#1#0#0#6'TImage'#6'Image1'#4
+  +'Left'#3#152#1#6'Height'#2'L'#3'Top'#2#0#5'Width'#2'O'#12'Picture.Data'#10
+  +#166#20#0#0#23'TPortableNetworkGraphic'#138#20#0#0#137'PNG'#13#10#26#10#0#0#0
+  +#13'IHDR'#0#0#0'H'#0#0#0'H'#8#6#0#0#0'U'#237#179'G'#0#0#0#4'sBIT'#8#8#8#8'|'
+  +#8'd'#136#0#0#0#9'pHYs'#0#0#15#146#0#0#15#146#1#4#168'~'#160#0#0#0#25'tEXtSo'
+  +'ftware'#0'www.inkscape.org'#155#238'<'#26#0#0#0#25'tEXtTitle'#0'DataBase (2'
+  +' Blocks)ne'#254#165#0#0#0#24'tEXtAuthor'#0'Jean-Victor Balin'#236'J'#17'L'#0
+  +#0#0'''tEXtDescription'#0'[email protected]'#216#218#231'Q'#0#0#0
+  +#24'tEXtCreation Time'#0'2009-11-09b%w,'#0#0#0'ItEXtCopyright'#0'Public Doma'
+  +'in http://creativecommons.org/licenses/publicdomain/Y'#195#254#202#0#0#19#18
+  +'IDATx'#156#237'\[l\'#215'u]'#251#156's'#31#243' 9'#148'8|'#201#146'('#217
+  +#150#31#138#31'q\'#191#146'8J'#147#166'V'#13#168'I]'#165#8#144#254#4#133#209
+  +'~'#20'H'#220'&'#1#250#209#140#16#160'('#250#213#244#171'-'#242'B'#2'''m'#245
+  +#19#164'i'#131#166#142#205'8~6'#150#237#216#154#216#150#173'GD'#153#20'9$g'
+  +#200'y'#221#199'9{'#247'c'#134#20')Q'#145'-'#139#164'>'#178#128#11#14'f'#238
+  +#229#217'w'#205#222#251#156#189#206#190'C"'#130#223#226#226'P'#155'm'#192#213
+  +#142#223#18't'#9#152#203#189#240#200#145'''>'#208#138#232'o'#172#179#187#156
+  +#181#131#214#185'^v.t'#206#25#199#142#156'c0;q'#214'9'#235'\'#228#156#173';'
+  +#230#138#136#156#18#197'_'#251#179'?'#253#243#199#175#228#141#172#23'h'#173
+  +#28'DD'#4#0#165'R'#137'V'#190#255#208'C'#7'nu"'#255#20''''#209#221#173'V'#203
+  +'w'#206#129#153#225#152#193#29'B'#192#204#157#247#28'/'#191'fv`'#215'='#175
+  +'{'#164#137#181'Z'#211#203'a&x'#228#248#177#211'O'#175#28#167'T*'#9#0#200'U'
+  +#144' '#215'"'#136'>'#253#233'O'#171'J'#165'B{'#246#236'!'#0#248#171'/}'#225
+  +'['#237#168'y'#176#213'l'#249#214#185#229#27'^&'#227'2'#8'Z:'#191#243#158#164
   +#185'\'#246''''#245'Z'#235#161#163'G'#143#242#177'c'#199#164'X,'#202#222#189
   +'{'#165'T*'#201'f'#18#181#28'bDD"'#192#161'C%'#221'h4'#244#216#216#24'}'#230
   ,'3'#127'4'#186'm'#251#206#23'j'#139#213'~'#231#28#214#207'N'#241#234#139#245

backuprestore.pas

@@ -34,14 +34,14 @@ type
     meLog: TMemo;
     OpenDialog1: TOpenDialog;
     SaveDialog1: TSaveDialog;
-    SpeedButton1: TSpeedButton;
+    sbBroseBackupFile: TSpeedButton;
     sbBrowseTargetdb: TSpeedButton;
     procedure bbStartClick(Sender: TObject);
     procedure edBackupEditingDone(Sender: TObject);
     procedure edTargetDatabaseEditingDone(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure sbBrowseTargetdbClick(Sender: TObject);
-    procedure SpeedButton1Click(Sender: TObject);
+    procedure sbBroseBackupFileClick(Sender: TObject);
   private
     { private declarations }
     FDatabase: string; //doesn't really seem to be used anywhere
@@ -77,7 +77,7 @@ end;
 {$ENDIF}
 
 
-procedure TfmBackupRestore.SpeedButton1Click(Sender: TObject);
+procedure TfmBackupRestore.sbBroseBackupFileClick(Sender: TObject);
 begin
   SaveDialog1.DefaultExt:= '.fbk';
   if ((cbOperation.ItemIndex = 0) and (SaveDialog1.Execute)) or
@@ -162,6 +162,7 @@ begin
   TempDir:= GetTempDir(false);
   FireBirdServices:= TFirebirdServices.Create;
   try
+    Screen.Cursor := crHourglass; // inform user of long-running operation
     FireBirdServices.VerboseOutput:= True;
     meLog.Clear;
     with FireBirdServices do
@@ -264,6 +265,7 @@ begin
       end;
     end;
   finally
+    Screen.Cursor := crDefault;
     FireBirdServices.Free;
   end;
 end;

comparison.pas

@@ -6,12 +6,8 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Buttons, ComCtrls, IBConnection, sqldb, QueryWindow, LCLType;
+  Buttons, ComCtrls, IBConnection, sqldb, QueryWindow, LCLType, turbocommon;
 
-const
-  NumObjects = 13; //number of different objects in dbObjects array below
-  dbObjects: array [1 .. NumObjects] of string = ('Tables', 'Generators', 'Triggers', 'Views', 'Stored Procedures', 'UDFs',
-    'Sys Tables', 'Domains', 'Roles', 'Exceptions', 'Users', 'Indices', 'Constraints');
 
 type
 
@@ -582,42 +578,51 @@ procedure TfmComparison.CheckMissingDBObjects;
 var
   List, ComparedList: TStringList;
   Count: Integer;
-  x, i: Integer;
+  ObjectType: TObjectType;
+  i: Integer;
 begin
   List:= TStringList.Create;
   ComparedList:= TStringList.Create;
   try
-    for x:= 1 to 11 do
-    if ((x = 1) and cxTables.Checked) or
-       ((x = 2) and cxGenerators.Checked) or
-       ((x = 3) and cxTriggers.Checked) or
-       ((x = 4) and cxViews.Checked) or
-       ((x = 5) and cxStoredProcs.Checked) or
-       ((x = 6) and cxUDFs.Checked) or
-       ((x = 8) and cxDomains.Checked) or
-       ((x = 9) and cxRoles.Checked) then
+    for ObjectType:= Low(TObjectType) to High(TObjectType) do
     begin
-      meLog.Lines.Add('');
-      meLog.Lines.Add('Checking Missing ' + dbObjects[x] + ':');
-
-      List.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, x, Count);
-
-      Application.ProcessMessages;
-      if FCanceled then
-        Exit;
-      ComparedList.CommaText:= dmSysTables.GetDBObjectNames(cbComparedDatabase.ItemIndex, x, Count);
-      FDBObjectsList[x].Clear;
-      FDBExistingObjectsList[x].Clear;
-      for i:= 0 to List.Count -1 do
-      if ComparedList.IndexOf(List[i]) = -1 then  // Not exist
+      if ((ObjectType = otTables) and cxTables.Checked) or
+         ((ObjectType = otGenerators) and cxGenerators.Checked) or
+         ((ObjectType = otTriggers) and cxTriggers.Checked) or
+         ((ObjectType = otViews) and cxViews.Checked) or
+         ((ObjectType = otStoredProcedures) and cxStoredProcs.Checked) or
+         ((ObjectType = otUDF) and cxUDFs.Checked) or
+         {otSystemTables: system tables are not compared }
+         ((ObjectType = otDomains) and cxDomains.Checked) or
+         ((ObjectType = otRoles) and cxRoles.Checked)
+         {otExceptions, otUsers are not checked;
+         constraints and indexes probably indirectly}
+         //todo: check otExceptions in CheckMissingDBObjects
+         then
       begin
-        meLog.Lines.Add(' ' + List[i]);
-        FDBObjectsList[x].Add(List[i]);
-        Inc(FDiffCount);
-      end
-      else                                        // Exist
-        FDBExistingObjectsList[x].Add(List[i]);
+        meLog.Lines.Add('');
+        meLog.Lines.Add('Checking Missing ' + dbObjects[ord(ObjectType)] + ':');
+
+        List.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, ObjectType, Count);
 
+        Application.ProcessMessages;
+        if FCanceled then
+          Exit;
+        ComparedList.CommaText:= dmSysTables.GetDBObjectNames(cbComparedDatabase.ItemIndex, ObjectType, Count);
+        FDBObjectsList[ord(ObjectType)].Clear;
+        FDBExistingObjectsList[ord(ObjectType)].Clear;
+        for i:= 0 to List.Count -1 do
+        begin
+          if ComparedList.IndexOf(List[i]) = -1 then  // Does not exist
+          begin
+            meLog.Lines.Add(' ' + List[i]);
+            FDBObjectsList[ord(ObjectType)].Add(List[i]);
+            Inc(FDiffCount);
+          end
+          else                                        // Exists
+            FDBExistingObjectsList[ord(ObjectType)].Add(List[i]);
+        end;
+      end;
     end;
     laScript.Enabled:= True;
   finally
@@ -630,36 +635,41 @@ procedure TfmComparison.CheckRemovedDBObjects;
 var
   List, ComparedList: TStringList;
   Count: Integer;
-  x, i: Integer;
+  ObjectType: TObjectType;
+  i: Integer;
 begin
   List:= TStringList.Create;
   ComparedList:= TStringList.Create;
   try
-    for x:= 1 to 11 do
-    if ((x = 1) and cxTables.Checked) or
-       ((x = 2) and cxGenerators.Checked) or
-       ((x = 3) and cxTriggers.Checked) or
-       ((x = 4) and cxViews.Checked) or
-       ((x = 5) and cxStoredProcs.Checked) or
-       ((x = 6) and cxUDFs.Checked) or
-       ((x = 8) and cxDomains.Checked) then
+    for ObjectType:= Low(TObjectType) to High(TObjectType) do
+    if ((ObjectType = otTables) and cxTables.Checked) or
+       ((ObjectType = otGenerators) and cxGenerators.Checked) or
+       ((ObjectType = otTriggers) and cxTriggers.Checked) or
+       ((ObjectType = otViews) and cxViews.Checked) or
+       ((ObjectType = otStoredProcedures) and cxStoredProcs.Checked) or
+       ((ObjectType = otUDF) and cxUDFs.Checked) or
+       {otSystemTables: system tables are not compared }
+       ((ObjectType = otDomains) and cxDomains.Checked)
+       {otRoles, otExceptions, otUsers are not checked;
+         constraints and indexes probably indirectly}
+       //todo: check otExceptions in CheckRemovedDBObjects
+       then
     begin
       meLog.Lines.Add('');
-      meLog.Lines.Add('Checking Removed ' + dbObjects[x] + ':');
+      meLog.Lines.Add('Checking Removed ' + dbObjects[ord(ObjectType)] + ':');
 
-      List.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, x, Count);
+      List.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, ObjectType, Count);
 
-      ComparedList.CommaText:= dmSysTables.GetDBObjectNames(cbComparedDatabase.ItemIndex, x, Count);
-      FDBRemovedObjectsList[x].Clear;
+      ComparedList.CommaText:= dmSysTables.GetDBObjectNames(cbComparedDatabase.ItemIndex, ObjectType, Count);
+      FDBRemovedObjectsList[ord(ObjectType)].Clear;
 
       for i:= 0 to ComparedList.Count -1 do
       if List.IndexOf(ComparedList[i]) = -1 then  // Removed
       begin
         meLog.Lines.Add(' ' + ComparedList[i]);
-        FDBRemovedObjectsList[x].Add(ComparedList[i]);
+        FDBRemovedObjectsList[ord(ObjectType)].Add(ComparedList[i]);
         Inc(FDiffCount);
       end;
-
     end;
     CheckRemovedIndices;
     CheckRemovedConstraints;
@@ -1885,7 +1895,7 @@ begin
   ComparedList:= TStringList.Create;
   TablesList:= TStringList.Create;
   try
-    TablesList.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, 1, Count);
+    TablesList.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, otTables, Count);
 
     meLog.Lines.Add('');
     meLog.Lines.Add('Missing Indices:');
@@ -1948,7 +1958,7 @@ begin
   ComparedList:= TStringList.Create;
   TablesList:= TStringList.Create;
   try
-    TablesList.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, 1, Count);
+    TablesList.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, otTables, Count);
     FExistConstraintsList.Clear;
 
     meLog.Lines.Add('');

copytable.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Buttons, SynEdit, SynHighlighterSQL, sqldb;
+  StdCtrls, Buttons, SynEdit, SynHighlighterSQL, sqldb, turbocommon;
 
 type
 
@@ -56,7 +56,7 @@ begin
   laDatabase.Caption:= fmMain.RegisteredDatabases[cbDestDatabase.ItemIndex].RegRec.DatabaseName;
   cbDestDatabase.SetFocus;
   dmSysTables.Init(cbDestDatabase.ItemIndex);
-  cbDestTable.Items.CommaText:= dmSysTables.GetDBObjectNames(cbDestDatabase.ItemIndex, 0, count);
+  cbDestTable.Items.CommaText:= dmSysTables.GetDBObjectNames(cbDestDatabase.ItemIndex, otTables, count);
   if cbDestTable.Items.IndexOf(cbSourceTable.Text) <> -1 then
     cbDestTable.Text:= cbSourceTable.Text;
 end;
@@ -184,7 +184,8 @@ begin
   for i:= 0 to High(fmMain.RegisteredDatabases) do
     cbDestDatabase.Items.Add(fmMain.RegisteredDatabases[i].RegRec.Title);
   laDatabase.Caption:= '';
-  cbSourceTable.Items.CommaText:= dmSysTables.GetDBObjectNames(SourceIndex, 1, count);
+
+  cbSourceTable.Items.CommaText:= dmSysTables.GetDBObjectNames(SourceIndex, otTables, count);
   cbSourceTable.Text:= ATableName;
   SynSQLSyn1.TableNames.Text:= cbSourceTable.Text;
   cbSourceTableChange(nil);

createuser.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Buttons, ExtCtrls;
+  StdCtrls, Buttons, ExtCtrls, turbocommon;
 
 type
 
@@ -49,7 +49,7 @@ procedure TfmCreateUser.Init(dbIndex: Integer);
 var
   Count: Integer;
 begin
-  cbRoles.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 9, Count);
+  cbRoles.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otRoles, Count);
 end;
 
 initialization

main.pas

@@ -708,7 +708,7 @@ begin
   // So check SavePassword instead of Password itself.
   if (ForceConnectDialog=false) and Rec.SavePassword then
   try
-    fmEnterPass.cbRole.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 9, Count);
+    fmEnterPass.cbRole.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otRoles, Count);
     fmEnterPass.cbRole.ItemIndex:= -1;
     fmEnterPass.cbRole.Text:= '';
     Result:= True; //this works, no need to go through a retry attempt below
@@ -921,7 +921,7 @@ begin
   SelNode:= tvMain.Selected;
   DBIndex:= SelNode.Parent.OverlayIndex;
 
-  TableNames:= dmSysTables.GetDBObjectNames(DBIndex, 1, Count);
+  TableNames:= dmSysTables.GetDBObjectNames(DBIndex, otTables, Count);
   fmCreateTrigger.cbTables.Items.CommaText:= TableNames;
   CreateNewTrigger(DBIndex, '');
 end;
@@ -1640,7 +1640,7 @@ begin
   begin
     fmEnterPass.edPassword.Clear;
     try
-      fmEnterPass.cbRole.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 9, Count);
+      fmEnterPass.cbRole.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otRoles, Count);
     except
     end;
     if fmEnterPass.ShowModal = mrOk then
@@ -2873,7 +2873,7 @@ begin
       // Tables
       if ANodeText = 'Tables' then
       begin
-        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, 1, Count);
+        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, otTables, Count);
         TableNode:= Node;
         Node.Text:= ANodeText + ' (' + IntToStr(Count) + ')';
 
@@ -2892,7 +2892,7 @@ begin
       if ANodeText = 'Generators' then
       begin
         GenNode:= Node;
-        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, 2, Count);
+        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, otGenerators, Count);
         Node.Text:= ANodeText + ' (' + IntToStr(Count) + ')';
         GenNode.DeleteChildren;
         for i:= 0 to Objects.Count - 1 do
@@ -2908,7 +2908,7 @@ begin
       if Node.Text = 'Triggers' then
       begin
         TrigNode:= Node;
-        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, 3, Count);
+        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, otTriggers, Count);
         Node.Text:= ANodeText + ' (' + IntToStr(Count) + ')';
         TrigNode.DeleteChildren;
         for i:= 0 to Objects.Count - 1 do
@@ -2917,14 +2917,13 @@ begin
           Item.ImageIndex:= 8;
           Item.SelectedIndex:= 8;
         end;
-
       end
       else
         // Views
       if Node.Text = 'Views' then
       begin
         ViewsNode:= Node;
-        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, 4, Count);
+        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, otViews, Count);
         Node.Text:= ANodeText + ' (' + IntToStr(Count) + ')';
         ViewsNode.DeleteChildren;
         for i:= 0 to Objects.Count - 1 do
@@ -2933,14 +2932,13 @@ begin
           Item.ImageIndex:= 10;
           Item.SelectedIndex:= 10;
         end;
-
       end
       else
         // Stored Procedures
       if Node.Text = 'Stored Procedures' then
       begin
         StoredProcNode:= Node;
-        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, 5, Count);
+        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, otStoredProcedures, Count);
         Node.Text:= ANodeText + ' (' + IntToStr(Count) + ')';
         StoredProcNode.DeleteChildren;
         for i:= 0 to Objects.Count - 1 do
@@ -2949,14 +2947,13 @@ begin
           Item.ImageIndex:= 12;
           Item.SelectedIndex:= 12;
         end;
-
       end
       else
         // UDF (Functions)
       if Node.Text = 'Functions' then
       begin
         UDFNode:= Node;
-        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, 6, Count);
+        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, otUDF, Count);
         Node.Text:= ANodeText + ' (' + IntToStr(Count) + ')';
         UDFNode.DeleteChildren;
         for i:= 0 to Objects.Count - 1 do
@@ -2965,14 +2962,13 @@ begin
           Item.ImageIndex:= 14;
           Item.SelectedIndex:= 14;
         end;
-
       end
       else
         // System Tables
       if Node.Text = 'System Tables' then
       begin
         SysTableNode:= Node;
-        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, 7, Count);
+        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, otSystemTables, Count);
         Node.Text:= ANodeText + ' (' + IntToStr(Count) + ')';
         SysTableNode.DeleteChildren;
         for i:= 0 to Objects.Count - 1 do
@@ -2981,14 +2977,13 @@ begin
           Item.ImageIndex:= 16;
           Item.SelectedIndex:= 16;
         end;
-
       end
       else
         // Domains
       if Node.Text = 'Domains' then
       begin
         DomainsNode:= Node;
-        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, 8, Count);
+        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, otDomains, Count);
         Node.Text:= ANodeText + ' (' + IntToStr(Count) + ')';
         DomainsNode.DeleteChildren;
         for i:= 0 to Objects.Count - 1 do
@@ -2997,14 +2992,13 @@ begin
           Item.ImageIndex:= 18;
           Item.SelectedIndex:= 18;
         end;
-
       end
       else
         // Roles
       if Node.Text = 'Roles' then
       begin
         RoleNode:= Node;
-        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, 9, Count);
+        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, otRoles, Count);
         Node.Text:= ANodeText + ' (' + IntToStr(Count) + ')';
         RoleNode.DeleteChildren;
         for i:= 0 to Objects.Count - 1 do
@@ -3019,7 +3013,7 @@ begin
       if Node.Text = 'Exceptions' then
       begin
         ExceptionNode:= Node;
-        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, 10, Count);
+        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, otExceptions, Count);
         Node.Text:= ANodeText + ' (' + IntToStr(Count) + ')';
         ExceptionNode.DeleteChildren;
         for i:= 0 to Objects.Count - 1 do
@@ -3034,7 +3028,7 @@ begin
       if Node.Text = 'Users' then
       begin
         UserNode:= Node;
-        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, 11, Count);
+        Objects.CommaText:= dmSysTables.GetDBObjectNames(DBIndex, otUsers, Count);
         Node.Text:= ANodeText + ' (' + IntToStr(Count) + ')';
         UserNode.DeleteChildren;
         for i:= 0 to Objects.Count - 1 do
@@ -3981,6 +3975,7 @@ begin
           CNode:= tvMain.Items.AddChild(MainNode, 'Query Window');
           CNode.ImageIndex:= 1;
           CNode.SelectedIndex:= 1;
+
           CNode:= tvMain.Items.AddChild(MainNode, 'Tables');
           CNode.ImageIndex:= 2;
           CNode.SelectedIndex:= 2;
@@ -4203,7 +4198,7 @@ function TfmMain.GetTableNames(dbIndex: Integer): string;
 var
   Count: Integer;
 begin
-  Result:= dmSysTables.GetDBObjectNames(dbIndex, 1, Count);
+  Result:= dmSysTables.GetDBObjectNames(dbIndex, otTables, Count);
 end;
 
 initialization

newgen.pas

@@ -123,7 +123,7 @@ var
   Count: Integer;
 begin
   FDBIndex:= dbIndex;
-  TableNames:= dmSysTables.GetDBObjectNames(dbIndex, 1, Count);
+  TableNames:= dmSysTables.GetDBObjectNames(dbIndex, otTables, Count);
 
   fmNewGen.cbTables.Items.CommaText:= TableNames;
 

permissionmanage.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  ComCtrls, StdCtrls, Buttons, CheckLst;
+  ComCtrls, StdCtrls, Buttons, CheckLst, turbocommon;
 
 type
 
@@ -251,7 +251,7 @@ begin
   clbRoles.Clear;
   if cbRolesUser.Text <> '' then
   begin
-    clbRoles.Items.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, 9, Count);
+    clbRoles.Items.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, otRoles, Count);
     FRoleList.Clear;
     FRoleList.CommaText:= dmSysTables.GetUserObjects(FDBIndex, cbRolesUser.Text, 13);
     SetLength(FRoleGrant, clbRoles.Count);
@@ -564,14 +564,15 @@ begin
   PageControl1.ActivePageIndex:= 0;
   FDBIndex := dbIndex;
   cbUsers.Text := AUserName;
-  cbTables.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 1, Count);
-  cbViews.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 4, Count);
+  cbTables.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otTables, Count);
+  cbViews.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otViews, Count);
   cbTables.Text:= ATableName;
   cbProcUsers.Text:= AUserName;
   cbViewsUsers.Text:= AUserName;
 
-  cbUsers.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 9, Count) + ',' +
-    dmSysTables.GetDBObjectNames(dbIndex, 11, Count);
+  // For users, add roles and users
+  cbUsers.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otRoles, Count) + ',' +
+    dmSysTables.GetDBObjectNames(dbIndex, otUsers, Count);
   cbProcUsers.Items.CommaText:= cbUsers.Items.CommaText;
   cbViewsUsers.Items.CommaText:= cbUsers.Items.CommaText;
 
@@ -590,7 +591,7 @@ begin
     cbRolesUser.Text:= AUserName;
     UpdateRolePermissions;
   end;
-  cbRolesUser.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 11, Count);
+  cbRolesUser.Items.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otUsers, Count);
 end;
 
 initialization

scriptdb.pas

@@ -73,7 +73,7 @@ var
   Count: Integer;
   i: Integer;
 begin
-  List.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 9, Count);
+  List.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otRoles, Count);
   { todo: (low priority) wrap create role RDB$Admin statement - in FB 2.5+ this role is present
   by default, in lower dbs it isn't. No way to find out in advance when writing
   a script. No support in FB yet for CREATE OR UPDATE ROLE so probably best
@@ -109,7 +109,7 @@ var
   ModuleName, EntryPoint, Params: string;
 begin
   FunctionsList:= TStringList.Create;
-  FunctionsList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 6, Count);
+  FunctionsList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otUDF, Count);
   // Get functions in dependency order:
   dmSysTables.SortDependencies(FunctionsList);
   List.Clear;
@@ -139,7 +139,7 @@ var
   Description,Message: string; {not actually used here}
   i: Integer;
 begin
-  List.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 10, Count);
+  List.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otExceptions, Count);
   for i:= 0 to List.Count - 1 do
   begin
     dmSysTables.GetExceptionInfo(List[i],Message, Description, CreateStatement);
@@ -155,7 +155,7 @@ var
   Count: Integer;
   i: Integer;
 begin
-  List.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 2, Count);
+  List.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otGenerators, Count);
   for i:= 0 to List.Count - 1 do
     List[i]:= 'Create Generator ' + List[i] + ' ;';
   Result:= List.Count > 0;
@@ -175,7 +175,7 @@ var
   CheckConstraint: string;
   DefaultValue: string;
 begin
-  List.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 8, Count);
+  List.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otDomains, Count);
   // Get domains in dependency order (if dependencies can exist between domains)
   dmSysTables.SortDependencies(List);
   for i:= 0 to List.Count - 1 do
@@ -350,7 +350,7 @@ begin
   TablesList:= TStringList.Create;
   TableScript:= TStringList.Create;
   try
-    TablesList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 1, Count);
+    TablesList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otTables, Count);
     List.Clear;
     for i:= 0 to TablesList.Count - 1 do
     begin
@@ -378,7 +378,7 @@ begin
   ProceduresList:= TStringList.Create;
   ProcedureScript:= TStringList.Create;
   try
-    ProceduresList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 5, Count);
+    ProceduresList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otStoredProcedures, Count);
     // Get procedures in dependency order:
     dmSysTables.SortDependencies(ProceduresList);
     List.Clear;
@@ -415,7 +415,7 @@ begin
   ViewsList:= TStringList.Create;
   ViewsBodyList:= TStringList.Create;
   try
-    ViewsList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 4, Count);
+    ViewsList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otViews, Count);
     // Get procedures in dependency order:
     dmSysTables.SortDependencies(ViewsList);
     List.Clear;
@@ -448,7 +448,7 @@ begin
   TriggersList:= TStringList.Create;
   TriggerScript:= TStringList.Create;
   try
-    TriggersList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 3, Count);
+    TriggersList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otTriggers, Count);
     List.Clear;
     for i:= 0 to TriggersList.Count - 1 do
     begin
@@ -479,7 +479,7 @@ begin
   TablesList:= TStringList.Create;
   FieldsList:= TStringList.Create;
   try
-    TablesList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 1, Count);
+    TablesList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otTables, Count);
     List.Clear;
     for i:= 0 to TablesList.Count - 1 do
     begin
@@ -585,7 +585,7 @@ var
 begin
   TablesList:= TStringList.Create;
   try
-    TablesList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, 1, Count);
+    TablesList.CommaText:= dmSysTables.GetDBObjectNames(dbIndex, otTables, Count);
     // Get tables in dependency order - probably won't matter much in this case:
     dmSysTables.SortDependencies(TablesList);
     List.Clear;

systables.pas

@@ -35,7 +35,7 @@ type
     procedure Init(dbIndex: Integer);
     // Gets list of object names that have type specified by TVIndex
     // Returns Count of objects in Count
-    function GetDBObjectNames(DatabaseIndex, TVIndex: Integer; var Count: Integer): string;
+    function GetDBObjectNames(DatabaseIndex: integer; ObjectType: TObjectType; var Count: Integer): string;
     // Returns object list (list of object names, i.e. tables, views) sorted by dependency
     // Limits sorting within one category (e.g. views)
     procedure SortDependencies(var ObjectList: TStringList);
@@ -155,44 +155,45 @@ end;
 
 (*****  GetDBObjectNames, like Table names, Triggers, Generators, etc according to TVIndex  ****)
 
-function TdmSysTables.GetDBObjectNames(DatabaseIndex, TVIndex: Integer;
+function TdmSysTables.GetDBObjectNames(DatabaseIndex: integer;
+  ObjectType: TObjectType;
   var Count: Integer): string;
 begin
   Init(DatabaseIndex);
   sqQuery.Close;
-  if TVIndex = 1 then // Tables
+  if ObjectType = otTables then // Tables
     sqQuery.SQL.Text:= 'select rdb$relation_name from rdb$relations where rdb$view_blr is null ' +
       ' and (rdb$system_flag is null or rdb$system_flag = 0) order by rdb$relation_name'
   else
-  if TVIndex = 2 then // Generators
+  if ObjectType = otGenerators then // Generators
     sqQuery.SQL.Text:= 'select RDB$GENERATOR_Name from RDB$GENERATORS where RDB$SYSTEM_FLAG = 0 order by rdb$generator_Name'
   else
-  if TVIndex = 3 then // Triggers
+  if ObjectType = otTriggers then // Triggers
     sqQuery.SQL.Text:= 'SELECT rdb$Trigger_Name FROM RDB$TRIGGERS WHERE RDB$SYSTEM_FLAG=0 order by rdb$Trigger_Name'
   else
-  if TVIndex = 4 then // Views
+  if ObjectType = otViews then // Views
     sqQuery.SQL.Text:= 'SELECT DISTINCT RDB$VIEW_NAME FROM RDB$VIEW_RELATIONS order by rdb$View_Name'
   else
-  if TVIndex = 5 then // Stored Procedures
+  if ObjectType = otStoredProcedures then // Stored Procedures
     sqQuery.SQL.Text:= 'SELECT RDB$Procedure_Name FROM RDB$PROCEDURES order by rdb$Procedure_Name'
   else
-  if TVIndex = 6 then // UDF
+  if ObjectType = otUDF then // UDF
     sqQuery.SQL.Text:= 'SELECT RDB$FUNCTION_NAME FROM RDB$FUNCTIONS where RDB$SYSTEM_FLAG=0 order by rdb$Function_Name'
   else
-  if TVIndex = 7 then // System Tables
+  if ObjectType = otSystemTables then // System Tables
     sqQuery.SQL.Text:= 'SELECT RDB$RELATION_NAME FROM RDB$RELATIONS where RDB$SYSTEM_FLAG=1 ' +
       'order by RDB$RELATION_NAME'
   else
-  if TVIndex = 8 then // Domains, excluding system-defined domains
+  if ObjectType = otDomains then // Domains, excluding system-defined domains
     sqQuery.SQL.Text:= 'select RDB$FIELD_NAME from RDB$FIELDS where RDB$Field_Name not like ''RDB$%''  order by rdb$Field_Name'
   else
-  if TVIndex = 9 then // Roles
+  if ObjectType = otRoles then // Roles
     sqQuery.SQL.Text:= 'select RDB$ROLE_NAME from RDB$ROLES order by rdb$Role_Name'
   else
-  if TVIndex = 10 then // Exceptions
+  if ObjectType = otExceptions then // Exceptions
     sqQuery.SQL.Text:= 'select RDB$EXCEPTION_NAME from RDB$EXCEPTIONS order by rdb$Exception_Name'
   else
-  if TVIndex = 11 then // Users
+  if ObjectType = otUsers then // Users
     sqQuery.SQL.Text:= 'select distinct RDB$User from RDB$USER_PRIVILEGES where RDB$User_Type = 8 order by rdb$User';
 
   // Put the result list as comma delimited string
@@ -846,7 +847,7 @@ procedure TdmSysTables.GetDomainTypes(dbIndex: Integer; List: TStrings);
 var
   Count: Integer;
 begin
-  List.CommaText:= List.CommaText + ',' + GetDBObjectNames(dbIndex, 8, Count);
+  List.CommaText:= List.CommaText + ',' + GetDBObjectNames(dbIndex, otDomains, Count);
 end;
 
 function TdmSysTables.GetDefaultTypeSize(dbIndex: Integer; TypeName: string): Integer;

tablemanage.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, sqldb, IBConnection, FileUtil, LResources, Forms, Controls,
-  Graphics, Dialogs, ComCtrls, Grids, Buttons, StdCtrls, CheckLst, LCLType;
+  Graphics, Dialogs, ComCtrls, Grids, Buttons, StdCtrls, CheckLst, LCLType, turbocommon;
 
 type
 
@@ -345,7 +345,7 @@ begin
   fmNewConstraint.edNewName.Text:= 'FK_' + FTableName + '_' + IntToStr(sgConstraints.RowCount);
 
   // Foreign tables
-  fmNewConstraint.cbTables.Items.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, 1, Count);
+  fmNewConstraint.cbTables.Items.CommaText:= dmSysTables.GetDBObjectNames(FDBIndex, otTables, Count);
   fmNewConstraint.DatabaseIndex:= FDBIndex;
 
   fmNewConstraint.laTable.Caption:= FTableName;

turbocommon.pas

@@ -229,6 +229,36 @@ const
     ('WIN_PTBR','WIN1252')
     );
 
+type
+  // Types of objects in database
+  // Note: the order and count must match the array below
+  // Also, do not assign values to the individual enums; code depends
+  // on them starting with 0 and being contiguous
+  TObjectType = (
+    otTables,
+    otGenerators,
+    otTriggers,
+    otViews,
+    otStoredProcedures,
+    otUDF {User-Defined functions},
+    otSystemTables,
+    otDomains {excludes system domains},
+    otRoles,
+    otExceptions,
+    otUsers,
+    otIndexes,
+    otConstraints
+    );
+
+const
+  NumObjects = 13; //number of different objects in dbObjects array below
+  dbObjects: array [0 .. NumObjects-1] of string =
+    ('Tables', 'Generators', 'Triggers',
+    'Views', 'Stored Procedures', 'UDFs',
+    'Sys Tables', 'Domains', 'Roles',
+    'Exceptions', 'Users', 'Indices',
+    'Constraints');
+
 // Retrieve available collations for specified Characterset into Collations
 function GetCollations(const Characterset: string; var Collations: TStringList): boolean;