[#4490] Addressed review comments

new file:   changelog_unreleased/4490-rfc9915-support-followup-remove-ia_ta-from-sql-schemas
modified:   src/bin/admin/tests/mysql_tests.sh.in
modified:   src/bin/admin/tests/pgsql_tests.sh.in
modified:   src/share/database/scripts/mysql/dhcpdb_create.mysql
modified:   src/share/database/scripts/mysql/upgrade_034_to_035.sh.in
modified:   src/share/database/scripts/pgsql/dhcpdb_create.pgsql
modified:   src/share/database/scripts/pgsql/upgrade_033_to_034.sh.in

diff --git a/changelog_unreleased/4490-rfc9915-support-followup-remove-ia_ta-from-sql-schemas b/changelog_unreleased/4490-rfc9915-support-followup-remove-ia_ta-from-sql-schemas
new file mode 100644 (file)
index 0000000..b29f7e4
--- /dev/null
+++ b/changelog_unreleased/4490-rfc9915-support-followup-remove-ia_ta-from-sql-schemas
@@ -0,0 +1,4 @@
+[func]         tmark
+       IA_TA lease6 lease type has been removed from the
+    MySQL and PostgreSQL schemas.
+       (Gitlab #4490)

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 8e471c81c6963fa4aed6f1b15dc646431d624b7c..4c91939e2ceebf55d07cfb6d423bd19edada69b2 100755 (executable)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -4354,7 +4354,7 @@ mysql_sflqCreateFlqPool6() {
             values (inet6_aton('3001::7'), 0, 1, 3600, timestamp('$future'), 2)";
     run_statement "insert 3001::7" "$sql"  "";
 
-    sql="call sflqCreateFlqPool6('3001::', '3001::8', 1, 128, 1, false)"
+    sql="call sflqCreateFlqPool6('3001::', '3001::8', 0, 128, 1, false)"
     run_statement "sflqCreateFlqPool6" "$sql"
 
     sql="select count(address) from lease6 where inet6_ntoa(address) in\
@@ -4428,7 +4428,7 @@ mysql_sflqPickFreeLease6() {
 
     # We need to create an older database with lease data so we can
 
-    sql="call sflqCreateFlqPool6('3001::', '3001::02', 1, 128, 1, false)"
+    sql="call sflqCreateFlqPool6('3001::', '3001::02', 0, 128, 1, false)"
     run_statement "sflqCreateFlqPool6" "$sql"
 
     sql="select sflqPickFreeLease6('3001::', '3001::02')"
@@ -4465,7 +4465,7 @@ mysql_sflqPickFreeLease6() {
 
     # Check pools with one address.
     address='2001:db8::8bd:1002'
-    sql="call sflqCreateFlqPool6('${address}', '${address}', 1, 128, 1, false)"
+    sql="call sflqCreateFlqPool6('${address}', '${address}', 0, 128, 1, false)"
     run_statement "sflqCreateFlqPool6.2" "${sql}"
     sql="select sflqPickFreeLease6('${address}', '${address}')"
     run_statement "sflqPickFreeLease6.13" "${sql}" "${address}";
@@ -4474,7 +4474,7 @@ mysql_sflqPickFreeLease6() {
 
     # Check picking last address.
     address='ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff'
-    sql="call sflqCreateFlqPool6('${address}', '${address}', 1, 128, 1, false)"
+    sql="call sflqCreateFlqPool6('${address}', '${address}', 0, 128, 1, false)"
     run_statement "sflqCreateFlqPool6.4" "${sql}"
     sql="select sflqPickFreeLease6('${address}', '${address}')"
     run_statement "sflqPickFreeLease6.17" "${sql}" "${address}";
@@ -4732,7 +4732,7 @@ mysql_sflqInsertLease6() {
     assert_eq 0 "${EXIT_CODE}" "cannot initialize the database, expected exit code: %d, actual: %d"
 
     # Create a SFLQ pool 3001:: - 3001::4
-    sql="call sflqCreateFlqPool6('3001::', '3001::4', 1, 128, 1, 0)"
+    sql="call sflqCreateFlqPool6('3001::', '3001::4', 0, 128, 1, 0)"
     run_statement "sflqCreateFlqPool6" "$sql"
 
     # Verify free_lease4 has all five addresses
@@ -4834,7 +4834,7 @@ mysql_sflqUpdateLease6() {
     assert_eq 0 "${EXIT_CODE}" "cannot initialize the database, expected exit code: %d, actual: %d"
 
     # Create a SFLQ pool 3001:: - 3001::4
-    sql="call sflqCreateFlqPool6('3001::', '3001::4', 1, 128, 1, 0)"
+    sql="call sflqCreateFlqPool6('3001::', '3001::4', 0, 128, 1, 0)"
     run_statement "sflqCreateFlqPool6" "$sql"
 
     # Verify free_lease4 has all five addresses
@@ -4942,7 +4942,7 @@ mysql_sflqDeleteLease6() {
     assert_eq 0 "${EXIT_CODE}" "cannot initialize the database, expected exit code: %d, actual: %d"
 
     # Create a SFLQ pool 3001:: - 3001::4
-    sql="call sflqCreateFlqPool6('3001::', '3001::4', 1, 128, 1, 0)"
+    sql="call sflqCreateFlqPool6('3001::', '3001::4', 0, 128, 1, 0)"
     run_statement "sflqCreateFlqPool6" "$sql"
 
     # Verify free_lease4 has all five addresses

diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index 3841b605a1bb1211516e58316149bcc1269e2e49..e88320a6d687708a2c1c55864ebf80eb2d6fd9e3 100755 (executable)
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -3925,7 +3925,7 @@ pgsql_sflqInsertLease6() {
     assert_eq 0 "${EXIT_CODE}" "cannot initialize the database, expected exit code: %d, actual: %d"
 
     # Create a SFLQ pool 3001:: - 3001::4
-    sql="select sflqCreateFlqPool6('3001::'::inet, '3001::4'::inet, 1::smallint, 128::smallint,\
+    sql="select sflqCreateFlqPool6('3001::'::inet, '3001::4'::inet, 0::smallint, 128::smallint,\
                                  1::bigint, false)"
     run_statement "sflqCreateFlqPool6" "$sql"
 
@@ -4035,7 +4035,7 @@ pgsql_sflqUpdateLease6() {
     assert_eq 0 "${EXIT_CODE}" "cannot initialize the database, expected exit code: %d, actual: %d"
 
     # Create a SFLQ pool 3001:: - 3001::4
-    sql="select sflqCreateFlqPool6('3001::'::inet, '3001::4'::inet, 1::smallint, 128::smallint,\
+    sql="select sflqCreateFlqPool6('3001::'::inet, '3001::4'::inet, 0::smallint, 128::smallint,\
                                  1::bigint, false)"
     run_statement "sflqCreateFlqPool6" "$sql"
 
@@ -4149,7 +4149,7 @@ pgsql_sflqDeleteLease6() {
     assert_eq 0 "${EXIT_CODE}" "cannot initialize the database, expected exit code: %d, actual: %d"
 
     # Create a SFLQ pool 3001:: - 3001::4
-    sql="select sflqCreateFlqPool6('3001::'::inet, '3001::4'::inet, 1::smallint, 128::smallint,\
+    sql="select sflqCreateFlqPool6('3001::'::inet, '3001::4'::inet, 0::smallint, 128::smallint,\
                                  1::bigint, false)"
     run_statement "sflqCreateFlqPool6" "$sql"
 

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 0bcdd441edc347e4f8d4996fd5cbad700bc26bf2..3d40c390d35d47fd46075432837ac77f4086b572 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -7548,8 +7548,14 @@ DELIMITER ;
 -- Drop IA_TA from lease6_types table.
 -- On the off chance that somehow there are IA_TA leases convert them
 -- or the foreign key contraint will blow this up.
-   UPDATE lease6 SET lease_type = 0 WHERE lease_type = 1;
-   DELETE FROM lease6_types where lease_type = 1;
+UPDATE lease6 SET lease_type = 0 WHERE lease_type = 1;
+DELETE FROM lease6_stat_by_client_class WHERE lease_type = 1;
+DELETE FROM lease6_stat WHERE lease_type = 1;
+DELETE FROM lease6_types where lease_type = 1;
+
+ALTER TABLE flq_pool6
+    ADD CONSTRAINT fk_flq_pool6_lease6_type FOREIGN KEY (lease_type)
+    REFERENCES lease6_types (lease_type);
 
 -- Update the schema version number.
 UPDATE schema_version

diff --git a/src/share/database/scripts/mysql/upgrade_034_to_035.sh.in b/src/share/database/scripts/mysql/upgrade_034_to_035.sh.in
index 2833a900c5fd1e244b2269d9cc851b84db7babb7..ecf2d4a492c3d6acab0f6aacaa1b16059484afdc 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_034_to_035.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_034_to_035.sh.in
@@ -263,8 +263,14 @@ DELIMITER ;
 -- Drop IA_TA from lease6_types table.
 -- On the off chance that somehow there are IA_TA leases convert them
 -- or the foreign key contraint will blow this up.
-   UPDATE lease6 SET lease_type = 0 WHERE lease_type = 1;
-   DELETE FROM lease6_types where lease_type = 1;
+UPDATE lease6 SET lease_type = 0 WHERE lease_type = 1;
+DELETE FROM lease6_stat_by_client_class WHERE lease_type = 1;
+DELETE FROM lease6_stat WHERE lease_type = 1;
+DELETE FROM lease6_types where lease_type = 1;
+
+ALTER TABLE flq_pool6
+    ADD CONSTRAINT fk_flq_pool6_lease6_type FOREIGN KEY (lease_type)
+    REFERENCES lease6_types (lease_type);
 
 -- Update the schema version number.
 UPDATE schema_version

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 5f58cf248b74ee1958f41efb57942cc262ab6307..e6fc879cdfd7b326d2620bdf6769f4fcd843fcb3 100644 (file)
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -7768,8 +7768,14 @@ $$;
 -- Drop IA_TA from lease6_types table.
 -- On the off chance that somehow there are IA_TA leases convert them
 -- or the foreign key contraint will blow this up.
-   UPDATE lease6 SET lease_type = 0 WHERE lease_type = 1;
-   DELETE FROM lease6_types where lease_type = 1;
+UPDATE lease6 SET lease_type = 0 WHERE lease_type = 1;
+DELETE FROM lease6_stat_by_client_class WHERE lease_type = 1;
+DELETE FROM lease6_stat WHERE lease_type = 1;
+DELETE FROM lease6_types where lease_type = 1;
+
+ALTER TABLE flq_pool6
+    ADD CONSTRAINT fk_flq_pool6_lease6_type FOREIGN KEY (lease_type)
+    REFERENCES lease6_types (lease_type);
 
 -- Update the schema version number.
 UPDATE schema_version

diff --git a/src/share/database/scripts/pgsql/upgrade_033_to_034.sh.in b/src/share/database/scripts/pgsql/upgrade_033_to_034.sh.in
index 440d525c715b39841781194f14bafe891f05173f..aec07b9a08287668d6d053c537d0537748dcbb5c 100755 (executable)
--- a/src/share/database/scripts/pgsql/upgrade_033_to_034.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_033_to_034.sh.in
@@ -174,8 +174,14 @@ END;
 -- Drop IA_TA from lease6_types table.
 -- On the off chance that somehow there are IA_TA leases convert them
 -- or the foreign key contraint will blow this up.
-   UPDATE lease6 SET lease_type = 0 WHERE lease_type = 1;
-   DELETE FROM lease6_types where lease_type = 1;
+UPDATE lease6 SET lease_type = 0 WHERE lease_type = 1;
+DELETE FROM lease6_stat_by_client_class WHERE lease_type = 1;
+DELETE FROM lease6_stat WHERE lease_type = 1;
+DELETE FROM lease6_types where lease_type = 1;
+
+ALTER TABLE flq_pool6
+    ADD CONSTRAINT fk_flq_pool6_lease6_type FOREIGN KEY (lease_type)
+    REFERENCES lease6_types (lease_type);
 
 -- Update the schema version number.
 UPDATE schema_version