Merge branch 'release/0.9.2'

starsadmin · Mar 17, 2016 · 83699e1 · 83699e1
2 parents 190ae82 + b9b30a7
commit 83699e1
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 20 deletions.
diff --git a/ssdumpConsole/Program.cs b/ssdumpConsole/Program.cs
@@ -72,6 +72,8 @@ static void Main(string[] args)
                 }
                 else
                 {
+                    processor.DatabaseName = WhichDatabases(extras)[0];
+                    processor.Tables = WhichTables(extras);
                     processor.Execute();
                 }
             }
@@ -83,27 +85,40 @@ static void Main(string[] args)
         }
 
         /// <summary>
-        /// Write scripts to console.
+        /// Figure out which databases to dump.
         /// </summary>
-        /// <param name="scripts">Collection of scripts to be written</param>
-        private static void WriteScripts(StringCollection scripts)
+        /// <param name="extras">Unparsed command-line options</param>
+        /// <returns>List of databases to dump</returns>
+        private static List<string> WhichDatabases(List<string> extras)
         {
-            foreach (string script in scripts)
-            {
-                Console.WriteLine(script);
-            }
+            List<string> databases = new List<string>();
+
+            // First extra is database to dump.
+            databases.Add(extras[0]);
+
+            return databases;
         }
 
         /// <summary>
-        /// Write scripts to console.
+        /// Figure out which tables to dump.
         /// </summary>
-        /// <param name="scripts">Collection of scripts to be written</param>
-        private static void WriteScripts(IEnumerable<string> scripts)
+        /// <param name="extras">Unparsed command-line options</param>
+        /// <returns>List of tables to dump</returns>
+        private static List<string> WhichTables(List<string> extras)
         {
-            foreach (string script in scripts)
+            List<string> tables = new List<string>();
+
+            // It will be an empty list (meaning all tables) unless...
+            if (extras.Count > 1)
             {
-                Console.WriteLine(script);
+                // Everything except first value is a table to dump.
+                for (int index = 1; index < extras.Count; index++)
+                {
+                    tables.Add(extras[index]);
+                }
             }
+
+            return tables;
         }
 
         /// <summary>

diff --git a/ssdumpConsole/Properties/AssemblyInfo.cs b/ssdumpConsole/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("0.9.1.0")]
-[assembly: AssemblyFileVersion("0.9.1.0")]
+[assembly: AssemblyVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]
diff --git a/ssdumpConsole/ssdumpConsole.csproj.user b/ssdumpConsole/ssdumpConsole.csproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <StartArguments>--host=dmsql --include-users --no-data DMWebService</StartArguments>
+  </PropertyGroup>
+</Project>
diff --git a/ssdumpGUI/Properties/AssemblyInfo.cs b/ssdumpGUI/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("0.9.1.0")]
-[assembly: AssemblyFileVersion("0.9.1.0")]
+[assembly: AssemblyVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]
diff --git a/ssdumpLibrary/DumpProcessor.cs b/ssdumpLibrary/DumpProcessor.cs
@@ -20,7 +20,7 @@ public class DumpProcessor
         /// <summary>
         /// Program version.
         /// </summary>
-        public static readonly string ProgramVersion = "0.9.1";
+        public static readonly string ProgramVersion = "0.9.2";
 
         public string Host { get; set; }
         public string Username { get; set; }
@@ -62,7 +62,6 @@ public DumpProcessor()
         /// </summary>
         public void Execute()
         {
-
             // Set up server object and connection options.
             Server server = new Server(Host);
             server.ConnectionContext.ApplicationName = ProgramName + " v" + ProgramVersion;

diff --git a/ssdumpLibrary/Properties/AssemblyInfo.cs b/ssdumpLibrary/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("0.9.1.0")]
-[assembly: AssemblyFileVersion("0.9.1.0")]
+[assembly: AssemblyVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]