Skip to content

Commit 86c2361

Browse files
author
Razvan Becheriu
committed
[#3631] fixed option_def_data_type int8 entry with id 3
1 parent 7dd4146 commit 86c2361

File tree

6 files changed

+222
-2
lines changed

6 files changed

+222
-2
lines changed

‎src/bin/admin/tests/mysql_tests.sh.in

+108
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,108 @@ mysql_upgrade_23_to_24_test() {
827827
mysql_execute "${query}"
828828
assert_eq 0 "${EXIT_CODE}" "${query}: expected %d, returned %d"
829829
assert_str_eq '18' "${OUTPUT}" "${query}: expected output %s, returned %s"
830+
831+
qry="select name from option_def_data_type where id = 0"
832+
run_command \
833+
mysql_execute "${qry}"
834+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
835+
assert_str_eq 'empty' "${OUTPUT}" "${query}: expected output %s, returned %s"
836+
837+
qry="select name from option_def_data_type where id = 1"
838+
run_command \
839+
mysql_execute "${qry}"
840+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
841+
assert_str_eq 'binary' "${OUTPUT}" "${query}: expected output %s, returned %s"
842+
843+
qry="select name from option_def_data_type where id = 2"
844+
run_command \
845+
mysql_execute "${qry}"
846+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
847+
assert_str_eq 'boolean' "${OUTPUT}" "${query}: expected output %s, returned %s"
848+
849+
qry="select name from option_def_data_type where id = 4"
850+
run_command \
851+
mysql_execute "${qry}"
852+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
853+
assert_str_eq 'int16' "${OUTPUT}" "${query}: expected output %s, returned %s"
854+
855+
qry="select name from option_def_data_type where id = 5"
856+
run_command \
857+
mysql_execute "${qry}"
858+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
859+
assert_str_eq 'int32' "${OUTPUT}" "${query}: expected output %s, returned %s"
860+
861+
qry="select name from option_def_data_type where id = 6"
862+
run_command \
863+
mysql_execute "${qry}"
864+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
865+
assert_str_eq 'uint8' "${OUTPUT}" "${query}: expected output %s, returned %s"
866+
867+
qry="select name from option_def_data_type where id = 7"
868+
run_command \
869+
mysql_execute "${qry}"
870+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
871+
assert_str_eq 'uint16' "${OUTPUT}" "${query}: expected output %s, returned %s"
872+
873+
qry="select name from option_def_data_type where id = 8"
874+
run_command \
875+
mysql_execute "${qry}"
876+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
877+
assert_str_eq 'uint32' "${OUTPUT}" "${query}: expected output %s, returned %s"
878+
879+
qry="select name from option_def_data_type where id = 10"
880+
run_command \
881+
mysql_execute "${qry}"
882+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
883+
assert_str_eq 'ipv4-address' "${OUTPUT}" "${query}: expected output %s, returned %s"
884+
885+
qry="select name from option_def_data_type where id = 11"
886+
run_command \
887+
mysql_execute "${qry}"
888+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
889+
assert_str_eq 'ipv6-address' "${OUTPUT}" "${query}: expected output %s, returned %s"
890+
891+
qry="select name from option_def_data_type where id = 12"
892+
run_command \
893+
mysql_execute "${qry}"
894+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
895+
assert_str_eq 'ipv6-prefix' "${OUTPUT}" "${query}: expected output %s, returned %s"
896+
897+
qry="select name from option_def_data_type where id = 13"
898+
run_command \
899+
mysql_execute "${qry}"
900+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
901+
assert_str_eq 'psid' "${OUTPUT}" "${query}: expected output %s, returned %s"
902+
903+
qry="select name from option_def_data_type where id = 14"
904+
run_command \
905+
mysql_execute "${qry}"
906+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
907+
assert_str_eq 'string' "${OUTPUT}" "${query}: expected output %s, returned %s"
908+
909+
qry="select name from option_def_data_type where id = 15"
910+
run_command \
911+
mysql_execute "${qry}"
912+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
913+
assert_str_eq 'tuple' "${OUTPUT}" "${query}: expected output %s, returned %s"
914+
915+
qry="select name from option_def_data_type where id = 16"
916+
run_command \
917+
mysql_execute "${qry}"
918+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
919+
assert_str_eq 'fqdn' "${OUTPUT}" "${query}: expected output %s, returned %s"
920+
921+
qry="select name from option_def_data_type where id = 17"
922+
run_command \
923+
mysql_execute "${qry}"
924+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
925+
assert_str_eq 'internal' "${OUTPUT}" "${query}: expected output %s, returned %s"
926+
927+
qry="select name from option_def_data_type where id = 254"
928+
run_command \
929+
mysql_execute "${qry}"
930+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
931+
assert_str_eq 'record' "${OUTPUT}" "${query}: expected output %s, returned %s"
830932
}
831933

832934
mysql_upgrade_24_to_25_test() {
@@ -855,6 +957,12 @@ mysql_upgrade_25_to_26_test() {
855957
run_command \
856958
mysql_execute "${qry}"
857959
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
960+
961+
qry="select name from option_def_data_type where id = 3"
962+
run_command \
963+
mysql_execute "${qry}"
964+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
965+
assert_str_eq 'int8' "${OUTPUT}" "${query}: expected output %s, returned %s"
858966
}
859967

860968
mysql_upgrade_test() {

‎src/bin/admin/tests/pgsql_tests.sh.in

+108
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,108 @@ pgsql_upgrade_23_to_24_test() {
923923
pgsql_execute "${query}"
924924
assert_eq 0 "${EXIT_CODE}" "${query}: expected %d, returned %d"
925925
assert_str_eq '18' "${OUTPUT}" "${query}: expected output %s, returned %s"
926+
927+
qry="select name from option_def_data_type where id = 0"
928+
run_command \
929+
pgsql_execute "${qry}"
930+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
931+
assert_str_eq 'empty' "${OUTPUT}" "${query}: expected output %s, returned %s"
932+
933+
qry="select name from option_def_data_type where id = 1"
934+
run_command \
935+
pgsql_execute "${qry}"
936+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
937+
assert_str_eq 'binary' "${OUTPUT}" "${query}: expected output %s, returned %s"
938+
939+
qry="select name from option_def_data_type where id = 2"
940+
run_command \
941+
pgsql_execute "${qry}"
942+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
943+
assert_str_eq 'boolean' "${OUTPUT}" "${query}: expected output %s, returned %s"
944+
945+
qry="select name from option_def_data_type where id = 4"
946+
run_command \
947+
pgsql_execute "${qry}"
948+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
949+
assert_str_eq 'int16' "${OUTPUT}" "${query}: expected output %s, returned %s"
950+
951+
qry="select name from option_def_data_type where id = 5"
952+
run_command \
953+
pgsql_execute "${qry}"
954+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
955+
assert_str_eq 'int32' "${OUTPUT}" "${query}: expected output %s, returned %s"
956+
957+
qry="select name from option_def_data_type where id = 6"
958+
run_command \
959+
pgsql_execute "${qry}"
960+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
961+
assert_str_eq 'uint8' "${OUTPUT}" "${query}: expected output %s, returned %s"
962+
963+
qry="select name from option_def_data_type where id = 7"
964+
run_command \
965+
pgsql_execute "${qry}"
966+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
967+
assert_str_eq 'uint16' "${OUTPUT}" "${query}: expected output %s, returned %s"
968+
969+
qry="select name from option_def_data_type where id = 8"
970+
run_command \
971+
pgsql_execute "${qry}"
972+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
973+
assert_str_eq 'uint32' "${OUTPUT}" "${query}: expected output %s, returned %s"
974+
975+
qry="select name from option_def_data_type where id = 10"
976+
run_command \
977+
pgsql_execute "${qry}"
978+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
979+
assert_str_eq 'ipv4-address' "${OUTPUT}" "${query}: expected output %s, returned %s"
980+
981+
qry="select name from option_def_data_type where id = 11"
982+
run_command \
983+
pgsql_execute "${qry}"
984+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
985+
assert_str_eq 'ipv6-address' "${OUTPUT}" "${query}: expected output %s, returned %s"
986+
987+
qry="select name from option_def_data_type where id = 12"
988+
run_command \
989+
pgsql_execute "${qry}"
990+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
991+
assert_str_eq 'ipv6-prefix' "${OUTPUT}" "${query}: expected output %s, returned %s"
992+
993+
qry="select name from option_def_data_type where id = 13"
994+
run_command \
995+
pgsql_execute "${qry}"
996+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
997+
assert_str_eq 'psid' "${OUTPUT}" "${query}: expected output %s, returned %s"
998+
999+
qry="select name from option_def_data_type where id = 14"
1000+
run_command \
1001+
pgsql_execute "${qry}"
1002+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
1003+
assert_str_eq 'string' "${OUTPUT}" "${query}: expected output %s, returned %s"
1004+
1005+
qry="select name from option_def_data_type where id = 15"
1006+
run_command \
1007+
pgsql_execute "${qry}"
1008+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
1009+
assert_str_eq 'tuple' "${OUTPUT}" "${query}: expected output %s, returned %s"
1010+
1011+
qry="select name from option_def_data_type where id = 16"
1012+
run_command \
1013+
pgsql_execute "${qry}"
1014+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
1015+
assert_str_eq 'fqdn' "${OUTPUT}" "${query}: expected output %s, returned %s"
1016+
1017+
qry="select name from option_def_data_type where id = 17"
1018+
run_command \
1019+
pgsql_execute "${qry}"
1020+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
1021+
assert_str_eq 'internal' "${OUTPUT}" "${query}: expected output %s, returned %s"
1022+
1023+
qry="select name from option_def_data_type where id = 254"
1024+
run_command \
1025+
pgsql_execute "${qry}"
1026+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
1027+
assert_str_eq 'record' "${OUTPUT}" "${query}: expected output %s, returned %s"
9261028
}
9271029

9281030
pgsql_upgrade_24_to_25_test() {
@@ -948,6 +1050,12 @@ pgsql_upgrade_25_to_26_test() {
9481050
run_command \
9491051
pgsql_execute "${qry}"
9501052
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
1053+
1054+
qry="select name from option_def_data_type where id = 3"
1055+
run_command \
1056+
pgsql_execute "${qry}"
1057+
assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
1058+
assert_str_eq 'int8' "${OUTPUT}" "${query}: expected output %s, returned %s"
9511059
}
9521060

9531061
pgsql_upgrade_test() {

‎src/share/database/scripts/mysql/dhcpdb_create.mysql

+1-1
Original file line numberDiff line numberDiff line change
@@ -5972,7 +5972,7 @@ BEGIN
59725972
(0, 'empty'),
59735973
(1, 'binary'),
59745974
(2, 'boolean'),
5975-
(3, 'int8"'),
5975+
(3, 'int8'),
59765976
(4, 'int16'),
59775977
(5, 'int32'),
59785978
(6, 'uint8'),

‎src/share/database/scripts/mysql/upgrade_025_to_026.sh.in

+2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ ALTER TABLE dhcp4_options
6363
ALTER TABLE dhcp6_options
6464
ADD COLUMN client_classes LONGTEXT DEFAULT NULL;
6565
66+
UPDATE option_def_data_type SET name='int8' where id = 3;
67+
6668
-- Update the schema version number.
6769
UPDATE schema_version
6870
SET version = '26', minor = '0';

‎src/share/database/scripts/pgsql/dhcpdb_create.pgsql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6432,7 +6432,7 @@ BEGIN
64326432
(0, 'empty'),
64336433
(1, 'binary'),
64346434
(2, 'boolean'),
6435-
(3, 'int8"'),
6435+
(3, 'int8'),
64366436
(4, 'int16'),
64376437
(5, 'int32'),
64386438
(6, 'uint8'),

‎src/share/database/scripts/pgsql/upgrade_025_to_026.sh.in

+2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ ALTER TABLE dhcp4_options
4646
ALTER TABLE dhcp6_options
4747
ADD COLUMN client_classes TEXT DEFAULT NULL;
4848
49+
UPDATE option_def_data_type SET name='int8' where id = 3;
50+
4951
-- Update the schema version number.
5052
UPDATE schema_version
5153
SET version = '26', minor = '0';

0 commit comments

Comments
 (0)