fix(move): cli and query fixes (#45)

* fix(move): cli and query fixes

* fix(cleanup): code cleanup

Author: alexirion10

readme.md

@@ -22,13 +22,15 @@ will be accomplished is in the integration test method [ProgressiveRestore](test
 You can currently use the CLI to create a copy of a database from one AG to another. It will take a log backup,
 then restore from the existing backup chain to the new database. If a database exists in the destination AG
 it will delete it and proceed with the copy.
+
 ```
-AgDatabaseMove.Cli --From:ConnectionString="Server=SourceDatabaseListener.domain.com; Integrated Security=true; MultiSubnetFailover=true;"
-    --From:DatabaseName=sourceDbName
-    --From:BackupPathTemplate="\\NetworkShare\{0}_backup_{1}.trn"
-    --To:ConnectionString="Server=DestinationDatabaseListener.domain.com; Integrated Security=true; MultiSubnetFailover=true;"
-    --To:DatabaseName=DestinationDbName
-    --Overwrite=true
+AgDatabaseMove.Cli.exe 
+--From:ConnectionString "Server=SourceDatabaseListener.domain.com; Integrated Security=true; MultiSubnetFailover=true;" --From:DatabaseName test --From:BackupPathSqlQuery "SELECT '\\NetworkShare\path\here'"
+--To:ConnectionString "Server=SourceDatabaseListener.domain.com; Integrated Security=true; MultiSubnetFailover=true;" --To:DatabaseName test 
+--Overwrite true
+--Finalize true
+--CopyLogins true
+--DeleteSource false
 ```
 
 ## Contributing

src/AgDatabaseMove.Cli/Program.cs

@@ -12,6 +12,7 @@ internal class MoveArgs
     public bool Overwrite { get; set; } = false;
     public bool Finalize { get; set; } = true;
     public bool CopyLogins { get; set; } = true;
+    public bool DeleteSource { get; set; } = false;
   }
 
   internal class Program
@@ -29,6 +30,7 @@ private static void Main(string[] args)
         Overwrite = arguments.Overwrite,
         Finalize = arguments.Finalize,
         CopyLogins = arguments.CopyLogins,
+        DeleteSource = arguments.DeleteSource,
         FileRelocator = filename =>
           RestoreFileRelocator(arguments.From.DatabaseName, arguments.To.DatabaseName, filename)
       });

src/DatabaseConfig.cs

@@ -25,5 +25,10 @@ public class DatabaseConfig
     ///   <example> SELECT Backup_path FROM [msdb].[dbo].[_Sys_Backup_config]</example>
     /// </summary>
     public string BackupPathSqlQuery { get; set; }
+
+    public override string ToString()
+    {
+      return $"{ConnectionString}\n{DatabaseName}\n{BackupPathSqlQuery}\n";
+    }
   }
 }

src/SmoFacade/Server.cs

@@ -67,12 +67,13 @@ private string AgName()
     /// <returns>A DefaultFileLocations object which contains default log and data directories.</returns>
     private DefaultFileLocations DefaultFileLocations()
     {
-      var query =
+      const string query =
         "SELECT SERVERPROPERTY('InstanceDefaultDataPath') AS InstanceDefaultDataPath, SERVERPROPERTY('InstanceDefaultLogPath') AS InstanceDefaultLogPath";
 
       using var cmd = SqlConnection.CreateCommand();
-      using var reader = cmd.ExecuteReader();
       cmd.CommandText = query;
+      using var reader = cmd.ExecuteReader();
+
       if(!reader.Read())
         return null;