From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 13 Oct 2015 16:04:29 +0000 (-0400)
Subject: [master] Implemented schema upgrade for MySQL schema 4.0
X-Git-Tag: trac3874_base~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e13ac3b0b278faabe338b00ffee8259c13f5342;p=thirdparty%2Fkea.git

[master] Implemented schema upgrade for MySQL schema 4.0

    Merged in trac3967.
---

2e13ac3b0b278faabe338b00ffee8259c13f5342
diff --cc configure.ac
index 9dbd0eedc0,9b2efe4b5d..9b2efe4b5d
mode 100755,100644..100755
--- a/configure.ac
+++ b/configure.ac
diff --cc src/bin/admin/scripts/mysql/Makefile.am
index 419474510f,d619977ac3..d619977ac3
mode 100755,100644..100755
--- a/src/bin/admin/scripts/mysql/Makefile.am
+++ b/src/bin/admin/scripts/mysql/Makefile.am
diff --cc src/bin/admin/scripts/mysql/dhcpdb_create.mysql
index c30b463ffa,f0cd773507..f0cd773507
mode 100755,100644..100755
--- a/src/bin/admin/scripts/mysql/dhcpdb_create.mysql
+++ b/src/bin/admin/scripts/mysql/dhcpdb_create.mysql
diff --cc src/bin/admin/tests/mysql_tests.sh.in
index 6a29ad3a4f,bf02d1bd03..b4d3ddeed3
mode 100755,100644..100755
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@@ -262,10 -257,38 +262,39 @@@ EO
      ERRCODE=$?
      assert_eq 0 $ERRCODE "dhcp6_options table is missing or broken. (returned status code %d, expected %d)"
  
 +    # Verify that it reports version 3.0.
+     #table: lease_state table added (upgrade 3.0 -> 4.0)
+     mysql -u$db_user -p$db_password $db_name >/dev/null 2>&1 <<EOF
+     SELECT state,name from lease_state;
+ EOF
+     ERRCODE=$?
+     assert_eq 0 $ERRCODE "dhcp6_options table is missing or broken. (returned status code %d, expected %d)"
+ 
+     #table: state column added to lease4 (upgrade 3.0 -> 4.0)
+     mysql -u$db_user -p$db_password $db_name >/dev/null 2>&1 <<EOF
+     SELECT state from lease4;
+ EOF
+     ERRCODE=$?
+     assert_eq 0 $ERRCODE "lease4 is missing state column. (returned status code %d, expected %d)"
+ 
+     #table: state column added to lease6 (upgrade 3.0 -> 4.0)
+     mysql -u$db_user -p$db_password $db_name >/dev/null 2>&1 <<EOF
+     SELECT state from lease6;
+ EOF
+     ERRCODE=$?
+     assert_eq 0 $ERRCODE "lease6 is missing state column. (returned status code %d, expected %d)"
+ 
+     #table: stored procedures for lease dumps added (upgrade 3.0 -> 4.0)
+     mysql -u$db_user -p$db_password $db_name >/dev/null 2>&1 <<EOF
+     call lease4DumpHeader(); call lease4DumpData(); call lease6DumpHeader(); call lease6DumpHeader();
+ EOF
+     ERRCODE=$?
+     assert_eq 0 $ERRCODE "lease dump stored procedures are missing or broken. (returned status code %d, expected %d)"
+ 
+     # Verify that it reports version 4.0.
      version=$(${keaadmin} lease-version mysql -u $db_user -p $db_password -n $db_name)
  
-     assert_str_eq "3.0" ${version} "Expected kea-admin to return %s, returned value was %s"
+     assert_str_eq "4.0" ${version} "Expected kea-admin to return %s, returned value was %s"
  
      # Let's wipe the whole database
      mysql_wipe