fix: ineffective marking index as invisible or visible, must be done in a separate ALTER TABLE query

Refs #1388

Author: ansgarbecker

source/dbconnection.pas

@@ -431,8 +431,7 @@   TDBLogItem = class(TObject)
     frCreateTrigger,
     frCreateEvent,
     frInvisibleColumns,
-    frCompressedColumns,
-    frInvisibleIndexes
+    frCompressedColumns
     );
 
   TDBConnection = class(TComponent)
@@ -6728,8 +6727,6 @@ function TDBConnection.Has(Item: TFeatureOrRequirement): Boolean;
         frCreateEvent: Result := ServerVersionInt >= 50100;
         frInvisibleColumns: Result := (FParameters.IsMariaDB and (ServerVersionInt >= 100303)) or
           (FParameters.IsMySQL(True) and (ServerVersionInt >= 80023));
-        frInvisibleIndexes: Result := (FParameters.IsMariaDB and (ServerVersionInt >= 100600)) or
-          (FParameters.IsMySQL(True) and (ServerVersionInt >= 80000));
         frCompressedColumns: Result := (FParameters.IsMariaDB and (ServerVersionInt >= 100301));
       end;
     else Result := False;
@@ -11151,13 +11148,6 @@ function TTableKey.SQLCode(TableName: String=''): String;
     if not Comment.IsEmpty then
       Result := Result + ' COMMENT ' + FConnection.EscapeString(Comment);
 
-    if FConnection.Has(frInvisibleIndexes) then begin
-      if FConnection.Parameters.IsMySQL(True) then
-        Result := Result + ' ' + IfThen(Visible, 'VISIBLE', 'INVISIBLE')
-      else
-        Result := Result + ' ' + IfThen(Visible, 'NOT IGNORED', 'IGNORED');
-    end;
-
   end
   else begin
     // SQLite syntax:

source/dbstructures.mysql.pas

@@ -3396,6 +3396,24 @@ function TMySqlProvider.GetSql(AId: TQueryId): string;
     qGrantRole: Result := 'GRANT %s TO %s%s';
     qRevokeRole: Result := 'REVOKE %s FROM %s';
     qSetDefaultRole: Result := 'SET DEFAULT ROLE %s FOR %s';
+    qIndexVisible: Result := IfThen(
+      FServerVersion >= 100600, // mariadb
+      'NOT IGNORED',
+      IfThen(
+        FServerVersion >= 80000, // mysql
+        'VISIBLE',
+        ''
+        )
+      );
+    qIndexInvisible: Result := IfThen(
+      FServerVersion >= 100600, // mariadb
+      'IGNORED',
+      IfThen(
+        FServerVersion >= 80000, // mysql
+        'INVISIBLE',
+        ''
+        )
+      );
     else Result := inherited;
   end;
 end;

source/dbstructures.pas

@@ -52,7 +52,7 @@ interface
     qShowFunctionStatus, qShowProcedureStatus, qShowTriggers, qShowEvents, qShowCreateTrigger,
     qHelpKeyword, qShowWarnings, qGetEnumTypes,
     qDropUser, qCreateRole, qDropRole, qReloadPrivileges, qGrantRole, qRevokeRole, qSetDefaultRole,
-    qAutoInc);
+    qAutoInc, qIndexVisible, qIndexInvisible);
   TSqlProvider = class
     strict protected
       FNetType: TNetType;

source/table_editor.dfm

@@ -245,15 +245,15 @@ object frmTableEditor: TfrmTableEditor
         DefaultNodeHeight = 19
         DragMode = dmAutomatic
         EditDelay = 0
-        Header.AutoSizeIndex = 0
+        Header.AutoSizeIndex = -1
         Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption]
         Header.PopupMenu = MainForm.popupListHeader
         Images = MainForm.VirtualImageListMain
         PopupMenu = popupProperties
         TabOrder = 1
         TreeOptions.AutoOptions = [toAutoDropExpand, toAutoScrollOnExpand, toAutoTristateTracking, toAutoChangeScale]
         TreeOptions.MiscOptions = [toAcceptOLEDrop, toEditable, toFullRepaintOnResize, toGridExtensions, toInitOnSave, toToggleOnDblClick, toWheelPanning, toEditOnClick]
-        TreeOptions.PaintOptions = [toHotTrack, toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toShowVertGridLines, toThemeAware, toUseBlendedImages, toFullVertGridLines, toUseExplorerTheme, toHideTreeLinesIfThemed]
+        TreeOptions.PaintOptions = [toHotTrack, toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toShowVertGridLines, toThemeAware, toUseBlendedImages, toGhostedIfUnfocused, toFullVertGridLines, toUseExplorerTheme, toHideTreeLinesIfThemed]
         TreeOptions.SelectionOptions = [toExtendedFocus, toRightClickSelect]
         OnBeforePaint = treeIndexesBeforePaint
         OnClick = AnyTreeClick

