From a47ffea0888937cd970242b118d514762b3d17a7 Mon Sep 17 00:00:00 2001
From: Alex Bochkov <albochkov03@gmail.com>
Date: Fri, 21 Nov 2025 13:18:26 -0700
Subject: [PATCH 1/8] Add bulk data transfer support for MySQL and PostgreSQL

---
 AxialSqlTools/AxialSqlTools.csproj            |   3 +
 .../DataTransferWindowControl.xaml            | 135 +++++
 .../DataTransferWindowControl.xaml.cs         | 495 +++++++++++++++++-
 3 files changed, 632 insertions(+), 1 deletion(-)

diff --git a/AxialSqlTools/AxialSqlTools.csproj b/AxialSqlTools/AxialSqlTools.csproj
index 24a643a..9dabc97 100644
--- a/AxialSqlTools/AxialSqlTools.csproj
+++ b/AxialSqlTools/AxialSqlTools.csproj
@@ -234,6 +234,9 @@
     <PackageReference Include="NLog">
       <Version>6.0.6</Version>
     </PackageReference>
+    <PackageReference Include="MySqlConnector">
+      <Version>2.4.6</Version>
+    </PackageReference>
     <PackageReference Include="Npgsql">
       <Version>8.0.7</Version>
     </PackageReference>
diff --git a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml
index 22a5152..7e748a6 100644
--- a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml
+++ b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml
@@ -126,6 +126,141 @@
 
                     </Grid>
                 </TabItem>
+                <TabItem Header="SQL Server -> MySQL">
+                    <Grid>
+
+                        <StackPanel Orientation="Vertical" >
+
+                            <StackPanel Orientation="Horizontal"  Margin="5,5,5,5">
+                                <Button Height="35" Content="Select Source" Click="Button_SelectSourceToMySql_Click" x:Name="Button_SelectSourceToMySql" Width="120" FontWeight="Bold"/>
+                                <Label Content="Source Description" x:Name="Label_SourceDescriptionToMySql" VerticalAlignment="Center"/>
+                            </StackPanel>
+
+                            <DockPanel>
+                                <Label Content="Target Connection String" x:Name="Label_TargetDescriptionToMySql" VerticalAlignment="Center"/>
+                                <TextBox Height="23" x:Name="TextBox_TargetConnectionToMySql"/>
+                            </DockPanel>
+
+                            <StackPanel Orientation="Vertical"  Margin="5,5,5,5">
+                                <Label Content="Source Query" FontWeight="Bold"/>
+                                <RichTextBox Height="100" x:Name="RichTextBox_SourceQueryToMySql">
+                                    <FlowDocument>
+                                        <Paragraph>
+                                            <Run Text=""/>
+                                        </Paragraph>
+                                    </FlowDocument>
+                                </RichTextBox>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Vertical"  Margin="5,5,5,5">
+                                <Label Content="Target Table" FontWeight="Bold"/>
+                                <CheckBox Name="CheckBox_CreateTargetTableToMySql" Content="Create table if it does not exist"/>
+                                <CheckBox Name="CheckBox_TruncateTargetTableToMySql" Content="Clear target table before inserting new records"/>
+                                <CheckBox Name="CheckBox_SkipDataCopyToMySql" Content="Create table structure only (skip data copying)"/>
+                                <TextBox Height="23" TextWrapping="Wrap" Text="" x:Name="TextBox_TargetTableToMySql"/>
+                            </StackPanel>
+
+
+                            <StackPanel Orientation="Horizontal"  Margin="5,5,5,5">
+                                <Button Height="35" Content="Copy Data" Click="ButtonToMySql_CopyData_Click"  Name="ButtonToMySql_CopyData" Margin="5" Width="96" FontWeight="Bold" />
+                                <Button Height="35" Content="Cancel" Click="ButtonToMySql_Cancel_Click"  Name="ButtonToMySql_Cancel" Margin="5" Width="76" FontWeight="Bold" />
+                                <Label Content="(copy progress)" x:Name="Label_CopyProgressToMySql" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+
+                        </StackPanel>
+
+                    </Grid>
+                </TabItem>
+                <TabItem Header="PostgreSQL -> SQL Server">
+                    <Grid>
+
+                        <StackPanel Orientation="Vertical" >
+
+                            <DockPanel>
+                                <Label Content="Source Connection String" x:Name="Label_SourceDescriptionFromPsql" VerticalAlignment="Center"/>
+                                <TextBox Height="23" x:Name="TextBox_SourceConnectionFromPsql"/>
+                            </DockPanel>
+
+                            <StackPanel Orientation="Horizontal"  Margin="5,5,5,5">
+                                <Button Height="35" Content="Select Target" Click="Button_SelectTargetFromPsql_Click" x:Name="Button_SelectTargetFromPsql" Width="120" FontWeight="Bold"/>
+                                <Label Content="Target Description" x:Name="Label_TargetDescriptionFromPsql" VerticalAlignment="Center"/>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Vertical"  Margin="5,5,5,5">
+                                <Label Content="Source Query" FontWeight="Bold"/>
+                                <RichTextBox Height="100" x:Name="RichTextBox_SourceQueryFromPsql">
+                                    <FlowDocument>
+                                        <Paragraph>
+                                            <Run Text=""/>
+                                        </Paragraph>
+                                    </FlowDocument>
+                                </RichTextBox>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Vertical"  Margin="5,5,5,5">
+                                <Label Content="Target Table" FontWeight="Bold"/>
+                                <CheckBox Name="CheckBox_CreateTargetTableFromPsql" Content="Create table if it does not exist"/>
+                                <CheckBox Name="CheckBox_TruncateTargetTableFromPsql" Content="Clear target table before inserting new records"/>
+                                <CheckBox Name="CheckBox_SkipDataCopyFromPsql" Content="Create table structure only (skip data copying)"/>
+                                <TextBox Height="23" TextWrapping="Wrap" Text="" x:Name="TextBox_TargetTableFromPsql"/>
+                            </StackPanel>
+
+
+                            <StackPanel Orientation="Horizontal"  Margin="5,5,5,5">
+                                <Button Height="35" Content="Copy Data" Click="ButtonFromPsql_CopyData_Click"  Name="ButtonFromPsql_CopyData" Margin="5" Width="96" FontWeight="Bold" />
+                                <Button Height="35" Content="Cancel" Click="ButtonFromPsql_Cancel_Click"  Name="ButtonFromPsql_Cancel" Margin="5" Width="76" FontWeight="Bold" />
+                                <Label Content="(copy progress)" x:Name="Label_CopyProgressFromPsql" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+
+                        </StackPanel>
+
+                    </Grid>
+                </TabItem>
+                <TabItem Header="MySQL -> SQL Server">
+                    <Grid>
+
+                        <StackPanel Orientation="Vertical" >
+
+                            <DockPanel>
+                                <Label Content="Source Connection String" x:Name="Label_SourceDescriptionFromMySql" VerticalAlignment="Center"/>
+                                <TextBox Height="23" x:Name="TextBox_SourceConnectionFromMySql"/>
+                            </DockPanel>
+
+                            <StackPanel Orientation="Horizontal"  Margin="5,5,5,5">
+                                <Button Height="35" Content="Select Target" Click="Button_SelectTargetFromMySql_Click" x:Name="Button_SelectTargetFromMySql" Width="120" FontWeight="Bold"/>
+                                <Label Content="Target Description" x:Name="Label_TargetDescriptionFromMySql" VerticalAlignment="Center"/>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Vertical"  Margin="5,5,5,5">
+                                <Label Content="Source Query" FontWeight="Bold"/>
+                                <RichTextBox Height="100" x:Name="RichTextBox_SourceQueryFromMySql">
+                                    <FlowDocument>
+                                        <Paragraph>
+                                            <Run Text=""/>
+                                        </Paragraph>
+                                    </FlowDocument>
+                                </RichTextBox>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Vertical"  Margin="5,5,5,5">
+                                <Label Content="Target Table" FontWeight="Bold"/>
+                                <CheckBox Name="CheckBox_CreateTargetTableFromMySql" Content="Create table if it does not exist"/>
+                                <CheckBox Name="CheckBox_TruncateTargetTableFromMySql" Content="Clear target table before inserting new records"/>
+                                <CheckBox Name="CheckBox_SkipDataCopyFromMySql" Content="Create table structure only (skip data copying)"/>
+                                <TextBox Height="23" TextWrapping="Wrap" Text="" x:Name="TextBox_TargetTableFromMySql"/>
+                            </StackPanel>
+
+
+                            <StackPanel Orientation="Horizontal"  Margin="5,5,5,5">
+                                <Button Height="35" Content="Copy Data" Click="ButtonFromMySql_CopyData_Click"  Name="ButtonFromMySql_CopyData" Margin="5" Width="96" FontWeight="Bold" />
+                                <Button Height="35" Content="Cancel" Click="ButtonFromMySql_Cancel_Click"  Name="ButtonFromMySql_Cancel" Margin="5" Width="76" FontWeight="Bold" />
+                                <Label Content="(copy progress)" x:Name="Label_CopyProgressFromMySql" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+
+                        </StackPanel>
+
+                    </Grid>
+                </TabItem>
             </TabControl>
 
         </StackPanel>
diff --git a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
index e02f9af..c048bb2 100644
--- a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
+++ b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
@@ -1,8 +1,8 @@
 namespace AxialSqlTools
 {
     using Microsoft.VisualStudio.Shell;
+    using MySqlConnector;
     using Npgsql;
-    using NpgsqlTypes;
     using System;
     using System.Data;
     using System.Data.SqlClient;
@@ -31,6 +31,13 @@ public partial class DataTransferWindowControl : UserControl
 
         private string sourceConnectionStringPsql = "";
 
+        private string sourceConnectionStringMySql = "";
+        private string sourceConnectionStringFromPsql = "";
+        private string targetConnectionStringFromPsql = "";
+
+        private string sourceConnectionStringFromMySql = "";
+        private string targetConnectionStringFromMySql = "";
+
 
         static class SqlBulkCopyHelper
         {
@@ -67,6 +74,10 @@ public DataTransferWindowControl()
 
             TextBox_TargetConnectionToPsql.Text = "Server=127.0.0.1;Port=5432;Database=postgres;User Id=postgres;Password=<password>;";
 
+            TextBox_TargetConnectionToMySql.Text = "Server=127.0.0.1;Port=3306;Database=mysql;User ID=root;Password=<password>;";
+            TextBox_SourceConnectionFromPsql.Text = "Server=127.0.0.1;Port=5432;Database=postgres;User Id=postgres;Password=<password>;";
+            TextBox_SourceConnectionFromMySql.Text = "Server=127.0.0.1;Port=3306;Database=mysql;User ID=root;Password=<password>;";
+
         }
 
         private async void SqlToSql_CopyData_UpdateStatusAsync(object bulkCopySender, SqlRowsCopiedEventArgs eventArgs)
@@ -224,6 +235,33 @@ private void Button_SelectSource_Click(object sender, RoutedEventArgs e)
             SetCopyCommandAvailability();
         }
 
