v2.1.2 — Results polish: horizontal scroll, zoom, timeout + keyword bracketing

- Query Editor: configurable CommandTimeout (default 120s, 0=unlimited), zoom
  -/reset/+ controls, horizontal scrolling on wide result sets, MaxHeight and
  SizeToHeader column width, row/column virtualization.
- Autocomplete: SqlCompletionItem.Complete brackets identifiers so tables named
  like reserved keywords (transaction/user/order/...) parse correctly.
  Tables/views/procs/functions always qualified as [schema].[name]; columns
  bracketed only when reserved or non-identifier.
- PrimaryButton: explicit Horizontal/VerticalContentAlignment=Center — fixes
  off-centre text on Connect/Execute/Build buttons.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: Khalil Benazzouz

CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to DB TEAM are documented here. Format: [Keep a Changelog](h
 
 ## [Unreleased]
 
+## [2.1.2] — 2026-04-20 — Results grid polish + reserved-keyword bracketing + configurable timeout
+
+### Added
+- **Configurable query timeout** — Query Editor result pane gains a `Timeout` box (default **120 s**, was 30 s). `0` = unlimited. Applies to the current tab only.
+- **Results zoom** — `-` / reset / `+` buttons above the grid bind to a `ScaleTransform` so the whole result set can be shrunk to fit a wide table or enlarged for readability. Percentage is displayed.
+- **Horizontal scrolling** — the results host is now a `ScrollViewer` with `HorizontalScrollBarVisibility=Auto`, and each inner `DataGrid` has its own horizontal scrollbar plus `MaxHeight=500`, `ColumnWidth=SizeToHeader` and row/column virtualisation. Wide result sets no longer clip their rightmost columns off-screen.
+
+### Fixed
+- **Reserved-keyword collisions** — `SqlCompletionItem.Complete` now brackets identifiers on insertion. Tables/views/procedures/functions are always qualified as `[schema].[name]`; columns get bracketed only when they collide with a T-SQL reserved word (`transaction`, `user`, `order`, …) or contain a non-identifier character. A user table named `transaction` no longer parses as the `TRANSACTION` keyword.
+- **Button content alignment** — `PrimaryButton` (and every style that inherits from it, e.g. `SuccessButton`, `DangerButton`) explicitly sets `HorizontalContentAlignment=Center` and `VerticalContentAlignment=Center`. The Connect/Execute/Build buttons now render their text centred when padding or layout stretched them before.
+
+### Changed
+- Version bumped to **2.1.2**.
+
 ## [2.1.1] — 2026-04-18 — Release CI fix + dock pane live-switch
 
 ### Fixed

Directory.Build.props

@@ -1,10 +1,10 @@
 <Project>
 
   <PropertyGroup>
-    <Version>2.1.1</Version>
-    <AssemblyVersion>2.1.1.0</AssemblyVersion>
-    <FileVersion>2.1.1.0</FileVersion>
-    <InformationalVersion>2.1.1</InformationalVersion>
+    <Version>2.1.2</Version>
+    <AssemblyVersion>2.1.2.0</AssemblyVersion>
+    <FileVersion>2.1.2.0</FileVersion>
+    <InformationalVersion>2.1.2</InformationalVersion>
 
     <Company>DB TEAM</Company>
     <Authors>Khalil Benazzouz</Authors>

README.md

@@ -1,6 +1,6 @@
 # DB TEAM
 
-> Professional SQL Server IDE built with WPF · **v2.1.1**
+> Professional SQL Server IDE built with WPF · **v2.1.2**
 
 [![.NET](https://img.shields.io/badge/.NET-8-blueviolet)](https://dotnet.microsoft.com/)
 [![Platform](https://img.shields.io/badge/platform-Windows-blue)](https://github.com/khalilbenaz/DBTeam/releases)
@@ -14,7 +14,7 @@
 
 Connection management · Object Explorer · T-SQL editor with autocomplete + format · Schema Compare with column-level ALTER · Data Compare · Table Designer (create + edit) · Query Profiler with plan tree · Data Generator · HTML Documenter · Interactive ER Diagram · Query History & favorites · Session restore.
 
-**📥 Download installer**: [DBTeam-Setup-2.1.1.exe](https://github.com/khalilbenaz/DBTeam/releases/latest) or [portable ZIP](https://github.com/khalilbenaz/DBTeam/releases/latest)
+**📥 Download installer**: [DBTeam-Setup-2.1.2.exe](https://github.com/khalilbenaz/DBTeam/releases/latest) or [portable ZIP](https://github.com/khalilbenaz/DBTeam/releases/latest)
 **🌐 Website**: <https://khalilbenaz.github.io/DBTeam/>
 **📚 Docs**: [Install](docs/INSTALL.md) · [User guide](docs/USER-GUIDE.md) · [Architecture](docs/ARCHITECTURE.md) · [Modules](docs/MODULES.md) · [Changelog](CHANGELOG.md)
 

src/DBTeam.App/Lang/en-US.xaml

@@ -15,7 +15,7 @@
     <sys:String x:Key="Menu.About">_About DB TEAM</sys:String>
     <sys:String x:Key="Menu.Shortcuts">Keyboard _Shortcuts</sys:String>
     <sys:String x:Key="About.Title">About DB TEAM</sys:String>
-    <sys:String x:Key="About.Version">Version 2.1.1</sys:String>
+    <sys:String x:Key="About.Version">Version 2.1.2</sys:String>
     <sys:String x:Key="About.Description">Professional SQL Server IDE built with WPF.</sys:String>
     <sys:String x:Key="About.Close">Close</sys:String>
     <sys:String x:Key="About.Author">Author · Khalil Benazzouz</sys:String>
@@ -184,6 +184,12 @@
     <sys:String x:Key="Qe.ExportXml">Export to XML</sys:String>
     <sys:String x:Key="Qe.DbContext">Database context for this tab</sys:String>
     <sys:String x:Key="Qe.RefreshDb">Refresh database list</sys:String>
+    <sys:String x:Key="Qe.Zoom">Zoom</sys:String>
+    <sys:String x:Key="Qe.ZoomIn">Zoom in</sys:String>
+    <sys:String x:Key="Qe.ZoomOut">Zoom out</sys:String>
+    <sys:String x:Key="Qe.ZoomReset">Reset zoom</sys:String>
+    <sys:String x:Key="Qe.Timeout">Timeout</sys:String>
+    <sys:String x:Key="Qe.TimeoutTip">Query execution timeout in seconds (0 = unlimited)</sys:String>
 
     <sys:String x:Key="Dbg.AttachTip">Parse script + open connection</sys:String>
     <sys:String x:Key="Dbg.ContinueTip">Continue until next breakpoint or end</sys:String>

src/DBTeam.App/Lang/fr-FR.xaml

@@ -15,7 +15,7 @@
     <sys:String x:Key="Menu.About">À _propos de DB TEAM</sys:String>
     <sys:String x:Key="Menu.Shortcuts">_Raccourcis clavier</sys:String>
     <sys:String x:Key="About.Title">À propos de DB TEAM</sys:String>
-    <sys:String x:Key="About.Version">Version 2.1.1</sys:String>
+    <sys:String x:Key="About.Version">Version 2.1.2</sys:String>
     <sys:String x:Key="About.Description">IDE SQL Server professionnel développé en WPF.</sys:String>
     <sys:String x:Key="About.Close">Fermer</sys:String>
     <sys:String x:Key="About.Author">Auteur · Khalil Benazzouz</sys:String>
@@ -184,6 +184,12 @@
     <sys:String x:Key="Qe.ExportXml">Exporter en XML</sys:String>
     <sys:String x:Key="Qe.DbContext">Contexte de base de données pour cet onglet</sys:String>
     <sys:String x:Key="Qe.RefreshDb">Rafraîchir la liste des bases</sys:String>
+    <sys:String x:Key="Qe.Zoom">Zoom</sys:String>
+    <sys:String x:Key="Qe.ZoomIn">Agrandir</sys:String>
+    <sys:String x:Key="Qe.ZoomOut">Réduire</sys:String>
+    <sys:String x:Key="Qe.ZoomReset">Réinitialiser le zoom</sys:String>
+    <sys:String x:Key="Qe.Timeout">Timeout</sys:String>
+    <sys:String x:Key="Qe.TimeoutTip">Délai d'expiration de la requête en secondes (0 = aucun)</sys:String>
 
     <sys:String x:Key="Dbg.AttachTip">Analyser le script + ouvrir la connexion</sys:String>
     <sys:String x:Key="Dbg.ContinueTip">Continuer jusqu'au prochain point d'arrêt ou à la fin</sys:String>

src/DBTeam.App/Themes/AppStyles.xaml

@@ -90,6 +90,8 @@
         <Setter Property="Padding" Value="14,8"/>
         <Setter Property="FontWeight" Value="SemiBold"/>
         <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">

src/Modules/DBTeam.Modules.QueryEditor/Intellisense/CompletionItem.cs

@@ -33,6 +33,65 @@ public SqlCompletionItem(string text, CompletionKind kind, string? description =
 
     public void Complete(TextArea textArea, ISegment completionSegment, EventArgs insertionRequestEventArgs)
     {
-        textArea.Document.Replace(completionSegment, Text);
+        textArea.Document.Replace(completionSegment, ToInsertionText());
     }
+
+    /// <summary>
+    /// Auto-brackets object identifiers so names colliding with T-SQL reserved
+    /// keywords (e.g. <c>transaction</c>, <c>user</c>, <c>order</c>) parse correctly.
+    /// Tables / views / procedures / functions are always qualified;
+    /// columns are bracketed only when the name is a reserved keyword.
+    /// </summary>
+    private string ToInsertionText()
+    {
+        switch (Kind)
+        {
+            case CompletionKind.Table:
+            case CompletionKind.View:
+            case CompletionKind.Procedure:
+            case CompletionKind.Function:
+            {
+                var parts = Text.Split('.');
+                if (parts.Length == 2) return $"[{parts[0]}].[{parts[1]}]";
+                return IsReserved(Text) || NeedsQuoting(Text) ? $"[{Text}]" : Text;
+            }
+            case CompletionKind.Column:
+                return IsReserved(Text) || NeedsQuoting(Text) ? $"[{Text}]" : Text;
+            default:
+                return Text;
+        }
+    }
+
+    private static bool NeedsQuoting(string s)
+    {
+        if (string.IsNullOrEmpty(s)) return false;
+        foreach (var c in s) if (!(char.IsLetterOrDigit(c) || c == '_')) return true;
+        return char.IsDigit(s[0]);
+    }
+
+    private static readonly System.Collections.Generic.HashSet<string> Reserved =
+        new(System.StringComparer.OrdinalIgnoreCase)
+        {
+            "ADD","ALL","ALTER","AND","ANY","AS","ASC","AUTHORIZATION","BACKUP","BEGIN","BETWEEN",
+            "BREAK","BROWSE","BULK","BY","CASCADE","CASE","CHECK","CHECKPOINT","CLOSE","CLUSTERED",
+            "COALESCE","COLLATE","COLUMN","COMMIT","COMPUTE","CONSTRAINT","CONTAINS","CONTAINSTABLE",
+            "CONTINUE","CONVERT","CREATE","CROSS","CURRENT","CURRENT_DATE","CURRENT_TIME","CURRENT_TIMESTAMP",
+            "CURRENT_USER","CURSOR","DATABASE","DBCC","DEALLOCATE","DECLARE","DEFAULT","DELETE","DENY","DESC",
+            "DISK","DISTINCT","DISTRIBUTED","DOUBLE","DROP","DUMP","ELSE","END","ERRLVL","ESCAPE","EXCEPT",
+            "EXEC","EXECUTE","EXISTS","EXIT","EXTERNAL","FETCH","FILE","FILLFACTOR","FOR","FOREIGN","FREETEXT",
+            "FREETEXTTABLE","FROM","FULL","FUNCTION","GOTO","GRANT","GROUP","HAVING","HOLDLOCK","IDENTITY",
+            "IDENTITYCOL","IDENTITY_INSERT","IF","IN","INDEX","INNER","INSERT","INTERSECT","INTO","IS","JOIN",
+            "KEY","KILL","LEFT","LIKE","LINENO","LOAD","MERGE","NATIONAL","NOCHECK","NONCLUSTERED","NOT","NULL",
+            "NULLIF","OF","OFF","OFFSETS","ON","OPEN","OPENDATASOURCE","OPENQUERY","OPENROWSET","OPENXML",
+            "OPTION","OR","ORDER","OUTER","OVER","PERCENT","PIVOT","PLAN","PRECISION","PRIMARY","PRINT","PROC",
+            "PROCEDURE","PUBLIC","RAISERROR","READ","READTEXT","RECONFIGURE","REFERENCES","REPLICATION","RESTORE",
+            "RESTRICT","RETURN","REVERT","REVOKE","RIGHT","ROLLBACK","ROWCOUNT","ROWGUIDCOL","RULE","SAVE","SCHEMA",
+            "SECURITYAUDIT","SELECT","SEMANTICKEYPHRASETABLE","SEMANTICSIMILARITYDETAILSTABLE","SEMANTICSIMILARITYTABLE",
+            "SESSION_USER","SET","SETUSER","SHUTDOWN","SOME","STATISTICS","SYSTEM_USER","TABLE","TABLESAMPLE","TEXTSIZE",
+            "THEN","TO","TOP","TRAN","TRANSACTION","TRIGGER","TRUNCATE","TRY_CONVERT","TSEQUAL","UNION","UNIQUE","UNPIVOT",
+            "UPDATE","UPDATETEXT","USE","USER","VALUES","VARYING","VIEW","WAITFOR","WHEN","WHERE","WHILE","WITH","WITHIN GROUP",
+            "WRITETEXT"
+        };
+
+    private static bool IsReserved(string s) => Reserved.Contains(s);
 }

src/Modules/DBTeam.Modules.QueryEditor/ViewModels/QueryEditorViewModel.cs

@@ -36,6 +36,12 @@ public QueryEditorViewModel(IQueryExecutionService exec, IDatabaseMetadataServic
     [ObservableProperty] private string messages = string.Empty;
     [ObservableProperty] private TimeSpan elapsed;
     [ObservableProperty] private int rowCount;
+    [ObservableProperty] private int commandTimeoutSeconds = 120;
+    [ObservableProperty] private double zoomFactor = 1.0;
+
+    [RelayCommand] private void ZoomIn()  => ZoomFactor = System.Math.Min(2.5, System.Math.Round(ZoomFactor + 0.1, 2));
+    [RelayCommand] private void ZoomOut() => ZoomFactor = System.Math.Max(0.5, System.Math.Round(ZoomFactor - 0.1, 2));
+    [RelayCommand] private void ZoomReset() => ZoomFactor = 1.0;
 
     public ObservableCollection<string> Databases { get; }
     public ObservableCollection<DataTable> Results { get; } = new();
@@ -69,7 +75,7 @@ public async Task ExecuteAsync()
         Results.Clear();
         Messages = string.Empty;
         StatusText = "Executing...";
-        var req = new QueryRequest { Sql = Sql, Database = Database };
+        var req = new QueryRequest { Sql = Sql, Database = Database, CommandTimeoutSeconds = CommandTimeoutSeconds };
         var r = await _exec.ExecuteAsync(Connection, req);
         foreach (var ds in r.ResultSets) Results.Add(ds);
         Messages = string.Join(Environment.NewLine, r.Messages);

src/Modules/DBTeam.Modules.QueryEditor/Views/QueryEditorView.xaml

@@ -85,13 +85,43 @@
                             <TextBlock Text="{DynamicResource Label.Results}"/>
                         </StackPanel>
                     </TabItem.Header>
-                    <ItemsControl ItemsSource="{Binding Results}">
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <DataGrid ItemsSource="{Binding}" AutoGenerateColumns="True" IsReadOnly="True" Margin="0,0,0,8"/>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
+                    <DockPanel>
+                        <Border DockPanel.Dock="Top" Padding="6,4" Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{DynamicResource Qe.Zoom}" VerticalAlignment="Center" Margin="0,0,6,0" Opacity="0.7"/>
+                                <Button Command="{Binding ZoomOutCommand}" Style="{StaticResource IconButton}" ToolTip="{DynamicResource Qe.ZoomOut}" Padding="4">
+                                    <md:PackIcon Kind="MagnifyMinus" Width="14" Height="14"/>
+                                </Button>
+                                <TextBlock Text="{Binding ZoomFactor, StringFormat={}{0:P0}}" VerticalAlignment="Center" Margin="4,0" MinWidth="40" TextAlignment="Center"/>
+                                <Button Command="{Binding ZoomInCommand}" Style="{StaticResource IconButton}" ToolTip="{DynamicResource Qe.ZoomIn}" Padding="4">
+                                    <md:PackIcon Kind="MagnifyPlus" Width="14" Height="14"/>
+                                </Button>
+                                <Button Command="{Binding ZoomResetCommand}" Style="{StaticResource IconButton}" ToolTip="{DynamicResource Qe.ZoomReset}" Padding="4" Margin="0,0,12,0">
+                                    <md:PackIcon Kind="Restore" Width="14" Height="14"/>
+                                </Button>
+                                <TextBlock Text="{DynamicResource Qe.Timeout}" VerticalAlignment="Center" Opacity="0.7" Margin="0,0,6,0"/>
+                                <TextBox Text="{Binding CommandTimeoutSeconds, UpdateSourceTrigger=PropertyChanged}" Width="60" VerticalAlignment="Center" ToolTip="{DynamicResource Qe.TimeoutTip}"/>
+                                <TextBlock Text="s" VerticalAlignment="Center" Margin="2,0,0,0" Opacity="0.6"/>
+                            </StackPanel>
+                        </Border>
+                        <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+                            <ItemsControl ItemsSource="{Binding Results}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <DataGrid ItemsSource="{Binding}" AutoGenerateColumns="True" IsReadOnly="True" Margin="0,0,0,8"
+                                                  HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
+                                                  MaxHeight="500" ColumnWidth="SizeToHeader"
+                                                  EnableRowVirtualization="True" EnableColumnVirtualization="True">
+                                            <DataGrid.LayoutTransform>
+                                                <ScaleTransform ScaleX="{Binding DataContext.ZoomFactor, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                                ScaleY="{Binding DataContext.ZoomFactor, RelativeSource={RelativeSource AncestorType=UserControl}}"/>
+                                            </DataGrid.LayoutTransform>
+                                        </DataGrid>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+                    </DockPanel>
                 </TabItem>
                 <TabItem>
                     <TabItem.Header>