use correct includes in tests

mirostauder · mirostauder · commit 9f5f7e7f30d3 · 2025-10-09T12:05:45.000Z
diff --git a/test/tap/tap/command_line.cpp b/test/tap/tap/command_line.cpp
@@ -8,7 +8,7 @@
 
 #include "tap.h"
 #include "command_line.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "dotenv.h"
 
diff --git a/test/tap/tap/utils.cpp b/test/tap/tap/utils.cpp
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <utility>
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "re2/re2.h"
 
 #include "proxysql_utils.h"
diff --git a/test/tap/tap/utils.h b/test/tap/tap/utils.h
@@ -14,7 +14,7 @@
 #include "curl/curl.h"
 #include "mysql.h"
 #include "sqlite3db.h"
-#include "json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 
 #include "command_line.h"
 #include "mysql.h"
diff --git a/test/tap/tests/max_connections_ff-t.cpp b/test/tap/tests/max_connections_ff-t.cpp
@@ -25,7 +25,7 @@
 
 #include "mysql.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "tap.h"
 #include "command_line.h"
diff --git a/test/tap/tests/mysql-protocol_compression_level-t.cpp b/test/tap/tests/mysql-protocol_compression_level-t.cpp
@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "mysql.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "tap.h"
 #include "command_line.h"
diff --git a/test/tap/tests/mysql_hostgroup_attributes-servers_defaults-t.cpp b/test/tap/tests/mysql_hostgroup_attributes-servers_defaults-t.cpp
@@ -18,7 +18,7 @@
 #include "mysql.h"
 #include "mysqld_error.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "tap.h"
 #include "utils.h"
diff --git a/test/tap/tests/mysql_hostgroup_attributes_config_file-t.cpp b/test/tap/tests/mysql_hostgroup_attributes_config_file-t.cpp
@@ -11,7 +11,7 @@
 #include "mysql.h"
 #include "mysqld_error.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "tap.h"
 #include "utils.h"
diff --git a/test/tap/tests/pgsql-extended_query_protocol_query_rules_test-t.cpp b/test/tap/tests/pgsql-extended_query_protocol_query_rules_test-t.cpp
@@ -14,7 +14,7 @@
 #include "command_line.h"
 #include "tap.h"
 #include "utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 typedef unsigned int Oid;
 using nlohmann::json;
diff --git a/test/tap/tests/pgsql-multiplex_status_test-t.cpp b/test/tap/tests/pgsql-multiplex_status_test-t.cpp
@@ -13,7 +13,7 @@
 #include "command_line.h"
 #include "tap.h"
 #include "utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 typedef unsigned int Oid;
 using nlohmann::json;
diff --git a/test/tap/tests/reg_test_3184-set_wait_timeout-t.cpp b/test/tap/tests/reg_test_3184-set_wait_timeout-t.cpp
@@ -18,7 +18,7 @@
 #include "tap.h"
 #include "command_line.h"
 #include "utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using std::string;
 using namespace nlohmann;
diff --git a/test/tap/tests/reg_test_3223-restapi_return_codes-t.cpp b/test/tap/tests/reg_test_3223-restapi_return_codes-t.cpp
@@ -16,7 +16,7 @@
 #include <signal.h>
 
 #include "curl/curl.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "mysql.h"
 #include "mysqld_error.h"
 
diff --git a/test/tap/tests/reg_test_3327-process_query_set_status_flags-t.cpp b/test/tap/tests/reg_test_3327-process_query_set_status_flags-t.cpp
@@ -14,7 +14,7 @@
 #include "tap.h"
 #include "command_line.h"
 #include "utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using std::string;
 using namespace nlohmann;
diff --git a/test/tap/tests/reg_test_3493-USE_with_comment-t.cpp b/test/tap/tests/reg_test_3493-USE_with_comment-t.cpp
@@ -29,7 +29,7 @@
 #include "tap.h"
 #include "command_line.h"
 #include "utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using nlohmann::json;
 
diff --git a/test/tap/tests/reg_test_3504-change_user-t.cpp b/test/tap/tests/reg_test_3504-change_user-t.cpp
@@ -29,7 +29,7 @@
 #include "mysql.h"
 
 #include "command_line.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "tap.h"
 #include "utils.h"
 
diff --git a/test/tap/tests/reg_test_3504-change_user_helper.cpp b/test/tap/tests/reg_test_3504-change_user_helper.cpp
@@ -35,7 +35,7 @@
 #include "mysqld_error.h"
 
 #include "proxysql_utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "tap.h"
 #include "utils.h"
 
