Diff of /trunk/TSAdminTool/Database.cs

Parent Directory | Revision Log | Patch

--- trunk/TSAdminTool/Database.cs	2012/07/12 11:53:20	38
+++ trunk/TSAdminTool/Database.cs	2012/07/12 12:21:43	39
@@ -27,7 +27,7 @@
         private SqlCommand sqlCmd = new SqlCommand();
 
         const string SQL_BROWSER_SERVICE_NAME = "SQLBrowser";
-
+        const Version CURRENT_DB_VERSION = new Version(1, 0, 0, 3);
         public static string InstanceName
         {
             get
@@ -52,8 +52,12 @@
             
             Logging.ATSAdminLog.Debug("SetupDatabase() called ");
             try
-            {
-                sqlCon.ConnectionString = Properties.Settings.Default.atsConnectionString;
+            {                
+                sqlCon.ConnectionString = Properties.Settings.Default.atsConnectionString;                
+                using (log4net.NDC.Push(string.Format("ConnectionString={0}", Properties.Settings.Default.atsConnectionString)))
+                {
+                    Logging.ATSAdminLog.Debug("Opening connection to AnywhereTS Database");
+                }
                 sqlCon.Open();
             }
             catch
@@ -63,21 +67,35 @@
                 //bCreateDB = true;
                 try
                 {
-                    sqlCon = new SqlConnection(Properties.Settings.Default.atsConnectionString.Replace("AnywhereTS", "master"));
-                    sqlCon.Open();
-                    RunScript(Resource1.CreateDatabase.ToString());
-                    sqlCon.Close();
-                    sqlCon = new SqlConnection(Properties.Settings.Default.atsConnectionString.Replace("AnywhereTS", "master"));
-                    sqlCon.Open();
-                    RunScript(Resource1.CreateTables.ToString());
-                    sqlCon.Close();
-                    //sqlCon = new SqlConnection(Properties.Settings.Default.atsConnectionString);
-                    //sqlCon.Open();
+                    using (log4net.NDC.Push(string.Format("SQL Statment={0}", Resource1.CreateDatabase.ToString())))
+                    {
+                        Logging.ATSAdminLog.Debug("Creating Database AnywhereTS");
+                        sqlCon = new SqlConnection(Properties.Settings.Default.atsConnectionString.Replace("AnywhereTS", "master"));
+                        sqlCon.Open();
+                        RunScript(Resource1.CreateDatabase.ToString());
+                        sqlCon.Close();
+                    }
+                    Logging.ATSAdminLog.Debug("Created Database AnywhereTS");
+
+                    using (log4net.NDC.Push(string.Format("SQL Statment={0}", Resource1.CreateTables.ToString())))
+                    {
+                        Logging.ATSAdminLog.Debug("Creating Tables in AnywhereTS Database");
+                        sqlCon = new SqlConnection(Properties.Settings.Default.atsConnectionString.Replace("AnywhereTS", "master"));
+                        sqlCon.Open();
+                        RunScript(Resource1.CreateTables.ToString());
+                        sqlCon.Close();
+                    }
+                    Logging.ATSAdminLog.Debug("Created Tables in AnywhereTS Database");
                 }
                 catch (SqlException sql_ex1)
                 {
                     SqlException sql_ex = (sql_ex1.GetBaseException() as SqlException);
                     MessageBox.Show(string.Format("Failed to connect to SQL Server Instance: {0}\n", InstanceName) + sql_ex.Number.ToString() + " " + sql_ex.Message.ToString());
+
+                    using (log4net.NDC.Push(string.Format("SqlException: ID={0} MESSAGE={1}{2}Diagnostics:{2}{3}", sql_ex.Number.ToString(), sql_ex.Message, System.Environment.NewLine, sql_ex.ToString())))
+                    {
+                        Logging.ATSAdminLog.Error("Failed to open connection to AnywhereTS Database");
+                    }
                     return bContinue;
                 }
             }
@@ -86,7 +104,8 @@
             Version databaseVersion; // The current version of the database
             int chkVer = CheckVersion(out databaseVersion);
             VersionCheck verChk = (VersionCheck)chkVer;
-            MessageBox.Show(string.Format("Version Check: {0} Version: {1}", verChk.ToString(), databaseVersion.ToString()));
+            //MessageBox.Show(string.Format("Version Check: {0} Version: {1}", verChk.ToString(), databaseVersion.ToString()));
+            Logging.ATSAdminLog.DebugFormat("Version Check: {0} Version: {1}", verChk.ToString(), databaseVersion.ToString());
             switch (chkVer)
             {
                 case (int)VersionCheck.Equal:
@@ -106,17 +125,23 @@
                             // Run the apropriate upgdrade script(s)
                             case "1.0.0.0":
                                 {   // Current database is version 1.0.0.0, update to 1.0.0.1
+                                    Logging.ATSAdminLog.DebugFormat("Upgrading Database from version: {0} to version: {1}", "1.0.0.0", "1.0.0.1");
                                     bContinue = RunScript(Resource1.UpdateDatabase1.ToString());
+                                    Logging.ATSAdminLog.DebugFormat("Upgraded Database from version: {0} to version: {1}", "1.0.0.0", "1.0.0.1");
                                     goto case "1.0.0.1"; // Continue and upgrade one more step
                                 }
                             case "1.0.0.1":
                                 {   // Current database is version 1.0.0.1, update to 1.0.0.2
+                                    Logging.ATSAdminLog.DebugFormat("Upgrading Database from version: {0} to version: {1}", "1.0.0.1", "1.0.0.2");
                                     bContinue = RunScript(Resource1.UpdateDatabase2.ToString());
+                                    Logging.ATSAdminLog.DebugFormat("Upgraded Database from version: {0} to version: {1}", "1.0.0.2", "1.0.0.2");
                                     goto case "1.0.0.2"; // Continue and upgrade one more step
                                 }
                             case "1.0.0.2":
                                 {   // Current database is version 1.0.0.2, update to 1.0.0.3
+                                    Logging.ATSAdminLog.DebugFormat("Upgrading Database from version: {0} to version: {1}", "1.0.0.2", "1.0.0.3");
                                     bContinue = RunScript(Resource1.UpdateDatabase3.ToString());
+                                    Logging.ATSAdminLog.DebugFormat("Upgraded Database from version: {0} to version: {1}", "1.0.0.2", "1.0.0.3");
                                     break;
                                 }
 
@@ -124,6 +149,7 @@
                             default:
                                 {
                                     MessageBox.Show("Error: Not able to upgrade database (51188)");
+                                    Logging.ATSAdminLog.DebugFormat("Failed to upgrade Database from version: {0} to version: {1}", databaseVersion.ToString(), CURRENT_DB_VERSION.ToString());
                                     break;
                                 }
                         }