Diff of /trunk/TSAdminTool/Database.cs

Parent Directory | Revision Log | Patch

--- trunk/TSAdminTool/Database.cs	2012/07/13 22:56:50	89
+++ trunk/TSAdminTool/Database.cs	2012/07/13 22:58:13	90
@@ -29,24 +29,7 @@
         private SqlCommand sqlCmd = new SqlCommand();
 
         const string SQL_BROWSER_SERVICE_NAME = "SQLBrowser";
-        public static string InstanceName
-        {
-            get
-            {
-                //bool start = false;
-                //bool end = false;
-                //List<char> pChars = new List<char>();
-                //foreach (char c in Properties.Settings.Default.atsConnectionString.ToCharArray())
-                //{
-                //    if (c == '\\') { start = true; continue; }
-                //    if (c == ';') { end = true; }
-                //    if (end) break;
-                //    if (start) { pChars.Add(c); }
-                //}
-                //return new string(pChars.ToArray());
-                return Properties.Settings.Default.DBInstance;
-            }
-        }
+        public static string InstanceName { get { return Properties.Settings.Default.DBInstance; } }
         public bool SetupDatabase()
         {
             Exception ErrorInfo = null;
@@ -315,7 +298,7 @@
                             }
                         }
                     }
-                    if (ErrorInfo != null) { return false; }
+                    if (ErrorInfo != null) { return (int)VersionCheck.Failed; }
                     #endregion
                 }