source/table_editor.pas

@@ -914,10 +914,27 @@ function TfrmTableEditor.ComposeAlterStatement: TSQLBatch;
       Specs.Add('ADD ' + Constraint.SQLCode);
   end;
 
-
   FinishSpecs;
 
-  // Separate queries from here on
+  // Separate ALTER TABLE .. ALTER INDEX query for visible/invisible indexes features, which gets otherwise
+  // ignored in MySQL and MariaDB when done by a drop + add combined query. See issue #1388
+  if Conn.SqlProvider.Has(qIndexInvisible) then begin
+    for i:=0 to FKeys.Count-1 do begin
+      if FKeys[i].Modified then begin
+        Specs.Add('ALTER INDEX ' + Conn.QuoteIdent(FKeys[i].Name) + ' ' +
+          IfThen(
+            FKeys[i].Visible,
+            Conn.SqlProvider.GetSql(qIndexVisible),
+            Conn.SqlProvider.GetSql(qIndexInvisible)
+            )
+          );
+      end;
+    end;
+    FinishSpecs;
+  end;
+
+
+  // *** Separate queries from here on
 
   // Drop indexes, also changed indexes, which will be readded below
   for i:=0 to FDeletedKeys.Count-1 do begin
@@ -2091,7 +2108,10 @@ procedure TfrmTableEditor.treeIndexesGetImageIndex(Sender: TBaseVirtualTree;
   if not (Kind in [ikNormal, ikSelected]) then
     Exit;
   case VT.GetNodeLevel(Node) of
-    0: ImageIndex := FKeys[Node.Index].ImageIndex;
+    0: begin
+      ImageIndex := FKeys[Node.Index].ImageIndex;
+      Ghosted := not FKeys[Node.Index].Visible;
+    end;
     1: begin
       TblKey := FKeys[Node.Parent.Index];
       if TblKey.IsExpression(Node.Index) then
@@ -2122,7 +2142,11 @@ procedure TfrmTableEditor.treeIndexesGetText(Sender: TBaseVirtualTree;
         IndexColNumAlgorithm: CellText := TblKey.Algorithm;
         IndexColNumComment: CellText := TblKey.Comment;
         IndexColNumDirection: CellText := ''; // Column collation
-        IndexColNumVisibility: CellText := IfThen(TblKey.Visible, 'Visible', 'Invisible');
+        IndexColNumVisibility: CellText := IfThen(
+            TblKey.Visible,
+            DBObject.Connection.SqlProvider.GetSql(qIndexVisible),
+            DBObject.Connection.SqlProvider.GetSql(qIndexInvisible)
+          );
       end;
     end;
     1: begin
@@ -2360,7 +2384,7 @@ procedure TfrmTableEditor.treeIndexesEditing(Sender: TBaseVirtualTree;
       IndexColNumType: Allowed := True;
       IndexColNumAlgorithm: Allowed := True;
       IndexColNumComment: Allowed := True;
-      IndexColNumVisibility: Allowed := DBObject.Connection.Has(frInvisibleIndexes);
+      IndexColNumVisibility: Allowed := DBObject.Connection.SqlProvider.Has(qIndexInvisible);
     end;
   end
   else case Column of
@@ -2406,7 +2430,9 @@ procedure TfrmTableEditor.treeIndexesCreateEditor(Sender: TBaseVirtualTree;
   end else if (Level = 0) and (Column = IndexColNumVisibility) then begin
     // Visibility pulldown
     EnumEditor := TEnumEditorLink.Create(VT, True, nil);
-    EnumEditor.ValueList := Explode(',', 'Visible,Invisible');
+    EnumEditor.ValueList.Add('');
+    EnumEditor.ValueList.Add(DBObject.Connection.SqlProvider.GetSql(qIndexVisible));
+    EnumEditor.ValueList.Add(DBObject.Connection.SqlProvider.GetSql(qIndexInvisible));
     EditLink := EnumEditor;
   end else if (Level = 1) and (Column = IndexColNumName) then begin
     // Column names pulldown
@@ -2449,7 +2475,7 @@ procedure TfrmTableEditor.treeIndexesNewText(Sender: TBaseVirtualTree;
            end;
          IndexColNumAlgorithm: TblKey.Algorithm := NewText;
          IndexColNumComment: TblKey.Comment := NewText;
-         IndexColNumVisibility: TblKey.Visible := SameText(NewText, 'Visible');
+         IndexColNumVisibility: TblKey.Visible := SameText(NewText, DBObject.Connection.SqlProvider.GetSql(qIndexVisible));
        end;
        // Needs to be called manually for Name and IndexType properties:
        TblKey.Modification(Sender);