[#3631] fixed option_def_data_type int8 entry with id 3

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 223e576f39bc60dd07696ab5840806e55e2020f9..37121da477a38faa8c794a6bb4ced7103b1c7f7d 100644 (file)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -827,6 +827,108 @@ mysql_upgrade_23_to_24_test() {
         mysql_execute "${query}"
     assert_eq 0 "${EXIT_CODE}" "${query}: expected %d, returned %d"
     assert_str_eq '18' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 0"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'empty' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 1"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'binary' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 2"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'boolean' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 4"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'int16' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 5"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'int32' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 6"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'uint8' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 7"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'uint16' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 8"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'uint32' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 10"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'ipv4-address' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 11"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'ipv6-address' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 12"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'ipv6-prefix' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 13"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'psid' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 14"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'string' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 15"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'tuple' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 16"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'fqdn' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 17"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'internal' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 254"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'record' "${OUTPUT}" "${query}: expected output %s, returned %s"
 }
 
 mysql_upgrade_24_to_25_test() {
@@ -855,6 +957,12 @@ mysql_upgrade_25_to_26_test() {
     run_command \
         mysql_execute "${qry}"
     assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+
+    qry="select name from option_def_data_type where id = 3"
+    run_command \
+        mysql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'int8' "${OUTPUT}" "${query}: expected output %s, returned %s"
 }
 
 mysql_upgrade_test() {

diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index 9de1bb47d8eb3cd4162e8babc00a6275c459a063..792a5c14d7a745fd37776d15bfd8a9a44cc865f0 100644 (file)
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -923,6 +923,108 @@ pgsql_upgrade_23_to_24_test() {
         pgsql_execute "${query}"
     assert_eq 0 "${EXIT_CODE}" "${query}: expected %d, returned %d"
     assert_str_eq '18' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 0"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'empty' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 1"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'binary' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 2"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'boolean' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 4"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'int16' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 5"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'int32' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 6"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'uint8' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 7"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'uint16' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 8"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'uint32' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 10"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'ipv4-address' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 11"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'ipv6-address' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 12"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'ipv6-prefix' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 13"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'psid' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 14"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'string' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 15"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'tuple' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 16"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'fqdn' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 17"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'internal' "${OUTPUT}" "${query}: expected output %s, returned %s"
+
+    qry="select name from option_def_data_type where id = 254"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'record' "${OUTPUT}" "${query}: expected output %s, returned %s"
 }
 
 pgsql_upgrade_24_to_25_test() {
@@ -948,6 +1050,12 @@ pgsql_upgrade_25_to_26_test() {
     run_command \
         pgsql_execute "${qry}"
     assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+
+    qry="select name from option_def_data_type where id = 3"
+    run_command \
+        pgsql_execute "${qry}"
+    assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+    assert_str_eq 'int8' "${OUTPUT}" "${query}: expected output %s, returned %s"
 }
 
 pgsql_upgrade_test() {

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 9bd11a78bac50cf12d8460a02479998aad70115c..1466b6584f1dc4c8f3cda9b524ad5b98531bafd1 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -5972,7 +5972,7 @@ BEGIN
             (0, 'empty'),
             (1, 'binary'),
             (2, 'boolean'),
-            (3, 'int8"'),
+            (3, 'int8'),
             (4, 'int16'),
             (5, 'int32'),
             (6, 'uint8'),

diff --git a/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in b/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in
index cc99a63d824617f3abb381fe41b9a11565a89c78..876079b58bfa41cc3e2d1e1779e3c860ae41d1e8 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in
@@ -63,6 +63,8 @@ ALTER TABLE dhcp4_options
 ALTER TABLE dhcp6_options
     ADD COLUMN client_classes LONGTEXT DEFAULT NULL;
 
+UPDATE option_def_data_type SET name='int8' where id = 3;
+
 -- Update the schema version number.
 UPDATE schema_version
     SET version = '26', minor = '0';

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 8d3e938827b19ab7507ee1e99a65eecb4bedcf5f..04413cad9d26bdf5ee15b2032414e2d0183f1168 100644 (file)
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -6432,7 +6432,7 @@ BEGIN
         (0, 'empty'),
         (1, 'binary'),
         (2, 'boolean'),
-        (3, 'int8"'),
+        (3, 'int8'),
         (4, 'int16'),
         (5, 'int32'),
         (6, 'uint8'),

diff --git a/src/share/database/scripts/pgsql/upgrade_025_to_026.sh.in b/src/share/database/scripts/pgsql/upgrade_025_to_026.sh.in
index 6e14f6b1002e87320f7a9325cd3ffca16b68d839..cd40a1f1a483ee91b2e6c6f06e694e4a9be4bd66 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_025_to_026.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_025_to_026.sh.in
@@ -46,6 +46,8 @@ ALTER TABLE dhcp4_options
 ALTER TABLE dhcp6_options
     ADD COLUMN client_classes TEXT DEFAULT NULL;
 
+UPDATE option_def_data_type SET name='int8' where id = 3;
+
 -- Update the schema version number.
 UPDATE schema_version
     SET version = '26', minor = '0';