diff --git a/test/tap/tests/reg_test_3549-autocommit_tracking-t.cpp b/test/tap/tests/reg_test_3549-autocommit_tracking-t.cpp
@@ -18,7 +18,7 @@
 #include "tap.h"
 #include "command_line.h"
 #include "utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using nlohmann::json;
 
diff --git a/test/tap/tests/reg_test_3591-restapi_num_fds-t.cpp b/test/tap/tests/reg_test_3591-restapi_num_fds-t.cpp
@@ -21,7 +21,7 @@
 #include "tap.h"
 #include "command_line.h"
 #include "utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/test/tap/tests/reg_test_3690-admin_large_pkts-t.cpp b/test/tap/tests/reg_test_3690-admin_large_pkts-t.cpp
@@ -18,7 +18,7 @@
 
 #include "mysql.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "tap.h"
 #include "command_line.h"
 #include "utils.h"
diff --git a/test/tap/tests/reg_test_3838-restapi_eintr-t.cpp b/test/tap/tests/reg_test_3838-restapi_eintr-t.cpp
@@ -25,7 +25,7 @@
 #include "mysql.h"
 #include "mysqld_error.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "tap.h"
 #include "proxysql_utils.h"
 #include "command_line.h"
diff --git a/test/tap/tests/reg_test_4001-restapi_scripts_num_fds-t.cpp b/test/tap/tests/reg_test_4001-restapi_scripts_num_fds-t.cpp
@@ -26,7 +26,7 @@
 
 #include "command_line.h"
 #include "proxysql_utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "tap.h"
 #include "utils.h"
 
diff --git a/test/tap/tests/reg_test_4158_change_user-t.cpp b/test/tap/tests/reg_test_4158_change_user-t.cpp
@@ -18,7 +18,7 @@
 
 using std::string;
 
-//#include "json.hpp"
+//#include "nlohmann/json.hpp"
 //using nlohmann::json;
 
 
diff --git a/test/tap/tests/reg_test_4264-commit_rollback-t.cpp b/test/tap/tests/reg_test_4264-commit_rollback-t.cpp
@@ -48,7 +48,7 @@
 #include "utils.h"
 #include "command_line.h"
 #include "proxysql_utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using std::function;
 using std::pair;
diff --git a/test/tap/tests/reg_test_4556-ssl_error_queue-t.cpp b/test/tap/tests/reg_test_4556-ssl_error_queue-t.cpp
@@ -35,7 +35,7 @@
 
 #include "mysql.h"
 #include "openssl/ssl.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "tap.h"
 #include "command_line.h"
diff --git a/test/tap/tests/reg_test_sql_calc_found_rows-t.cpp b/test/tap/tests/reg_test_sql_calc_found_rows-t.cpp
@@ -14,7 +14,7 @@
 
 #include "mysql.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "tap.h"
 #include "command_line.h"
diff --git a/test/tap/tests/savepoint-948-t.cpp b/test/tap/tests/savepoint-948-t.cpp
@@ -19,7 +19,7 @@
 #include "utils.h"
 #include "command_line.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 using nlohmann::json;
 
 
diff --git a/test/tap/tests/set_testing-240-t.cpp b/test/tap/tests/set_testing-240-t.cpp
@@ -20,7 +20,7 @@
 #include <mutex>
 
 #include "mysql.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "tap.h"
 #include "utils.h"
diff --git a/test/tap/tests/set_testing-240.h b/test/tap/tests/set_testing-240.h
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <vector>
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using nlohmann::json;
 
diff --git a/test/tap/tests/set_testing-multi-t.cpp b/test/tap/tests/set_testing-multi-t.cpp
@@ -11,7 +11,7 @@
 #include <mutex>
 
 #include "mysql.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "re2/re2.h"
 
 #include "tap.h"
diff --git a/test/tap/tests/set_testing-t.cpp b/test/tap/tests/set_testing-t.cpp
@@ -24,7 +24,7 @@
 #include <mutex>
 #include <algorithm>
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "re2/re2.h"
 #include "re2/regexp.h"
 
diff --git a/test/tap/tests/set_testing.h b/test/tap/tests/set_testing.h
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <vector>
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using nlohmann::json;
 
diff --git a/test/tap/tests/test_PROXY_Protocol-t.cpp b/test/tap/tests/test_PROXY_Protocol-t.cpp
@@ -14,7 +14,7 @@
 #include "tap.h"
 #include "command_line.h"
 #include "utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include <utility> // For std::pair
 
diff --git a/test/tap/tests/test_auth_methods-t.cpp b/test/tap/tests/test_auth_methods-t.cpp
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 #include "openssl/types.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "mysql.h"
 
 #include "tap.h"
diff --git a/test/tap/tests/test_auto_increment_delay_multiplex-t.cpp b/test/tap/tests/test_auto_increment_delay_multiplex-t.cpp
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include "mysql.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "command_line.h"
 #include "proxysql_utils.h"