+        private void Button_SelectSourceToMySql_Click(object sender, RoutedEventArgs e)
+        {
+            var ci = ScriptFactoryAccess.GetCurrentConnectionInfoFromObjectExplorer();
+
+            sourceConnectionStringMySql = ci.FullConnectionString;
+
+            Label_SourceDescriptionToMySql.Content = $"Server: [{ci.ServerName}] / Database: [{ci.Database}]";
+        }
+
+        private void Button_SelectTargetFromPsql_Click(object sender, RoutedEventArgs e)
+        {
+            var ci = ScriptFactoryAccess.GetCurrentConnectionInfoFromObjectExplorer();
+
+            targetConnectionStringFromPsql = ci.FullConnectionString;
+
+            Label_TargetDescriptionFromPsql.Content = $"Server: [{ci.ServerName}] / Database: [{ci.Database}]";
+        }
+
+        private void Button_SelectTargetFromMySql_Click(object sender, RoutedEventArgs e)
+        {
+            var ci = ScriptFactoryAccess.GetCurrentConnectionInfoFromObjectExplorer();
+
+            targetConnectionStringFromMySql = ci.FullConnectionString;
+
+            Label_TargetDescriptionFromMySql.Content = $"Server: [{ci.ServerName}] / Database: [{ci.Database}]";
+        }
+
         private void Button_SelectTarget_Click(object sender, RoutedEventArgs e)
         {
             var ci = ScriptFactoryAccess.GetCurrentConnectionInfoFromObjectExplorer();
@@ -265,6 +303,47 @@ string MapSqlServerToPostgresType(string sqlServerType)
             }
         }
 
+        string MapClrToMySqlType(Type clrType)
+        {
+            switch (Type.GetTypeCode(clrType))
+            {
+                case TypeCode.Int32: return "INT";
+                case TypeCode.Int64: return "BIGINT";
+                case TypeCode.Int16: return "SMALLINT";
+                case TypeCode.Decimal: return "DECIMAL(38,10)";
+                case TypeCode.Double: return "DOUBLE";
+                case TypeCode.Single: return "FLOAT";
+                case TypeCode.String: return "TEXT";
+                case TypeCode.Boolean: return "BOOLEAN";
+                case TypeCode.DateTime: return "DATETIME";
+                default:
+                    if (clrType == typeof(Guid)) return "CHAR(36)";
+                    if (clrType == typeof(byte[])) return "LONGBLOB";
+                    return "TEXT";
+            }
+        }
+
+        string MapClrToSqlServerType(Type clrType)
+        {
+            switch (Type.GetTypeCode(clrType))
+            {
+                case TypeCode.Int32: return "INT";
+                case TypeCode.Int64: return "BIGINT";
+                case TypeCode.Int16: return "SMALLINT";
+                case TypeCode.Decimal: return "DECIMAL(38,10)";
+                case TypeCode.Double: return "FLOAT";
+                case TypeCode.Single: return "REAL";
+                case TypeCode.String: return "NVARCHAR(MAX)";
+                case TypeCode.Boolean: return "BIT";
+                case TypeCode.DateTime: return "DATETIME2";
+                default:
+                    if (clrType == typeof(Guid)) return "UNIQUEIDENTIFIER";
+                    if (clrType == typeof(byte[])) return "VARBINARY(MAX)";
+                    if (clrType == typeof(DateTimeOffset)) return "DATETIMEOFFSET";
+                    return "NVARCHAR(MAX)";
+            }
+        }
+
         private async void ButtonToPsql_CopyData_Click(object sender, RoutedEventArgs e)
         {
             // Ensure a target table name is provided.
@@ -429,5 +508,419 @@ private void Button_SelectSourceToPsql_Click(object sender, RoutedEventArgs e)
 
             Label_SourceDescriptionToPsql.Content = $"Server: [{ci.ServerName}] / Database: [{ci.Database}]";
         }
