dohertj2/jdescopingtool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(configmanager): add dedicated SQL Server port control

Browse Source 
Add SqlServerPort property to connection string editor for explicit port
configuration, replacing the need to embed port in server name (e.g.,
localhost,1434). The port control generates the comma-separated format in
the connection string but does not parse it back when loading existing
connection strings.
This commit is contained in:
Joseph Doherty
2026-01-28 09:24:49 -05:00
parent daaeba2004
commit 5ee710d330
8 changed files with 334 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEW/src/Utils/JdeScoping.ConfigManager/Models/ConnectionStringEntry.cs
+11 -1
View File
@@ -55,6 +55,11 @@ public class ConnectionStringEntry
/// </summary>
public string? ApplicationName { get; set; }
/// <summary>
/// Gets or sets the SQL Server port number. When null, no port is specified.
/// </summary>
public int? SqlServerPort { get; set; }
/// <summary>
/// Gets or sets the Oracle server host name or address.
/// </summary>
@@ -94,7 +99,12 @@ public class ConnectionStringEntry
var parts = new List<string>();
if (!string.IsNullOrWhiteSpace(Server))
parts.Add($"Server={Server}");
{
var serverValue = SqlServerPort.HasValue && SqlServerPort.Value > 0
? $"{Server},{SqlServerPort.Value}"
: Server;
parts.Add($"Server={serverValue}");
}
if (!string.IsNullOrWhiteSpace(Database))
parts.Add($"Database={Database}");
if (!string.IsNullOrWhiteSpace(UserId))
NEW/src/Utils/JdeScoping.ConfigManager/Models/ConnectionStringsSectionConverter.cs
+78 -77
View File
@@ -62,11 +62,11 @@ public class ConnectionStringsSectionConverter : JsonConverter<ConnectionStrings
? reader.GetString()
: null;
var entry = ParseConnectionString(propertyName, connectionString ?? string.Empty);
section.Entries.Add(entry);
}
}
}
var entry = ParseConnectionString(propertyName, connectionString ?? string.Empty);
section.Entries.Add(entry);
}
}
}
return section;
}
@@ -94,57 +94,57 @@ public class ConnectionStringsSectionConverter : JsonConverter<ConnectionStrings
/// <summary>
/// Parses a connection string and attempts to detect the provider type.
/// </summary>
internal static ConnectionStringEntry ParseConnectionString(string name, string connectionString)
{
var entry = new ConnectionStringEntry
{
Name = name,
RawConnectionString = connectionString
};
// Try to detect provider and parse structured fields
var parts = ParseConnectionStringParts(connectionString);
// Detect Oracle using HOST/Service Name/Port pattern (DDTek.Oracle style)
var hasHost = parts.TryGetValue("host", out var host);
var hasServiceName = parts.TryGetValue("service name", out var serviceName);
var hasPort = parts.TryGetValue("port", out var portText);
if (hasHost || hasServiceName || hasPort)
{
entry.Provider = ConnectionProvider.Oracle;
if (hasHost && !string.IsNullOrEmpty(host))
{
entry.Host = host;
}
if (hasServiceName && !string.IsNullOrEmpty(serviceName))
{
entry.ServiceName = serviceName;
}
if (hasPort && !string.IsNullOrEmpty(portText) && int.TryParse(portText, out var port))
{
entry.Port = port;
}
if (parts.TryGetValue("user id", out var oraUserId))
{
entry.UserId = oraUserId;
}
if (parts.TryGetValue("password", out var oraPassword))
{
entry.Password = oraPassword;
}
}
// Detect Oracle first (Data Source with host:port/service pattern)
else if (parts.TryGetValue("data source", out var dataSource) &&
IsOracleDataSource(dataSource))
{
entry.Provider = ConnectionProvider.Oracle;
ParseOracleDataSource(entry, dataSource);
internal static ConnectionStringEntry ParseConnectionString(string name, string connectionString)
{
var entry = new ConnectionStringEntry
{
Name = name,
RawConnectionString = connectionString
};
// Try to detect provider and parse structured fields
var parts = ParseConnectionStringParts(connectionString);
// Detect Oracle using HOST/Service Name/Port pattern (DDTek.Oracle style)
var hasHost = parts.TryGetValue("host", out var host);
var hasServiceName = parts.TryGetValue("service name", out var serviceName);
var hasPort = parts.TryGetValue("port", out var portText);
if (hasHost || hasServiceName || hasPort)
{
entry.Provider = ConnectionProvider.Oracle;
if (hasHost && !string.IsNullOrEmpty(host))
{
entry.Host = host;
}
if (hasServiceName && !string.IsNullOrEmpty(serviceName))
{
entry.ServiceName = serviceName;
}
if (hasPort && !string.IsNullOrEmpty(portText) && int.TryParse(portText, out var port))
{
entry.Port = port;
}
if (parts.TryGetValue("user id", out var oraUserId))
{
entry.UserId = oraUserId;
}
if (parts.TryGetValue("password", out var oraPassword))
{
entry.Password = oraPassword;
}
}
// Detect Oracle first (Data Source with host:port/service pattern)
else if (parts.TryGetValue("data source", out var dataSource) &&
IsOracleDataSource(dataSource))
{
entry.Provider = ConnectionProvider.Oracle;
ParseOracleDataSource(entry, dataSource);
if (parts.TryGetValue("user id", out var oraUserId))
{
@@ -212,27 +212,28 @@ public class ConnectionStringsSectionConverter : JsonConverter<ConnectionStrings
entry.Provider = ConnectionProvider.Generic;
}
return entry;
}
internal static void ApplyConnectionString(ConnectionStringEntry entry, string connectionString)
{
var parsed = ParseConnectionString(entry.Name, connectionString);
entry.Provider = parsed.Provider;
entry.Server = parsed.Server;
entry.Database = parsed.Database;
entry.UserId = parsed.UserId;
entry.Password = parsed.Password;
entry.Encrypt = parsed.Encrypt;
entry.TrustServerCertificate = parsed.TrustServerCertificate;
entry.ConnectionTimeout = parsed.ConnectionTimeout;
entry.ApplicationName = parsed.ApplicationName;
entry.Host = parsed.Host;
entry.Port = parsed.Port;
entry.ServiceName = parsed.ServiceName;
entry.RawConnectionString = parsed.RawConnectionString;
}
return entry;
}
internal static void ApplyConnectionString(ConnectionStringEntry entry, string connectionString)
{
var parsed = ParseConnectionString(entry.Name, connectionString);
entry.Provider = parsed.Provider;
entry.Server = parsed.Server;
entry.SqlServerPort = parsed.SqlServerPort;
entry.Database = parsed.Database;
entry.UserId = parsed.UserId;
entry.Password = parsed.Password;
entry.Encrypt = parsed.Encrypt;
entry.TrustServerCertificate = parsed.TrustServerCertificate;
entry.ConnectionTimeout = parsed.ConnectionTimeout;
entry.ApplicationName = parsed.ApplicationName;
entry.Host = parsed.Host;
entry.Port = parsed.Port;
entry.ServiceName = parsed.ServiceName;
entry.RawConnectionString = parsed.RawConnectionString;
}
/// <summary>
/// Parses a connection string into key-value pairs.
NEW/src/Utils/JdeScoping.ConfigManager/ViewModels/Forms/ConnectionStringEntryViewModel.cs
+18
View File
@@ -208,6 +208,24 @@ public class ConnectionStringEntryViewModel : ViewModelBase
}
}
/// <summary>
/// Gets or sets the SQL Server port number.
/// </summary>
public int? SqlServerPort
{
get => _model.SqlServerPort;
set
{
if (_model.SqlServerPort != value)
{
_model.SqlServerPort = value;
OnPropertyChanged();
OnPropertyChanged(nameof(GeneratedConnectionString));
_onChanged();
}
}
}
/// <summary>
/// Gets or sets the Oracle host name.
/// </summary>
NEW/src/Utils/JdeScoping.ConfigManager/Views/Forms/ConnectionStringsFormView.axaml
+40 -28
View File
@@ -10,8 +10,8 @@
<!-- SqlServer Provider Template -->
<DataTemplate x:Key="SqlServerTemplate" x:DataType="vm:ConnectionStringEntryViewModel">
<StackPanel Spacing="16">
<!-- Server & Database Row -->
<Grid ColumnDefinitions="*,16,*">
<!-- Server & Port Row -->
<Grid ColumnDefinitions="*,16,120">
<StackPanel Grid.Column="0" Spacing="4">
<TextBlock Text="Server" Foreground="#9BA8B8" FontSize="12" FontWeight="Medium"/>
<TextBox Text="{Binding Server}"
@@ -23,15 +23,27 @@
Foreground="#5C6A7A" FontSize="11"/>
</StackPanel>
<StackPanel Grid.Column="2" Spacing="4">
<TextBlock Text="Database" Foreground="#9BA8B8" FontSize="12" FontWeight="Medium"/>
<TextBox Text="{Binding Database}"
Background="#232A35" Foreground="#E6EDF5"
BorderBrush="#3D4550" Height="36"
FontFamily="JetBrains Mono"
Watermark="ScopingTool"/>
<TextBlock Text="Port" Foreground="#9BA8B8" FontSize="12" FontWeight="Medium"/>
<NumericUpDown Value="{Binding SqlServerPort}"
Minimum="1" Maximum="65535"
Background="#232A35" Foreground="#E6EDF5"
BorderBrush="#3D4550" Height="36"
FontFamily="JetBrains Mono"/>
<TextBlock Text="Default: 1433"
Foreground="#5C6A7A" FontSize="11"/>
</StackPanel>
</Grid>
<!-- Database Row -->
<StackPanel Spacing="4">
<TextBlock Text="Database" Foreground="#9BA8B8" FontSize="12" FontWeight="Medium"/>
<TextBox Text="{Binding Database}"
Background="#232A35" Foreground="#E6EDF5"
BorderBrush="#3D4550" Height="36"
FontFamily="JetBrains Mono"
Watermark="ScopingTool"/>
</StackPanel>
<!-- UserId & Password Row -->
<Grid ColumnDefinitions="*,16,*">
<StackPanel Grid.Column="0" Spacing="4">
@@ -279,26 +291,26 @@
</Border>
</StackPanel>
<!-- Connection List -->
<Border BorderBrush="#2D3540" BorderThickness="1" CornerRadius="4">
<DataGrid ItemsSource="{Binding Connections}"
SelectedItem="{Binding SelectedConnection}"
AutoGenerateColumns="False"
IsReadOnly="True"
SelectionMode="Single"
GridLinesVisibility="Horizontal"
HeadersVisibility="Column"
Background="#0D0F12"
RowBackground="#0D0F12"
MaxHeight="220"
MinHeight="100">
<DataGrid.Columns>
<DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="Auto"/>
<DataGridTextColumn Header="Provider" Binding="{Binding ProviderDisplay}" Width="Auto"/>
<DataGridTextColumn Header="Server" Binding="{Binding ServerDisplay}" Width="*"/>
</DataGrid.Columns>
</DataGrid>
</Border>
<!-- Connection List -->
<Border BorderBrush="#2D3540" BorderThickness="1" CornerRadius="4">
<DataGrid ItemsSource="{Binding Connections}"
SelectedItem="{Binding SelectedConnection}"
AutoGenerateColumns="False"
IsReadOnly="True"
SelectionMode="Single"
GridLinesVisibility="Horizontal"
HeadersVisibility="Column"
Background="#0D0F12"
RowBackground="#0D0F12"
MaxHeight="220"
MinHeight="100">
<DataGrid.Columns>
<DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="Auto"/>
<DataGridTextColumn Header="Provider" Binding="{Binding ProviderDisplay}" Width="Auto"/>
<DataGridTextColumn Header="Server" Binding="{Binding ServerDisplay}" Width="*"/>
</DataGrid.Columns>
</DataGrid>
</Border>
<!-- Toolbar -->
<StackPanel Orientation="Horizontal" Spacing="8">