diff --git a/test/tap/tests/test_backend_conn_ping-t.cpp b/test/tap/tests/test_backend_conn_ping-t.cpp
@@ -75,7 +75,7 @@
 #include "mysql.h"
 #include "tap.h"
 #include "utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using std::vector;
 using std::string;
diff --git a/test/tap/tests/test_binlog_reader-t.cpp b/test/tap/tests/test_binlog_reader-t.cpp
@@ -30,7 +30,7 @@
 
 #include "mysql.h"
 #include "mysqld_error.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "tap.h"
 #include "command_line.h"
diff --git a/test/tap/tests/test_change_user-t.cpp b/test/tap/tests/test_change_user-t.cpp
@@ -24,7 +24,7 @@ struct st_mysql_options_extension {
 #include "command_line.h"
 #include "utils.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using std::pair;
 using std::string;
diff --git a/test/tap/tests/test_client_limit_error-t.cpp b/test/tap/tests/test_client_limit_error-t.cpp
@@ -51,7 +51,7 @@
 #include "proxysql_utils.h"
 #include "mysql.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "tap.h"
 #include "command_line.h"
 #include "utils.h"
diff --git a/test/tap/tests/test_com_reset_connection_com_change_user-t.cpp b/test/tap/tests/test_com_reset_connection_com_change_user-t.cpp
@@ -24,7 +24,7 @@
 
 #include "command_line.h"
 #include "proxysql_utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "tap.h"
 #include "utils.h"
 
diff --git a/test/tap/tests/test_default_value_transaction_isolation_attr-t.cpp b/test/tap/tests/test_default_value_transaction_isolation_attr-t.cpp
@@ -28,7 +28,7 @@
 #include "command_line.h"
 #include "proxysql_utils.h"
 #include "utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using std::string;
 using namespace nlohmann;
diff --git a/test/tap/tests/test_keep_multiplexing_variables-t.cpp b/test/tap/tests/test_keep_multiplexing_variables-t.cpp
@@ -13,7 +13,7 @@
 #include "tap.h"
 #include "command_line.h"
 #include "utils.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using std::string;
 using namespace nlohmann;
diff --git a/test/tap/tests/test_log_last_insert_id-t.cpp b/test/tap/tests/test_log_last_insert_id-t.cpp
@@ -14,7 +14,7 @@
 #include "command_line.h"
 #include "utils.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 using std::string;
 using nlohmann::json;
diff --git a/test/tap/tests/test_max_transaction_time-t.cpp b/test/tap/tests/test_max_transaction_time-t.cpp
@@ -18,7 +18,7 @@
 
 using std::string;
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 #define NUMQUERIES	15
 
diff --git a/test/tap/tests/test_mysql_query_digests_stages-t.cpp b/test/tap/tests/test_mysql_query_digests_stages-t.cpp
@@ -33,7 +33,7 @@
 #include <vector>
 #include <string>
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "proxysql.h"
 #include "proxysql_utils.h"
 #include "re2/re2.h"
diff --git a/test/tap/tests/test_prometheus_metrics-t.cpp b/test/tap/tests/test_prometheus_metrics-t.cpp
@@ -18,7 +18,7 @@
 #include "mysql.h"
 #include "mysqld_error.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 #include "tap.h"
 #include "command_line.h"
 #include "utils.h"
diff --git a/test/tap/tests/test_query_rules_fast_routing_algorithm-t.cpp b/test/tap/tests/test_query_rules_fast_routing_algorithm-t.cpp
diff --git a/test/tap/tests/test_session_status_flags-t.cpp b/test/tap/tests/test_session_status_flags-t.cpp
diff --git a/test/tap/tests/test_thread_conn_dist-t.cpp b/test/tap/tests/test_thread_conn_dist-t.cpp
diff --git a/test/tap/tests/test_unsupported_queries-t.cpp b/test/tap/tests/test_unsupported_queries-t.cpp
diff --git a/test/tap/tests/test_warnings-t.cpp b/test/tap/tests/test_warnings-t.cpp
diff --git a/test/tap/tests_with_deps/deprecate_eof_support/deprecate_eof_cache-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/deprecate_eof_cache-t.cpp
diff --git a/test/tap/tests_with_deps/deprecate_eof_support/eof_conn_options_check-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/eof_conn_options_check-t.cpp
diff --git a/test/tap/tests_with_deps/deprecate_eof_support/fwd_eof_query.cpp b/test/tap/tests_with_deps/deprecate_eof_support/fwd_eof_query.cpp
diff --git a/tools/eventlog_reader_to_json.cpp b/tools/eventlog_reader_to_json.cpp