+
+        private async void ButtonToMySql_CopyData_Click(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrEmpty(TextBox_TargetTableToMySql.Text))
+            {
+                TextBox_TargetTableToMySql.Text = $"data_export_{DateTime.Now:yyyyddMMHHmmss}";
+            }
+
+            _cancellationTokenSource = new CancellationTokenSource();
+            CancellationToken cancellationToken = _cancellationTokenSource.Token;
+
+            stopwatch = Stopwatch.StartNew();
+
+            ButtonToMySql_CopyData.Visibility = System.Windows.Visibility.Collapsed;
+            ButtonToMySql_Cancel.Visibility = System.Windows.Visibility.Visible;
+
+            try
+            {
+                TextRange textRange = new TextRange(RichTextBox_SourceQueryToMySql.Document.ContentStart,
+                                                    RichTextBox_SourceQueryToMySql.Document.ContentEnd);
+                string sqlQuery = textRange.Text;
+                string targetTable = TextBox_TargetTableToMySql.Text;
+                string targetMySqlConnString = TextBox_TargetConnectionToMySql.Text;
+
+                using (var sqlConn = new SqlConnection(sourceConnectionStringMySql))
+                {
+                    await sqlConn.OpenAsync(cancellationToken);
+                    using (var sqlCmd = new SqlCommand(sqlQuery, sqlConn))
+                    {
+                        sqlCmd.CommandTimeout = 0;
+                        using (var reader = await sqlCmd.ExecuteReaderAsync(CommandBehavior.SequentialAccess, cancellationToken))
+                        {
+                            DataTable schemaTable = reader.GetSchemaTable();
+                            if (schemaTable == null)
+                                throw new Exception("Failed to retrieve schema from SQL Server.");
+
+                            StringBuilder createTableQuery = new StringBuilder($"CREATE TABLE IF NOT EXISTS `{targetTable}` (");
+                            StringBuilder columnList = new StringBuilder();
+
+                            foreach (DataRow row in schemaTable.Rows)
+                            {
+                                string columnName = row["ColumnName"].ToString();
+                                var clrType = (Type)row["DataType"];
+                                string mysqlType = MapClrToMySqlType(clrType);
+
+                                createTableQuery.Append($"`{columnName}` {mysqlType}, ");
+                                columnList.Append($"`{columnName}`,");
+                            }
+
+                            createTableQuery.Length -= 2;
+                            createTableQuery.Append(");");
+                            columnList.Length--;
+
+                            using (var mySqlConn = new MySqlConnection(targetMySqlConnString))
+                            {
+                                await mySqlConn.OpenAsync(cancellationToken);
+
+                                if (CheckBox_CreateTargetTableToMySql.IsChecked == true)
+                                {
+                                    using (var createCmd = new MySqlCommand(createTableQuery.ToString(), mySqlConn))
+                                    {
+                                        await createCmd.ExecuteNonQueryAsync(cancellationToken);
+                                    }
+                                }
+
+                                if (CheckBox_TruncateTargetTableToMySql.IsChecked == true)
+                                {
+                                    using (var truncateCmd = new MySqlCommand($"TRUNCATE TABLE `{targetTable}`;", mySqlConn))
+                                    {
+                                        await truncateCmd.ExecuteNonQueryAsync(cancellationToken);
+                                    }
+                                }
+
+                                if (CheckBox_SkipDataCopyToMySql.IsChecked == false)
+                                {
+                                    using (var bulkCopy = new MySqlBulkCopy(mySqlConn)
+                                    {
+                                        DestinationTableName = targetTable,
+                                        BatchSize = 10000,
+                                        BulkCopyTimeout = 0,
+                                        NotifyAfter = 10000
+                                    })
+                                    {
+                                        bulkCopy.MySqlRowsCopied += async (s, args) =>
+                                        {
+                                            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+                                            TimeSpan elapsed = stopwatch.Elapsed;
+                                            Label_CopyProgressToMySql.Content = $"Rows copied: {args.RowsCopied:#,0} in {(int)elapsed.TotalSeconds:#,0} sec.";
+                                        };
+
+                                        foreach (DataRow row in schemaTable.Rows)
+                                        {
+                                            string columnName = row["ColumnName"].ToString();
+                                            bulkCopy.ColumnMappings.Add(columnName, columnName);
+                                        }
+
+                                        await bulkCopy.WriteToServerAsync(reader, cancellationToken);
+
+                                        TimeSpan totalElapsed = stopwatch.Elapsed;
+                                        Label_CopyProgressToMySql.Content =
+                                            $"Completed | Total rows copied: {bulkCopy.RowsCopied:#,0} in {(int)totalElapsed.TotalSeconds:#,0} sec.";
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                MessageBox.Show("Data transfer has been cancelled.", "DataTransferWindow");
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Something went wrong: {ex.Message}", "DataTransferWindow");
+            }
+            finally
+            {
+                ButtonToMySql_CopyData.Visibility = System.Windows.Visibility.Visible;
+                ButtonToMySql_Cancel.Visibility = System.Windows.Visibility.Collapsed;
+                stopwatch.Stop();
+            }
+        }
+
+        private void ButtonToMySql_Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            _cancellationTokenSource.Cancel();
+        }
+
+        private async void ButtonFromPsql_CopyData_Click(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrEmpty(TextBox_TargetTableFromPsql.Text))
+            {
+                TextBox_TargetTableFromPsql.Text = $"data_import_{DateTime.Now:yyyyddMMHHmmss}";
+            }
+
+            _cancellationTokenSource = new CancellationTokenSource();
+            CancellationToken cancellationToken = _cancellationTokenSource.Token;
+            stopwatch = Stopwatch.StartNew();
+
+            ButtonFromPsql_CopyData.Visibility = System.Windows.Visibility.Collapsed;
+            ButtonFromPsql_Cancel.Visibility = System.Windows.Visibility.Visible;
+
+            try
+            {
+                TextRange textRange = new TextRange(RichTextBox_SourceQueryFromPsql.Document.ContentStart,
+                                                    RichTextBox_SourceQueryFromPsql.Document.ContentEnd);
+                string sqlQuery = textRange.Text;
+                string targetTable = TextBox_TargetTableFromPsql.Text;
+                sourceConnectionStringFromPsql = TextBox_SourceConnectionFromPsql.Text;
+
+                using (var npgConn = new NpgsqlConnection(sourceConnectionStringFromPsql))
+                {
+                    await npgConn.OpenAsync(cancellationToken);
+                    using (var cmd = new NpgsqlCommand(sqlQuery, npgConn))
+                    {
+                        cmd.CommandTimeout = 0;
+                        using (var reader = await cmd.ExecuteReaderAsync(CommandBehavior.SequentialAccess, cancellationToken))
+                        {
+                            DataTable schemaTable = reader.GetSchemaTable();
+                            if (schemaTable == null)
+                                throw new Exception("Failed to retrieve schema from PostgreSQL.");
+
+                            string targetColumns = "";
+                            foreach (DataRow schemaRow in schemaTable.Rows)
+                            {
+                                string columnName = schemaRow["ColumnName"].ToString();
+                                var clrType = (Type)schemaRow["DataType"];
+                                string sqlDataTypeName = MapClrToSqlServerType(clrType);
+
+                                targetColumns += (targetColumns == "" ? "" : ",\n");
+                                targetColumns += $"[{columnName}] {sqlDataTypeName}";
+                            }
+
+                            string targetTableCommand =
+                                $"IF OBJECT_ID('{targetTable}') IS NULL \n" +
+                                $"CREATE TABLE {targetTable} ({targetColumns})";
+
+                            using (SqlConnection targetConn = new SqlConnection(targetConnectionStringFromPsql))
+                            {
+                                await targetConn.OpenAsync(cancellationToken);
+
+                                if (CheckBox_CreateTargetTableFromPsql.IsChecked == true)
+                                {
+                                    using (SqlCommand targetCmd = new SqlCommand(targetTableCommand, targetConn))
+                                    {
+                                        await targetCmd.ExecuteNonQueryAsync(cancellationToken);
+                                    }
+                                }
+
+                                if (CheckBox_TruncateTargetTableFromPsql.IsChecked == true)
+                                {
+                                    using (SqlCommand truncateCmd = new SqlCommand($"TRUNCATE TABLE {targetTable};", targetConn))
+                                    {
+                                        await truncateCmd.ExecuteNonQueryAsync(cancellationToken);
+                                    }
+                                }
+
+                                if (CheckBox_SkipDataCopyFromPsql.IsChecked == false)
+                                {
+                                    SqlBulkCopyOptions options = SqlBulkCopyOptions.Default;
+
+                                    if (KeepIdentityOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.KeepIdentity;
+
+                                    if (CheckConstraintsOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.CheckConstraints;
+
+                                    if (TableLockOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.TableLock;
+
+                                    if (KeepNullsOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.KeepNulls;
+
+                                    if (FireTriggersOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.FireTriggers;
+
+                                    if (AllowEncryptedValueModificationsOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.AllowEncryptedValueModifications;
+
+                                    using (SqlBulkCopy bulkCopy = new SqlBulkCopy(targetConn, options, null))
+                                    {
+                                        bulkCopy.DestinationTableName = targetTable;
+                                        bulkCopy.BatchSize = 10000;
+                                        bulkCopy.NotifyAfter = 10000;
+
+                                        bulkCopy.SqlRowsCopied += async (s, args) =>
+                                        {
+                                            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+                                            TimeSpan elapsed = stopwatch.Elapsed;
+                                            Label_CopyProgressFromPsql.Content = $"Rows copied: {args.RowsCopied:#,0} in {(int)elapsed.TotalSeconds:#,0} sec.";
+                                        };
+
+                                        foreach (DataRow schemaRow in schemaTable.Rows)
+                                        {
+                                            string columnName = schemaRow["ColumnName"].ToString();
+                                            bulkCopy.ColumnMappings.Add(columnName, columnName);
+                                        }
+
+                                        await bulkCopy.WriteToServerAsync(reader, cancellationToken);
+
+                                        int totalRowsCopied = SqlBulkCopyHelper.GetRowsCopied(bulkCopy);
+                                        TimeSpan ts = stopwatch.Elapsed;
+                                        Label_CopyProgressFromPsql.Content = $"Completed | Total rows copied: {totalRowsCopied:#,0} in {(int)ts.TotalSeconds:#,0} sec.";
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                MessageBox.Show("Data transfer has been cancelled.", "DataTransferWindow");
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Something went wrong: {ex.Message}", "DataTransferWindow");
+            }
+            finally
+            {
+                ButtonFromPsql_CopyData.Visibility = System.Windows.Visibility.Visible;
+                ButtonFromPsql_Cancel.Visibility = System.Windows.Visibility.Collapsed;
+                stopwatch.Stop();
+            }
+        }
+
+        private void ButtonFromPsql_Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            _cancellationTokenSource.Cancel();
+        }
+
+        private async void ButtonFromMySql_CopyData_Click(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrEmpty(TextBox_TargetTableFromMySql.Text))
+            {
+                TextBox_TargetTableFromMySql.Text = $"data_import_{DateTime.Now:yyyyddMMHHmmss}";
+            }
+
+            _cancellationTokenSource = new CancellationTokenSource();
+            CancellationToken cancellationToken = _cancellationTokenSource.Token;
+            stopwatch = Stopwatch.StartNew();
+
+            ButtonFromMySql_CopyData.Visibility = System.Windows.Visibility.Collapsed;
+            ButtonFromMySql_Cancel.Visibility = System.Windows.Visibility.Visible;
+
+            try
+            {
+                TextRange textRange = new TextRange(RichTextBox_SourceQueryFromMySql.Document.ContentStart,
+                                                    RichTextBox_SourceQueryFromMySql.Document.ContentEnd);
+                string sqlQuery = textRange.Text;
+                string targetTable = TextBox_TargetTableFromMySql.Text;
+                sourceConnectionStringFromMySql = TextBox_SourceConnectionFromMySql.Text;
+
+                using (var mySqlConn = new MySqlConnection(sourceConnectionStringFromMySql))
+                {
+                    await mySqlConn.OpenAsync(cancellationToken);
+                    using (var cmd = new MySqlCommand(sqlQuery, mySqlConn))
+                    {
+                        cmd.CommandTimeout = 0;
+                        using (var reader = await cmd.ExecuteReaderAsync(CommandBehavior.SequentialAccess, cancellationToken))
+                        {
+                            DataTable schemaTable = reader.GetSchemaTable();
+                            if (schemaTable == null)
+                                throw new Exception("Failed to retrieve schema from MySQL.");
+
+                            string targetColumns = "";
+                            foreach (DataRow schemaRow in schemaTable.Rows)
+                            {
+                                string columnName = schemaRow["ColumnName"].ToString();
+                                var clrType = (Type)schemaRow["DataType"];
+                                string sqlDataTypeName = MapClrToSqlServerType(clrType);
+
+                                targetColumns += (targetColumns == "" ? "" : ",\n");
+                                targetColumns += $"[{columnName}] {sqlDataTypeName}";
+                            }
+
+                            string targetTableCommand =
+                                $"IF OBJECT_ID('{targetTable}') IS NULL \n" +
+                                $"CREATE TABLE {targetTable} ({targetColumns})";
+
+                            using (SqlConnection targetConn = new SqlConnection(targetConnectionStringFromMySql))
+                            {
+                                await targetConn.OpenAsync(cancellationToken);
+
+                                if (CheckBox_CreateTargetTableFromMySql.IsChecked == true)
+                                {
+                                    using (SqlCommand targetCmd = new SqlCommand(targetTableCommand, targetConn))
+                                    {
+                                        await targetCmd.ExecuteNonQueryAsync(cancellationToken);
+                                    }
+                                }
+
+                                if (CheckBox_TruncateTargetTableFromMySql.IsChecked == true)
+                                {
+                                    using (SqlCommand truncateCmd = new SqlCommand($"TRUNCATE TABLE {targetTable};", targetConn))
+                                    {
+                                        await truncateCmd.ExecuteNonQueryAsync(cancellationToken);
+                                    }
+                                }
+
+                                if (CheckBox_SkipDataCopyFromMySql.IsChecked == false)
+                                {
+                                    SqlBulkCopyOptions options = SqlBulkCopyOptions.Default;
+
+                                    if (KeepIdentityOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.KeepIdentity;
+
+                                    if (CheckConstraintsOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.CheckConstraints;
+
+                                    if (TableLockOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.TableLock;
+
+                                    if (KeepNullsOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.KeepNulls;
+
+                                    if (FireTriggersOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.FireTriggers;
+
+                                    if (AllowEncryptedValueModificationsOption.IsChecked == true)
+                                        options |= SqlBulkCopyOptions.AllowEncryptedValueModifications;
+
+                                    using (SqlBulkCopy bulkCopy = new SqlBulkCopy(targetConn, options, null))
+                                    {
+                                        bulkCopy.DestinationTableName = targetTable;
+                                        bulkCopy.BatchSize = 10000;
+                                        bulkCopy.NotifyAfter = 10000;
+
+                                        bulkCopy.SqlRowsCopied += async (s, args) =>
+                                        {
+                                            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+                                            TimeSpan elapsed = stopwatch.Elapsed;
+                                            Label_CopyProgressFromMySql.Content = $"Rows copied: {args.RowsCopied:#,0} in {(int)elapsed.TotalSeconds:#,0} sec.";
+                                        };
+
+                                        foreach (DataRow schemaRow in schemaTable.Rows)
+                                        {
+                                            string columnName = schemaRow["ColumnName"].ToString();
+                                            bulkCopy.ColumnMappings.Add(columnName, columnName);
+                                        }
+
+                                        await bulkCopy.WriteToServerAsync(reader, cancellationToken);
+
+                                        int totalRowsCopied = SqlBulkCopyHelper.GetRowsCopied(bulkCopy);
+                                        TimeSpan ts = stopwatch.Elapsed;
+                                        Label_CopyProgressFromMySql.Content = $"Completed | Total rows copied: {totalRowsCopied:#,0} in {(int)ts.TotalSeconds:#,0} sec.";
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                MessageBox.Show("Data transfer has been cancelled.", "DataTransferWindow");
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Something went wrong: {ex.Message}", "DataTransferWindow");
+            }
+            finally
+            {
+                ButtonFromMySql_CopyData.Visibility = System.Windows.Visibility.Visible;
+                ButtonFromMySql_Cancel.Visibility = System.Windows.Visibility.Collapsed;
+                stopwatch.Stop();
+            }
+        }
+
+        private void ButtonFromMySql_Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            _cancellationTokenSource.Cancel();
+        }
     }
 }
\ No newline at end of file

From 35493a05a1649076d07993f80690ac726657d753 Mon Sep 17 00:00:00 2001
From: Alex Bochkov <albochkov03@gmail.com>
Date: Fri, 21 Nov 2025 13:22:21 -0700
Subject: [PATCH 2/8] Fix MySQL bulk copy instantiation

---
 .../DataTransferWindowControl.xaml.cs         | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
index c048bb2..ad49d8f 100644
--- a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
+++ b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
@@ -583,33 +583,31 @@ private async void ButtonToMySql_CopyData_Click(object sender, RoutedEventArgs e
 
                                 if (CheckBox_SkipDataCopyToMySql.IsChecked == false)
                                 {
-                                    using (var bulkCopy = new MySqlBulkCopy(mySqlConn)
+                                    var bulkCopy = new MySqlBulkCopy(mySqlConn)
                                     {
                                         DestinationTableName = targetTable,
-                                        BatchSize = 10000,
                                         BulkCopyTimeout = 0,
                                         NotifyAfter = 10000
-                                    })
+                                    };
+
+                                    bulkCopy.MySqlRowsCopied += async (s, args) =>
                                     {
-                                        bulkCopy.MySqlRowsCopied += async (s, args) =>
-                                        {
-                                            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
-                                            TimeSpan elapsed = stopwatch.Elapsed;
-                                            Label_CopyProgressToMySql.Content = $"Rows copied: {args.RowsCopied:#,0} in {(int)elapsed.TotalSeconds:#,0} sec.";
-                                        };
+                                        await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+                                        TimeSpan elapsed = stopwatch.Elapsed;
+                                        Label_CopyProgressToMySql.Content = $"Rows copied: {args.RowsCopied:#,0} in {(int)elapsed.TotalSeconds:#,0} sec.";
+                                    };
 
-                                        foreach (DataRow row in schemaTable.Rows)
-                                        {
-                                            string columnName = row["ColumnName"].ToString();
-                                            bulkCopy.ColumnMappings.Add(columnName, columnName);
-                                        }
+                                    foreach (DataRow row in schemaTable.Rows)
+                                    {
+                                        string columnName = row["ColumnName"].ToString();
+                                        bulkCopy.ColumnMappings.Add(columnName, columnName);
+                                    }
 
-                                        await bulkCopy.WriteToServerAsync(reader, cancellationToken);
+                                    await bulkCopy.WriteToServerAsync(reader, cancellationToken);
 
-                                        TimeSpan totalElapsed = stopwatch.Elapsed;
-                                        Label_CopyProgressToMySql.Content =
-                                            $"Completed | Total rows copied: {bulkCopy.RowsCopied:#,0} in {(int)totalElapsed.TotalSeconds:#,0} sec.";
-                                    }
+                                    TimeSpan totalElapsed = stopwatch.Elapsed;
+                                    Label_CopyProgressToMySql.Content =
+                                        $"Completed | Total rows copied: {bulkCopy.RowsCopied:#,0} in {(int)totalElapsed.TotalSeconds:#,0} sec.";
                                 }
                             }
                         }

From 041e0c98faeb30551eca07cb6adc712cc1b860d4 Mon Sep 17 00:00:00 2001
From: Alex Bochkov <albochkov03@gmail.com>
Date: Fri, 21 Nov 2025 13:26:58 -0700
Subject: [PATCH 3/8] Use MySqlBulkCopyResult RowsInserted

---
 AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
index ad49d8f..b6f9c2f 100644
--- a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
+++ b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
@@ -603,11 +603,11 @@ private async void ButtonToMySql_CopyData_Click(object sender, RoutedEventArgs e
                                         bulkCopy.ColumnMappings.Add(columnName, columnName);
                                     }
 
-                                    await bulkCopy.WriteToServerAsync(reader, cancellationToken);
+                                    var result = await bulkCopy.WriteToServerAsync(reader, cancellationToken);
 
                                     TimeSpan totalElapsed = stopwatch.Elapsed;
                                     Label_CopyProgressToMySql.Content =
-                                        $"Completed | Total rows copied: {bulkCopy.RowsCopied:#,0} in {(int)totalElapsed.TotalSeconds:#,0} sec.";
+                                        $"Completed | Total rows copied: {result.RowsInserted:#,0} in {(int)totalElapsed.TotalSeconds:#,0} sec.";
                                 }
                             }
                         }

From 4afe074eb1756b7fd6fc6e17c713cab6aef48558 Mon Sep 17 00:00:00 2001
From: Alex Bochkov <albochkov03@gmail.com>
Date: Fri, 21 Nov 2025 13:27:09 -0700
Subject: [PATCH 4/8] Use MySqlBulkCopyColumnMapping

---
 AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
index b6f9c2f..94de36e 100644
--- a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
+++ b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
@@ -600,7 +600,7 @@ private async void ButtonToMySql_CopyData_Click(object sender, RoutedEventArgs e
                                     foreach (DataRow row in schemaTable.Rows)
                                     {
                                         string columnName = row["ColumnName"].ToString();
-                                        bulkCopy.ColumnMappings.Add(columnName, columnName);
+                                        bulkCopy.ColumnMappings.Add(new MySqlBulkCopyColumnMapping(columnName, columnName));
                                     }
 
                                     var result = await bulkCopy.WriteToServerAsync(reader, cancellationToken);

From 32525fcd44cc1baa1fe8afef43a5134715c32531 Mon Sep 17 00:00:00 2001
From: Alex Bochkov <albochkov03@gmail.com>
Date: Fri, 21 Nov 2025 13:29:59 -0700
Subject: [PATCH 5/8] Fix MySQL bulk copy mapping ordinals

---
 AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
index 94de36e..e143a92 100644
--- a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
+++ b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
@@ -600,7 +600,8 @@ private async void ButtonToMySql_CopyData_Click(object sender, RoutedEventArgs e
                                     foreach (DataRow row in schemaTable.Rows)
                                     {
                                         string columnName = row["ColumnName"].ToString();
-                                        bulkCopy.ColumnMappings.Add(new MySqlBulkCopyColumnMapping(columnName, columnName));
+                                        int sourceOrdinal = Convert.ToInt32(row["ColumnOrdinal"]);
+                                        bulkCopy.ColumnMappings.Add(new MySqlBulkCopyColumnMapping(sourceOrdinal, columnName));
                                     }
 
                                     var result = await bulkCopy.WriteToServerAsync(reader, cancellationToken);

From 00ddd5de558553c55d0da67e8cd5e0549e31fa1f Mon Sep 17 00:00:00 2001
From: Alex Bochkov <albochkov03@gmail.com>
Date: Fri, 21 Nov 2025 13:33:02 -0700
Subject: [PATCH 6/8] wip

---
 AxialSqlTools/AxialSqlTools.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AxialSqlTools/AxialSqlTools.csproj b/AxialSqlTools/AxialSqlTools.csproj
index 9dabc97..86e3a8a 100644
--- a/AxialSqlTools/AxialSqlTools.csproj
+++ b/AxialSqlTools/AxialSqlTools.csproj
@@ -235,7 +235,7 @@
       <Version>6.0.6</Version>
     </PackageReference>
     <PackageReference Include="MySqlConnector">
-      <Version>2.4.6</Version>
+      <Version>2.5.0</Version>
     </PackageReference>
     <PackageReference Include="Npgsql">
       <Version>8.0.7</Version>

From d262f890a9e193b687990c32f564a79c66166391 Mon Sep 17 00:00:00 2001
From: Alex Bochkov <albochkov03@gmail.com>
Date: Mon, 1 Dec 2025 10:07:01 -0700
Subject: [PATCH 7/8] Pull recent commits (#42)

* wip

* wip

* Add filters and auto-resize when exporting to Google Sheets (#40)

* Update README.md

* wip

* version bump

* Update image in README.md
---
 AxialSqlTools/AxialSqlTools.csproj            | 11 ++-
 AxialSqlTools/AxialSqlToolsPackage.cs         |  8 +-
 AxialSqlTools/AxialSqlToolsPackage.vsct       | 11 ++-
 .../FormatOptionsDialog.xaml                  |  0
 .../FormatOptionsDialog.xaml.cs               |  0
 .../GoogleSheetsExportSuccessDialog.xaml      | 29 ++++++
 .../GoogleSheetsExportSuccessDialog.xaml.cs   | 53 ++++++++++
 .../ExportGridToGoogleSheetCommand.cs         | 26 +++--
 .../HealthDashboard_ServerControl.xaml.cs     |  2 +-
 AxialSqlTools/Modules/ExcelExport.cs          |  2 +-
 AxialSqlTools/Modules/GoogleSheetsExport.cs   | 97 ++++++++++++++++++-
 AxialSqlTools/Modules/ScriptFactoryAccess.cs  | 29 ++++++
 AxialSqlTools/Properties/AssemblyInfo.cs      |  4 +-
 README.md                                     |  4 +-
 14 files changed, 247 insertions(+), 29 deletions(-)
 rename AxialSqlTools/Commands/{FormatQueryDialog => Dialogs}/FormatOptionsDialog.xaml (100%)
 rename AxialSqlTools/Commands/{FormatQueryDialog => Dialogs}/FormatOptionsDialog.xaml.cs (100%)
 create mode 100644 AxialSqlTools/Commands/Dialogs/GoogleSheetsExportSuccessDialog.xaml
 create mode 100644 AxialSqlTools/Commands/Dialogs/GoogleSheetsExportSuccessDialog.xaml.cs

diff --git a/AxialSqlTools/AxialSqlTools.csproj b/AxialSqlTools/AxialSqlTools.csproj
index 86e3a8a..3f60470 100644
--- a/AxialSqlTools/AxialSqlTools.csproj
+++ b/AxialSqlTools/AxialSqlTools.csproj
@@ -60,7 +60,7 @@
     </Compile>
     <Compile Include="Modules\ExcelImport.cs" />
     <Compile Include="Modules\TsqlFormatterCommentInterleaver.cs" />
-    <Compile Include="Commands\FormatQueryDialog\FormatOptionsDialog.xaml.cs">
+    <Compile Include="Commands\Dialogs\FormatOptionsDialog.xaml.cs">
       <DependentUpon>FormatOptionsDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="SchemaCompare\SchemaCompareWindow.cs" />
@@ -80,6 +80,9 @@
     <Compile Include="Commands\ExportGridToGoogleSheetCommand.cs" />
     <Compile Include="Commands\ExportGridToExcelCommand.cs" />
     <Compile Include="Commands\FormatQueryCommand.cs" />
+    <Compile Include="Commands\Dialogs\GoogleSheetsExportSuccessDialog.xaml.cs">
+      <DependentUpon>GoogleSheetsExportSuccessDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Commands\CopyQueryAsHtmlCommand.cs" />
     <Compile Include="Commands\OpenTemplatesFolderCommand.cs" />
     <Compile Include="Commands\RefreshTemplatesCommand.cs" />
@@ -288,7 +291,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Commands\FormatQueryDialog\FormatOptionsDialog.xaml">
+    <Page Include="Commands\Dialogs\FormatOptionsDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Commands\Dialogs\GoogleSheetsExportSuccessDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/AxialSqlTools/AxialSqlToolsPackage.cs b/AxialSqlTools/AxialSqlToolsPackage.cs
index 9151c2c..21f71f8 100644
--- a/AxialSqlTools/AxialSqlToolsPackage.cs
+++ b/AxialSqlTools/AxialSqlToolsPackage.cs
@@ -58,9 +58,9 @@ namespace AxialSqlTools
     [ProvideToolWindow(typeof(AboutWindow))]
     [ProvideToolWindow(typeof(ToolWindowGridToEmail))]
     [ProvideToolWindow(typeof(HealthDashboard_Server))]
-    [ProvideToolWindow(typeof(HealthDashboard_Servers))]
+    //[ProvideToolWindow(typeof(HealthDashboard_Servers))]
     [ProvideToolWindow(typeof(DataTransferWindow))]
-    [ProvideToolWindow(typeof(AskChatGptWindow))]
+    //[ProvideToolWindow(typeof(AskChatGptWindow))]
     [ProvideToolWindow(typeof(SqlServerBuildsWindow))]
     [ProvideToolWindow(typeof(QueryHistoryWindow))]
     [ProvideToolWindow(typeof(DatabaseScripterToolWindow))]
@@ -283,13 +283,13 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
                 await ExportGridToAsInsertsCommand.InitializeAsync(this);
                 await ToolWindowGridToEmailCommand.InitializeAsync(this);
                 await HealthDashboard_ServerCommand.InitializeAsync(this);
-                await HealthDashboard_ServersCommand.InitializeAsync(this);
+                //await HealthDashboard_ServersCommand.InitializeAsync(this);
                 await CopyQueryAsHtmlCommand.InitializeAsync(this);
                 await DataTransferWindowCommand.InitializeAsync(this);
                 await DataImportWindowCommand.InitializeAsync(this);
                 await CheckAddinVersionCommand.InitializeAsync(this);
                 await ResultGridCopyAsInsertCommand.InitializeAsync(this);
-                await AskChatGptCommand.InitializeAsync(this);
+                //await AskChatGptCommand.InitializeAsync(this);
                 await SqlServerBuildsWindowCommand.InitializeAsync(this);
                 await QueryHistoryWindowCommand.InitializeAsync(this);
                 await DatabaseScripterToolWindowCommand.InitializeAsync(this);
diff --git a/AxialSqlTools/AxialSqlToolsPackage.vsct b/AxialSqlTools/AxialSqlToolsPackage.vsct
index 52f2589..b605e59 100644
--- a/AxialSqlTools/AxialSqlToolsPackage.vsct
+++ b/AxialSqlTools/AxialSqlToolsPackage.vsct
@@ -178,6 +178,7 @@
           <LocCanonicalName>AxialSqlTools.ScriptSelectedObject</LocCanonicalName>
         </Strings>
       </Button>
+      <!--
       <Button guid="guidAxialSqlToolsPackageCmdSet" id="AxialFindObjectInObjectExplorer" priority="0x0000" type="Button">
         <Parent guid="guidAxialSqlToolsPackageCmdSet" id="AxialToolsSubMenuGroup_Script" />
         <CommandFlag>IconAndText</CommandFlag>
@@ -193,7 +194,7 @@
         <Strings>
           <ButtonText>Script Result Into a New Window - TODO</ButtonText>
         </Strings>
-      </Button>
+      </Button>-->
 
       <Button guid="guidAxialSqlToolsPackageCmdSet" id="AxialQueryHistoryCommand" priority="0x0000" type="Button">
         <Parent guid="guidAxialSqlToolsPackageCmdSet" id="AxialToolsSubMenuGroup_Script" />
@@ -211,14 +212,14 @@
           <ButtonText>Health Dashboard - Server</ButtonText>
         </Strings>
       </Button>
-      <Button guid="guidAxialSqlToolsPackageCmdSet" id="AxialHealthDashboardServersCommand" priority="0x0000" type="Button">
+      <!--<Button guid="guidAxialSqlToolsPackageCmdSet" id="AxialHealthDashboardServersCommand" priority="0x0000" type="Button">
         <Parent guid="guidAxialSqlToolsPackageCmdSet" id="AxialToolsSubMenuGroup_Health" />
         <Icon guid="guidServerHealth" id="bmpServerHealth" />
         <CommandFlag>DefaultInvisible</CommandFlag>
         <Strings>
           <ButtonText>Health Dashboard - Group of Servers</ButtonText>
         </Strings>
-      </Button>
+      </Button>-->
       <Button guid="guidAxialSqlToolsPackageCmdSet" id="AxialSqlServerBuildsCommand" priority="0x3000" type="Button">
         <Parent guid="guidAxialSqlToolsPackageCmdSet" id="AxialToolsSubMenuGroup_Health" />
         <Icon guid="guidSqlBuildInfo" id="bmpSqlBuildInfo" />
@@ -267,7 +268,7 @@
         </Strings>
       </Button>
 
-      <Button guid="guidAxialSqlToolsPackageCmdSet" id="AxialAskChatGptCommand" priority="0x0000" type="Button">
+      <!--<Button guid="guidAxialSqlToolsPackageCmdSet" id="AxialAskChatGptCommand" priority="0x0000" type="Button">
         <Parent guid="guidAxialSqlToolsPackageCmdSet" id="AxialToolsSubMenuGroup_AI" />
         <Icon guid="guidChat" id="bmpChat" />
         <CommandFlag>DefaultInvisible</CommandFlag>
@@ -276,7 +277,7 @@
         </Strings>
       </Button>
 
-      <!--<Button guid="guidAxialSqlToolsPackageCmdSet" id="AxialBackupTimelineCommand" priority="0x0000" type="Button">
+      <Button guid="guidAxialSqlToolsPackageCmdSet" id="AxialBackupTimelineCommand" priority="0x0000" type="Button">
         <Parent guid="guidAxialSqlToolsPackageCmdSet" id="AxialToolsSubMenuGroup_Timelines" />
         <Icon guid="guidDataTransfer" id="bmpDataTransfer" />
         <CommandFlag>DefaultInvisible</CommandFlag>
diff --git a/AxialSqlTools/Commands/FormatQueryDialog/FormatOptionsDialog.xaml b/AxialSqlTools/Commands/Dialogs/FormatOptionsDialog.xaml
similarity index 100%
rename from AxialSqlTools/Commands/FormatQueryDialog/FormatOptionsDialog.xaml
rename to AxialSqlTools/Commands/Dialogs/FormatOptionsDialog.xaml
diff --git a/AxialSqlTools/Commands/FormatQueryDialog/FormatOptionsDialog.xaml.cs b/AxialSqlTools/Commands/Dialogs/FormatOptionsDialog.xaml.cs
similarity index 100%
rename from AxialSqlTools/Commands/FormatQueryDialog/FormatOptionsDialog.xaml.cs
rename to AxialSqlTools/Commands/Dialogs/FormatOptionsDialog.xaml.cs
diff --git a/AxialSqlTools/Commands/Dialogs/GoogleSheetsExportSuccessDialog.xaml b/AxialSqlTools/Commands/Dialogs/GoogleSheetsExportSuccessDialog.xaml
new file mode 100644
index 0000000..d2b1776
--- /dev/null
+++ b/AxialSqlTools/Commands/Dialogs/GoogleSheetsExportSuccessDialog.xaml
@@ -0,0 +1,29 @@
+<Window x:Class="AxialSqlTools.GoogleSheetsExportSuccessDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        mc:Ignorable="d"
+        Title="Export Complete"
+        Height="170"
+        Width="420"
+        ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner"
+        ShowInTaskbar="False">
+    <Grid Margin="16">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <TextBlock Text="The data has been exported to Google Sheets." TextWrapping="Wrap" />
+        <TextBlock Grid.Row="1" Margin="0,12,0,0" TextWrapping="Wrap">
+            <Hyperlink x:Name="SpreadsheetLink" RequestNavigate="SpreadsheetLink_RequestNavigate">
+                <Run x:Name="SpreadsheetLinkText" />
+            </Hyperlink>
+        </TextBlock>
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,16,0,0">
+            <Button Width="75" Click="OkButton_Click">OK</Button>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/AxialSqlTools/Commands/Dialogs/GoogleSheetsExportSuccessDialog.xaml.cs b/AxialSqlTools/Commands/Dialogs/GoogleSheetsExportSuccessDialog.xaml.cs
new file mode 100644
index 0000000..02abc5b
--- /dev/null
+++ b/AxialSqlTools/Commands/Dialogs/GoogleSheetsExportSuccessDialog.xaml.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Navigation;
+
+namespace AxialSqlTools
+{
+    public partial class GoogleSheetsExportSuccessDialog : Window
+    {
+        private readonly string spreadsheetUrl;
+
+        public GoogleSheetsExportSuccessDialog(string spreadsheetUrl, string spreadsheetTitle)
+        {
+            InitializeComponent();
+
+            this.spreadsheetUrl = spreadsheetUrl ?? string.Empty;
+            SpreadsheetLinkText.Text = string.IsNullOrWhiteSpace(spreadsheetTitle) ? spreadsheetUrl : spreadsheetTitle;
+
+            Uri uri;
+            if (Uri.TryCreate(spreadsheetUrl, UriKind.Absolute, out uri))
+            {
+                SpreadsheetLink.NavigateUri = uri;
+            }
+        }
+
+        private void SpreadsheetLink_RequestNavigate(object sender, RequestNavigateEventArgs e)
+        {
+            if (!string.IsNullOrWhiteSpace(spreadsheetUrl))
+            {
+                try
+                {
+                    ProcessStartInfo psi = new ProcessStartInfo
+                    {
+                        FileName = spreadsheetUrl,
+                        UseShellExecute = true
+                    };
+                    Process.Start(psi);
+                }
+                catch
+                {
+                    // Swallow exceptions from launching the browser to keep the dialog responsive.
+                }
+            }
+
+            e.Handled = true;
+        }
+
+        private void OkButton_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+    }
+}
diff --git a/AxialSqlTools/Commands/ExportGridToGoogleSheetCommand.cs b/AxialSqlTools/Commands/ExportGridToGoogleSheetCommand.cs
index 1fc356f..367505c 100644
--- a/AxialSqlTools/Commands/ExportGridToGoogleSheetCommand.cs
+++ b/AxialSqlTools/Commands/ExportGridToGoogleSheetCommand.cs
@@ -108,19 +108,25 @@ private async Task ExecuteAsync()
             {
                 var result = await GoogleSheetsExport.ExportToNewSpreadsheetAsync(dataTables, settings, isShiftPressed, CancellationToken.None);
 
-                string message = "The data has been exported to Google Sheets.";
-                if (!string.IsNullOrEmpty(result.SpreadsheetUrl))
+                if (string.IsNullOrEmpty(result.SpreadsheetUrl))
                 {
-                    message += $"\n\n{result.SpreadsheetUrl}";
+                    VsShellUtilities.ShowMessageBox(
+                        this.package,
+                        "The data has been exported to Google Sheets.",
+                        "Export Complete",
+                        OLEMSGICON.OLEMSGICON_INFO,
+                        OLEMSGBUTTON.OLEMSGBUTTON_OK,
+                        OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);
                 }
+                else
+                {
+                    var dialog = new GoogleSheetsExportSuccessDialog(result.SpreadsheetUrl, result.SpreadsheetTitle)
+                    {
+                        Owner = System.Windows.Application.Current?.MainWindow
+                    };
 
-                VsShellUtilities.ShowMessageBox(
-                    this.package,
-                    message,
-                    "Export Complete",
-                    OLEMSGICON.OLEMSGICON_INFO,
-                    OLEMSGBUTTON.OLEMSGBUTTON_OK,
-                    OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);
+                    dialog.ShowDialog();
+                }
             }
             catch (Exception ex)
             {
diff --git a/AxialSqlTools/HealthDashboards/HealthDashboard_ServerControl.xaml.cs b/AxialSqlTools/HealthDashboards/HealthDashboard_ServerControl.xaml.cs
index 218333d..f1115dc 100644
--- a/AxialSqlTools/HealthDashboards/HealthDashboard_ServerControl.xaml.cs
+++ b/AxialSqlTools/HealthDashboards/HealthDashboard_ServerControl.xaml.cs
@@ -463,7 +463,7 @@ public void UpdateUI(int i, HealthDashboardServerMetric metrics, bool doEmpty)
 
             //--------------------------------------------------------------------
             //--------------------------------------------------------------------
-            if (!doEmpty && metrics != null && metrics.Completed && !metrics.HasException)
+            if (!doEmpty && metrics != null && metrics.Completed && !metrics.HasException && metrics.Iteration > 1)
             {
                 AddPerformanceSample(metrics);
             }
diff --git a/AxialSqlTools/Modules/ExcelExport.cs b/AxialSqlTools/Modules/ExcelExport.cs
index 9896939..5d6f2d7 100644
--- a/AxialSqlTools/Modules/ExcelExport.cs
+++ b/AxialSqlTools/Modules/ExcelExport.cs
@@ -291,7 +291,7 @@ public static void SaveDataTableToExcel(List<DataTable> dataTables, string fileP
             bool includeSource = excelSettings.includeSourceQuery ^ isShiftPressed;
 
             // now pull it or leave it empty
-            string sourceQuery = includeSource ? GetSourceQueryText() : string.Empty;
+            string sourceQuery = includeSource ? ScriptFactoryAccess.GetActiveQueryWindowText() : string.Empty;
 
             using (SpreadsheetDocument document = SpreadsheetDocument.Create(filePath, SpreadsheetDocumentType.Workbook))
             {
diff --git a/AxialSqlTools/Modules/GoogleSheetsExport.cs b/AxialSqlTools/Modules/GoogleSheetsExport.cs
index 4cd18c8..c93e759 100644
--- a/AxialSqlTools/Modules/GoogleSheetsExport.cs
+++ b/AxialSqlTools/Modules/GoogleSheetsExport.cs
@@ -19,6 +19,8 @@ public class GoogleSheetsExportResult
         public string SpreadsheetId { get; set; }
 
         public string SpreadsheetUrl { get; set; }
+
+        public string SpreadsheetTitle { get; set; }
     }
 
     public class GoogleSheetsAuthorizationResult
@@ -182,22 +184,55 @@ public static async Task<GoogleSheetsExportResult> ExportToNewSpreadsheetAsync(L
                 string spreadsheetId = spreadsheet.Value<string>("spreadsheetId");
                 string spreadsheetUrl = spreadsheet.Value<string>("spreadsheetUrl");
 
+                Dictionary<string, int> sheetNameToId = spreadsheet["sheets"]?
+                    .OfType<JObject>()
+                    .Select(s => s["properties"] as JObject)
+                    .Where(p => p != null)
+                    .ToDictionary(
+                        p => p.Value<string>("title"),
+                        p => p.Value<int>("sheetId"),
+                        StringComparer.OrdinalIgnoreCase)
+                    ?? new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
+
+                List<object> batchRequests = new List<object>();
+
                 for (int i = 0; i < dataTables.Count; i++)
                 {
                     IList<IList<object>> values = BuildValues(dataTables[i], settings.exportBoolsAsNumbers);
                     await AppendValuesAsync(httpClient, spreadsheetId, sheetNames[i], values, cancellationToken);
+
+                    if (sheetNameToId.TryGetValue(sheetNames[i], out int sheetId))
+                    {
+                        int columnCount = dataTables[i].Columns.Count;
+                        batchRequests.Add(CreateFilterRequest(sheetId, columnCount));
+                        batchRequests.Add(CreateAutoResizeRequest(sheetId, columnCount));
+                    }
                 }
 
                 if (includeSource)
                 {
                     IList<IList<object>> sourceValues = BuildSourceQueryValues(sourceQuery);
-                    await AppendValuesAsync(httpClient, spreadsheetId, sheetNames.Last(), sourceValues, cancellationToken);
+                    string sourceSheetName = sheetNames.Last();
+                    await AppendValuesAsync(httpClient, spreadsheetId, sourceSheetName, sourceValues, cancellationToken);
+
+                    if (sheetNameToId.TryGetValue(sourceSheetName, out int sourceSheetId))
+                    {
+                        const int sourceColumnCount = 1;
+                        batchRequests.Add(CreateFilterRequest(sourceSheetId, sourceColumnCount));
+                        batchRequests.Add(CreateAutoResizeRequest(sourceSheetId, sourceColumnCount));
+                    }
+                }
+
+                if (batchRequests.Count > 0)
+                {
+                    await BatchUpdateAsync(httpClient, spreadsheetId, batchRequests, cancellationToken);
                 }
 
                 return new GoogleSheetsExportResult
                 {
                     SpreadsheetId = spreadsheetId,
-                    SpreadsheetUrl = spreadsheetUrl
+                    SpreadsheetUrl = spreadsheetUrl,
+                    SpreadsheetTitle = spreadsheetTitle
                 };
             }
         }
@@ -300,7 +335,63 @@ private static List<string> BuildSheetNames(int dataTableCount, bool includeSour
         private static string GetSourceQueryText()
         {
             ThreadHelper.ThrowIfNotOnUIThread();
-            return ""; // ScriptFactoryAccess.GetActiveQueryWindowText();
+            return ScriptFactoryAccess.GetActiveQueryWindowText();
+        }
+
+        private static object CreateFilterRequest(int sheetId, int columnCount)
+        {
+            return new
+            {
+                setBasicFilter = new
+                {
+                    filter = new
+                    {
+                        range = new
+                        {
+                            sheetId = sheetId,
+                            startRowIndex = 0,
+                            endRowIndex = 1,
+                            startColumnIndex = 0,
+                            endColumnIndex = columnCount
+                        }
+                    }
+                }
+            };
+        }
+
+        private static object CreateAutoResizeRequest(int sheetId, int columnCount)
+        {
+            return new
+            {
+                autoResizeDimensions = new
+                {
+                    dimensions = new
+                    {
+                        sheetId = sheetId,
+                        dimension = "COLUMNS",
+                        startIndex = 0,
+                        endIndex = columnCount
+                    }
+                }
+            };
+        }
+
+        private static async Task BatchUpdateAsync(HttpClient httpClient, string spreadsheetId, List<object> requests, CancellationToken cancellationToken)
+        {
+            var payload = new
+            {
+                requests = requests
+            };
+
+            string requestUri = $"https://sheets.googleapis.com/v4/spreadsheets/{Uri.EscapeDataString(spreadsheetId)}:batchUpdate";
+
+            var content = new StringContent(JsonConvert.SerializeObject(payload), Encoding.UTF8, "application/json");
+            var response = await httpClient.PostAsync(requestUri, content, cancellationToken);
+            if (!response.IsSuccessStatusCode)
+            {
+                var responseBody = await response.Content.ReadAsStringAsync();
+                throw new Exception($"BatchUpdate failure: {(int)response.StatusCode} {response.ReasonPhrase}\n{responseBody}");
+            }
         }
     }
 }
diff --git a/AxialSqlTools/Modules/ScriptFactoryAccess.cs b/AxialSqlTools/Modules/ScriptFactoryAccess.cs
index 58f4abe..325591c 100644
--- a/AxialSqlTools/Modules/ScriptFactoryAccess.cs
+++ b/AxialSqlTools/Modules/ScriptFactoryAccess.cs
@@ -12,6 +12,8 @@
 using System.Threading.Tasks;
 using System.Xml;
 using System.Text.RegularExpressions;
+using EnvDTE;
+using Microsoft.VisualStudio.Shell;
 
 namespace AxialSqlTools
 {
@@ -123,6 +125,33 @@ public static ConnectionInfo GetCurrentConnectionInfo(bool inMaster = false)
 
         }
 
+        public static string GetActiveQueryWindowText()
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
+            try
+            {
+                DTE application = ServiceCache.ExtensibilityModel?.Application;
+                if (application == null || application.ActiveDocument == null)
+                {
+                    return string.Empty;
+                }
+
+                TextDocument doc = application.ActiveDocument.Object("TextDocument") as TextDocument;
+                if (doc == null)
+                {
+                    return string.Empty;
+                }
+
+                EditPoint startPoint = doc.StartPoint.CreateEditPoint();
+                return startPoint.GetText(doc.EndPoint);
+            }
+            catch
+            {
+                return string.Empty;
+            }
+        }
+
         public static string GetXmlFromUIConnectionInfo(UIConnectionInfo connectionInfo)
         {
             if (connectionInfo == null)
diff --git a/AxialSqlTools/Properties/AssemblyInfo.cs b/AxialSqlTools/Properties/AssemblyInfo.cs
index 80077a2..c12086e 100644
--- a/AxialSqlTools/Properties/AssemblyInfo.cs
+++ b/AxialSqlTools/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.7.0.0")]
-[assembly: AssemblyFileVersion("4.7.0.0")]
+[assembly: AssemblyVersion("4.8.0.0")]
+[assembly: AssemblyFileVersion("4.8.0.0")]
diff --git a/README.md b/README.md
index baf7f1b..232c4e4 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ If you find this extension useful and it helps streamline your workflow in SSMS,
 
 Check it out and let me know what you think!
 
-<img width="604" height="316" alt="image" src="https://github.com/user-attachments/assets/b0e5823c-f295-4b20-914e-5eee616b5ff3" />
+<img width="607" height="339" alt="image" src="https://github.com/user-attachments/assets/110e66d3-1cc9-41e4-81a9-a6a18523e21d" />
 
 ## Main Features - (see Wiki for more details)
 
@@ -29,6 +29,8 @@ Check it out and let me know what you think!
 - [**Copy Query for Web Paste**](https://github.com/Axial-SQL/AxialSqlTools/wiki/Copy-Query-for-Web-Paste): Preserve the text format to ensure proper rendering when inserting into HTML-aware clients such as Outlook Online, Gmail, and others.
   
 - [**Query Templates and Snippets**](https://github.com/Axial-SQL/AxialSqlTools/wiki/Query-Templates-and-Snippets): Quickly access your personal collection of query templates for common tasks, reducing the time and effort required for routine work.
+
+- [**Export Grid to Google Sheets**](https://github.com/Axial-SQL/AxialSqlTools/wiki/Google-Sheets-Export): Quickly export results from the grid view directly into Google Sheets.
   
 - [**Export Grid to Excel**](https://github.com/Axial-SQL/AxialSqlTools/wiki/Export-Grid-To-Excel): Quickly export results from the grid view directly into Excel file.
   

From 85213ec4d26ca2dd64eba879de77ef9792e8d1b0 Mon Sep 17 00:00:00 2001
From: Alex Bochkov <albochkov03@gmail.com>
Date: Mon, 1 Dec 2025 10:13:52 -0700
Subject: [PATCH 8/8] Add explicit connection fields for Postgres and MySQL
 transfers (#43)

---
 .../DataTransferWindowControl.xaml            | 140 ++++++++++++++++--
 .../DataTransferWindowControl.xaml.cs         | 113 ++++++++++++--
 2 files changed, 228 insertions(+), 25 deletions(-)

diff --git a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml
index 7e748a6..ea24f39 100644
--- a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml
+++ b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml
@@ -91,10 +91,37 @@
                                 <Label Content="Source Description" x:Name="Label_SourceDescriptionToPsql" VerticalAlignment="Center"/>
                             </StackPanel>
 
-                            <DockPanel>
-                                <Label Content="Target Connection String" x:Name="Label_TargetDescriptionToPsql" VerticalAlignment="Center"/>
-                                <TextBox Height="23" x:Name="TextBox_TargetConnectionToPsql"/>
-                            </DockPanel>
+                            <StackPanel Orientation="Vertical" Margin="5,5,5,5">
+                                <Label Content="Target PostgreSQL Connection" x:Name="Label_TargetDescriptionToPsql" FontWeight="Bold"/>
+                                <Grid Margin="0,0,0,5">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="150" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+
+                                    <Label Grid.Row="0" Grid.Column="0" Content="Server" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="0" Grid.Column="1" Height="23" x:Name="TextBox_TargetPsqlServer" />
+
+                                    <Label Grid.Row="1" Grid.Column="0" Content="Port" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="1" Grid.Column="1" Height="23" x:Name="TextBox_TargetPsqlPort" />
+
+                                    <Label Grid.Row="2" Grid.Column="0" Content="Database" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="2" Grid.Column="1" Height="23" x:Name="TextBox_TargetPsqlDatabase" />
+
+                                    <Label Grid.Row="3" Grid.Column="0" Content="Username" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="3" Grid.Column="1" Height="23" x:Name="TextBox_TargetPsqlUsername" />
+
+                                    <Label Grid.Row="4" Grid.Column="0" Content="Password" VerticalAlignment="Center" />
+                                    <PasswordBox Grid.Row="4" Grid.Column="1" Height="23" x:Name="PasswordBox_TargetPsqlPassword" />
+                                </Grid>
+                            </StackPanel>
 
                             <StackPanel Orientation="Vertical"  Margin="5,5,5,5">
                                 <Label Content="Source Query" FontWeight="Bold"/>
@@ -136,10 +163,37 @@
                                 <Label Content="Source Description" x:Name="Label_SourceDescriptionToMySql" VerticalAlignment="Center"/>
                             </StackPanel>
 
-                            <DockPanel>
-                                <Label Content="Target Connection String" x:Name="Label_TargetDescriptionToMySql" VerticalAlignment="Center"/>
-                                <TextBox Height="23" x:Name="TextBox_TargetConnectionToMySql"/>
-                            </DockPanel>
+                            <StackPanel Orientation="Vertical" Margin="5,5,5,5">
+                                <Label Content="Target MySQL Connection" x:Name="Label_TargetDescriptionToMySql" FontWeight="Bold"/>
+                                <Grid Margin="0,0,0,5">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="150" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+
+                                    <Label Grid.Row="0" Grid.Column="0" Content="Server" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="0" Grid.Column="1" Height="23" x:Name="TextBox_TargetMySqlServer" />
+
+                                    <Label Grid.Row="1" Grid.Column="0" Content="Port" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="1" Grid.Column="1" Height="23" x:Name="TextBox_TargetMySqlPort" />
+
+                                    <Label Grid.Row="2" Grid.Column="0" Content="Database" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="2" Grid.Column="1" Height="23" x:Name="TextBox_TargetMySqlDatabase" />
+
+                                    <Label Grid.Row="3" Grid.Column="0" Content="Username" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="3" Grid.Column="1" Height="23" x:Name="TextBox_TargetMySqlUsername" />
+
+                                    <Label Grid.Row="4" Grid.Column="0" Content="Password" VerticalAlignment="Center" />
+                                    <PasswordBox Grid.Row="4" Grid.Column="1" Height="23" x:Name="PasswordBox_TargetMySqlPassword" />
+                                </Grid>
+                            </StackPanel>
 
                             <StackPanel Orientation="Vertical"  Margin="5,5,5,5">
                                 <Label Content="Source Query" FontWeight="Bold"/>
@@ -176,10 +230,37 @@
 
                         <StackPanel Orientation="Vertical" >
 
-                            <DockPanel>
-                                <Label Content="Source Connection String" x:Name="Label_SourceDescriptionFromPsql" VerticalAlignment="Center"/>
-                                <TextBox Height="23" x:Name="TextBox_SourceConnectionFromPsql"/>
-                            </DockPanel>
+                            <StackPanel Orientation="Vertical" Margin="5,5,5,5">
+                                <Label Content="Source PostgreSQL Connection" x:Name="Label_SourceDescriptionFromPsql" FontWeight="Bold"/>
+                                <Grid Margin="0,0,0,5">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="150" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+
+                                    <Label Grid.Row="0" Grid.Column="0" Content="Server" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="0" Grid.Column="1" Height="23" x:Name="TextBox_SourcePsqlServer" />
+
+                                    <Label Grid.Row="1" Grid.Column="0" Content="Port" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="1" Grid.Column="1" Height="23" x:Name="TextBox_SourcePsqlPort" />
+
+                                    <Label Grid.Row="2" Grid.Column="0" Content="Database" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="2" Grid.Column="1" Height="23" x:Name="TextBox_SourcePsqlDatabase" />
+
+                                    <Label Grid.Row="3" Grid.Column="0" Content="Username" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="3" Grid.Column="1" Height="23" x:Name="TextBox_SourcePsqlUsername" />
+
+                                    <Label Grid.Row="4" Grid.Column="0" Content="Password" VerticalAlignment="Center" />
+                                    <PasswordBox Grid.Row="4" Grid.Column="1" Height="23" x:Name="PasswordBox_SourcePsqlPassword" />
+                                </Grid>
+                            </StackPanel>
 
                             <StackPanel Orientation="Horizontal"  Margin="5,5,5,5">
                                 <Button Height="35" Content="Select Target" Click="Button_SelectTargetFromPsql_Click" x:Name="Button_SelectTargetFromPsql" Width="120" FontWeight="Bold"/>
@@ -221,10 +302,37 @@
 
                         <StackPanel Orientation="Vertical" >
 
-                            <DockPanel>
-                                <Label Content="Source Connection String" x:Name="Label_SourceDescriptionFromMySql" VerticalAlignment="Center"/>
-                                <TextBox Height="23" x:Name="TextBox_SourceConnectionFromMySql"/>
-                            </DockPanel>
+                            <StackPanel Orientation="Vertical" Margin="5,5,5,5">
+                                <Label Content="Source MySQL Connection" x:Name="Label_SourceDescriptionFromMySql" FontWeight="Bold"/>
+                                <Grid Margin="0,0,0,5">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="150" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+
+                                    <Label Grid.Row="0" Grid.Column="0" Content="Server" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="0" Grid.Column="1" Height="23" x:Name="TextBox_SourceMySqlServer" />
+
+                                    <Label Grid.Row="1" Grid.Column="0" Content="Port" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="1" Grid.Column="1" Height="23" x:Name="TextBox_SourceMySqlPort" />
+
+                                    <Label Grid.Row="2" Grid.Column="0" Content="Database" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="2" Grid.Column="1" Height="23" x:Name="TextBox_SourceMySqlDatabase" />
+
+                                    <Label Grid.Row="3" Grid.Column="0" Content="Username" VerticalAlignment="Center" />
+                                    <TextBox Grid.Row="3" Grid.Column="1" Height="23" x:Name="TextBox_SourceMySqlUsername" />
+
+                                    <Label Grid.Row="4" Grid.Column="0" Content="Password" VerticalAlignment="Center" />
+                                    <PasswordBox Grid.Row="4" Grid.Column="1" Height="23" x:Name="PasswordBox_SourceMySqlPassword" />
+                                </Grid>
+                            </StackPanel>
 
                             <StackPanel Orientation="Horizontal"  Margin="5,5,5,5">
                                 <Button Height="35" Content="Select Target" Click="Button_SelectTargetFromMySql_Click" x:Name="Button_SelectTargetFromMySql" Width="120" FontWeight="Bold"/>
diff --git a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
index e143a92..0695c45 100644
--- a/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
+++ b/AxialSqlTools/DataTransfer/DataTransferWindowControl.xaml.cs
@@ -38,6 +38,9 @@ public partial class DataTransferWindowControl : UserControl
         private string sourceConnectionStringFromMySql = "";
         private string targetConnectionStringFromMySql = "";
 
+        private const int DefaultPostgresPort = 5432;
+        private const int DefaultMySqlPort = 3306;
+
 
         static class SqlBulkCopyHelper
         {
@@ -72,11 +75,29 @@ public DataTransferWindowControl()
             CheckBox_TruncateTargetTableToPsql.IsChecked = true;
             CheckBox_CreateTargetTableToPsql.IsChecked = true;
 
-            TextBox_TargetConnectionToPsql.Text = "Server=127.0.0.1;Port=5432;Database=postgres;User Id=postgres;Password=<password>;";
-
-            TextBox_TargetConnectionToMySql.Text = "Server=127.0.0.1;Port=3306;Database=mysql;User ID=root;Password=<password>;";
-            TextBox_SourceConnectionFromPsql.Text = "Server=127.0.0.1;Port=5432;Database=postgres;User Id=postgres;Password=<password>;";
-            TextBox_SourceConnectionFromMySql.Text = "Server=127.0.0.1;Port=3306;Database=mysql;User ID=root;Password=<password>;";
+            TextBox_TargetPsqlServer.Text = "127.0.0.1";
+            TextBox_TargetPsqlPort.Text = DefaultPostgresPort.ToString();
+            TextBox_TargetPsqlDatabase.Text = "postgres";
+            TextBox_TargetPsqlUsername.Text = "postgres";
+            PasswordBox_TargetPsqlPassword.Password = "<password>";
+
+            TextBox_TargetMySqlServer.Text = "127.0.0.1";
+            TextBox_TargetMySqlPort.Text = DefaultMySqlPort.ToString();
+            TextBox_TargetMySqlDatabase.Text = "mysql";
+            TextBox_TargetMySqlUsername.Text = "root";
+            PasswordBox_TargetMySqlPassword.Password = "<password>";
+
+            TextBox_SourcePsqlServer.Text = "127.0.0.1";
+            TextBox_SourcePsqlPort.Text = DefaultPostgresPort.ToString();
+            TextBox_SourcePsqlDatabase.Text = "postgres";
+            TextBox_SourcePsqlUsername.Text = "postgres";
+            PasswordBox_SourcePsqlPassword.Password = "<password>";
+
+            TextBox_SourceMySqlServer.Text = "127.0.0.1";
+            TextBox_SourceMySqlPort.Text = DefaultMySqlPort.ToString();
+            TextBox_SourceMySqlDatabase.Text = "mysql";
+            TextBox_SourceMySqlUsername.Text = "root";
+            PasswordBox_SourceMySqlPassword.Password = "<password>";
 
         }
 
@@ -284,6 +305,80 @@ private void SetCopyCommandAvailability()
             }
         }
 
+        private int ParsePort(string portText, int defaultPort)
+        {
+            return int.TryParse(portText, out int parsedPort) ? parsedPort : defaultPort;
+        }
+
+        private string BuildPostgresConnectionString(string server, string portText, string database, string username, string password)
+        {
+            var builder = new NpgsqlConnectionStringBuilder
+            {
+                Host = server,
+                Port = ParsePort(portText, DefaultPostgresPort),
+                Database = database,
+                Username = username,
+                Password = password
+            };
+
+            return builder.ConnectionString;
+        }
+
+        private string BuildMySqlConnectionString(string server, string portText, string database, string username, string password)
+        {
+            uint parsedPort = (uint)ParsePort(portText, DefaultMySqlPort);
+            var builder = new MySqlConnectionStringBuilder
+            {
+                Server = server,
+                Port = parsedPort,
+                Database = database,
+                UserID = username,
+                Password = password
+            };
+
+            return builder.ConnectionString;
+        }
+
+        private string BuildTargetPostgresConnectionString()
+        {
+            return BuildPostgresConnectionString(
+                TextBox_TargetPsqlServer.Text,
+                TextBox_TargetPsqlPort.Text,
+                TextBox_TargetPsqlDatabase.Text,
+                TextBox_TargetPsqlUsername.Text,
+                PasswordBox_TargetPsqlPassword.Password);
+        }
+
+        private string BuildSourcePostgresConnectionString()
+        {
+            return BuildPostgresConnectionString(
+                TextBox_SourcePsqlServer.Text,
+                TextBox_SourcePsqlPort.Text,
+                TextBox_SourcePsqlDatabase.Text,
+                TextBox_SourcePsqlUsername.Text,
+                PasswordBox_SourcePsqlPassword.Password);
+        }
+
+        private string BuildTargetMySqlConnectionString()
+        {
+            return BuildMySqlConnectionString(
+                TextBox_TargetMySqlServer.Text,
+                TextBox_TargetMySqlPort.Text,
+                TextBox_TargetMySqlDatabase.Text,
+                TextBox_TargetMySqlUsername.Text,
+                PasswordBox_TargetMySqlPassword.Password);
+        }
+
+        private string BuildSourceMySqlConnectionString()
+        {
+            return BuildMySqlConnectionString(
+                TextBox_SourceMySqlServer.Text,
+                TextBox_SourceMySqlPort.Text,
+                TextBox_SourceMySqlDatabase.Text,
+                TextBox_SourceMySqlUsername.Text,
+                PasswordBox_SourceMySqlPassword.Password);
+        }
+
         string MapSqlServerToPostgresType(string sqlServerType)
         {
             switch (sqlServerType)
@@ -364,7 +459,7 @@ private async void ButtonToPsql_CopyData_Click(object sender, RoutedEventArgs e)
                 ButtonToPsql_CopyData.Visibility = System.Windows.Visibility.Collapsed;
                 ButtonToPsql_Cancel.Visibility = System.Windows.Visibility.Visible;
 
-                string postgresConnString = TextBox_TargetConnectionToPsql.Text;
+                string postgresConnString = BuildTargetPostgresConnectionString();
                 // Get the SQL query from the rich text box.
                 TextRange textRange = new TextRange(RichTextBox_SourceQueryToPsql.Document.ContentStart,
                                                     RichTextBox_SourceQueryToPsql.Document.ContentEnd);
@@ -530,7 +625,7 @@ private async void ButtonToMySql_CopyData_Click(object sender, RoutedEventArgs e
                                                     RichTextBox_SourceQueryToMySql.Document.ContentEnd);
                 string sqlQuery = textRange.Text;
                 string targetTable = TextBox_TargetTableToMySql.Text;
-                string targetMySqlConnString = TextBox_TargetConnectionToMySql.Text;
+                string targetMySqlConnString = BuildTargetMySqlConnectionString();
 
                 using (var sqlConn = new SqlConnection(sourceConnectionStringMySql))
                 {
@@ -656,7 +751,7 @@ private async void ButtonFromPsql_CopyData_Click(object sender, RoutedEventArgs
                                                     RichTextBox_SourceQueryFromPsql.Document.ContentEnd);
                 string sqlQuery = textRange.Text;
                 string targetTable = TextBox_TargetTableFromPsql.Text;
-                sourceConnectionStringFromPsql = TextBox_SourceConnectionFromPsql.Text;
+                sourceConnectionStringFromPsql = BuildSourcePostgresConnectionString();
 
                 using (var npgConn = new NpgsqlConnection(sourceConnectionStringFromPsql))
                 {
@@ -799,7 +894,7 @@ private async void ButtonFromMySql_CopyData_Click(object sender, RoutedEventArgs
                                                     RichTextBox_SourceQueryFromMySql.Document.ContentEnd);
                 string sqlQuery = textRange.Text;
                 string targetTable = TextBox_TargetTableFromMySql.Text;
-                sourceConnectionStringFromMySql = TextBox_SourceConnectionFromMySql.Text;
+                sourceConnectionStringFromMySql = BuildSourceMySqlConnectionString();
 
                 using (var mySqlConn = new MySqlConnection(sourceConnectionStringFromMySql))
                 {