Added version information to client + database

bytting · Apr 25, 2019 · 3508ef0 · 3508ef0
1 parent d236ec7
commit 3508ef0
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 14 deletions.
diff --git a/AboutBox.Designer.cs b/AboutBox.Designer.cs
diff --git a/AboutBox.cs b/AboutBox.cs
@@ -101,5 +101,10 @@ public string AssemblyCompany
             }
         }
         #endregion
+
+        private void okButton_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }
diff --git a/DSA-LIMS_MANUAL.pdf b/DSA-LIMS_MANUAL.pdf
diff --git a/FormLogin.cs b/FormLogin.cs
@@ -25,6 +25,7 @@ You should have received a copy of the GNU General Public License
 using System.DirectoryServices.ActiveDirectory;
 using System.Drawing;
 using System.Linq;
+using System.Reflection;
 using System.Security.Principal;
 using System.Text;
 using System.Windows.Forms;
@@ -71,6 +72,16 @@ private void btnOk_Click(object sender, EventArgs e)
 
                 trans = conn.BeginTransaction();
 
+                int client_version, database_version;
+
+                GetVersionInfo(conn, trans, out client_version, out database_version);
+
+                if (client_version != database_version)
+                {
+                    MessageBox.Show("Incompatible database. Client expects version " + client_version + " but database has version " + database_version);
+                    return;
+                }
+
                 if (cboxAction.SelectedIndex == 0)
                 {
                     string username = tbUsername.Text.ToLower().Trim();
@@ -130,6 +141,14 @@ private void btnOk_Click(object sender, EventArgs e)
             }
         }
 
+        private void GetVersionInfo(SqlConnection conn, SqlTransaction trans, out int client_version, out int database_version)
+        {
+            client_version = Assembly.GetExecutingAssembly().GetName().Version.Major;
+
+            SqlCommand cmd = new SqlCommand("select value from counters where name = 'database_version'", conn, trans);
+            database_version = (int)cmd.ExecuteScalar();
+        }
+
         private bool CreateLIMSAdministrator(SqlConnection conn, SqlTransaction trans)
         {
             FormCreateLIMSAdministrator form = new FormCreateLIMSAdministrator();

diff --git a/FormMain.Designer.cs b/FormMain.Designer.cs
diff --git a/Properties/AssemblyInfo.cs b/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.0.*")]
+[assembly: AssemblyVersion("1.1.*")]
 [assembly: AssemblyFileVersion("0.0.0.0")]
diff --git a/database.sql b/database.sql
@@ -157,6 +157,7 @@ create table counters (
 )
 go
 
+insert into counters (name) values('database_version')
 insert into counters (name) values('sample_counter')
 go
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,5 +101,10 @@ public string AssemblyCompany @@
                 }
             }
             #endregion
+            private void okButton_Click(object sender, EventArgs e)
+            {
+            }
         }
     }