Merge pull request #239 from anarthal/bugfix/238-int-conversions

Responses now admit all integer types again

Author: mzimbres

include/boost/redis/adapter/detail/adapters.hpp

@@ -16,6 +16,7 @@
 
 #include <set>
 #include <optional>
+#include <type_traits>
 #include <unordered_set>
 #include <forward_list>
 #include <system_error>
@@ -37,13 +38,18 @@
 namespace boost::redis::adapter::detail
 {
 
-template <class> struct is_integral : std::false_type {};
-
-template <> struct is_integral<long long int         > : std::true_type {};
-template <> struct is_integral<unsigned long long int> : std::true_type {};
-template <> struct is_integral<int                   > : std::true_type {};
+// Exclude bools, char and charXY_t types
+template <class T> struct is_integral_number : std::is_integral<T> {};
+template <> struct is_integral_number<bool> : std::false_type {};
+template <> struct is_integral_number<char> : std::false_type {};
+template <> struct is_integral_number<char16_t> : std::false_type {};
+template <> struct is_integral_number<char32_t> : std::false_type {};
+template <> struct is_integral_number<wchar_t> : std::false_type {};
+#ifdef __cpp_char8_t
+template <> struct is_integral_number<char8_t> : std::false_type {};
+#endif
 
-template<class T, bool = is_integral<T>::value>
+template<class T, bool = is_integral_number<T>::value>
 struct converter;
 
 template<class T>

test/CMakeLists.txt

@@ -47,6 +47,7 @@ make_test(test_conn_exec_cancel 20)
 make_test(test_conn_exec_cancel2 20)
 make_test(test_conn_echo_stress 20)
 make_test(test_any_adapter 17)
+make_test(test_conversions 17)
 make_test(test_issue_50 20)
 make_test(test_issue_181 17)
 

test/test_conversions.cpp

@@ -0,0 +1,123 @@
+/* Copyright (c) 2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#include "boost/redis/ignore.hpp"
+#include "boost/system/detail/error_code.hpp"
+#define BOOST_TEST_MODULE conversions
+#include <boost/redis/connection.hpp>
+#include <boost/test/included/unit_test.hpp>
+
+#include "common.hpp"
+
+namespace net = boost::asio;
+using boost::redis::connection;
+using boost::redis::ignore_t;
+using boost::redis::request;
+using boost::redis::response;
+using boost::system::error_code;
+
+BOOST_AUTO_TEST_CASE(ints)
+{
+    // Setup
+    net::io_context ioc;
+    auto conn = std::make_shared<connection>(ioc);
+    run(conn);
+
+    // Get an integer key as all possible C++ integral types
+    request req;
+    req.push("SET", "key", 42);
+    for (int i = 0; i < 10; ++i)
+        req.push("GET", "key");
+
+    response<
+        ignore_t,
+        signed char,
+        unsigned char,
+        short,
+        unsigned short,
+        int,
+        unsigned int,
+        long,
+        unsigned long,
+        long long,
+        unsigned long long
+    > resp;
+
+    conn->async_exec(req, resp, [conn](error_code ec, std::size_t) {
+        BOOST_TEST(!ec);
+        conn->cancel();
+    });
+
+    // Run the operations
+    ioc.run();
+
+    // Check
+    BOOST_TEST(std::get<1>(resp).value() == 42);
+    BOOST_TEST(std::get<2>(resp).value() == 42);
+    BOOST_TEST(std::get<3>(resp).value() == 42);
+    BOOST_TEST(std::get<4>(resp).value() == 42);
+    BOOST_TEST(std::get<5>(resp).value() == 42);
+    BOOST_TEST(std::get<6>(resp).value() == 42);
+    BOOST_TEST(std::get<7>(resp).value() == 42);
+    BOOST_TEST(std::get<8>(resp).value() == 42);
+    BOOST_TEST(std::get<9>(resp).value() == 42);
+    BOOST_TEST(std::get<10>(resp).value() == 42);
+}
+
+BOOST_AUTO_TEST_CASE(bools)
+{
+    // Setup
+    net::io_context ioc;
+    auto conn = std::make_shared<connection>(ioc);
+    run(conn);
+
+    // Get a boolean
+    request req;
+    req.push("SET", "key_true", "t");
+    req.push("SET", "key_false", "f");
+    req.push("GET", "key_true");
+    req.push("GET", "key_false");
+
+    response<ignore_t, ignore_t, bool, bool> resp;
+
+    conn->async_exec(req, resp, [conn](error_code ec, std::size_t) {
+        BOOST_TEST(!ec);
+        conn->cancel();
+    });
+
+    // Run the operations
+    ioc.run();
+
+    // Check
+    BOOST_TEST(std::get<2>(resp).value() == true);
+    BOOST_TEST(std::get<3>(resp).value() == false);
+}
+
+BOOST_AUTO_TEST_CASE(floating_points)
+{
+    // Setup
+    net::io_context ioc;
+    auto conn = std::make_shared<connection>(ioc);
+    run(conn);
+
+    // Get a boolean
+    request req;
+    req.push("SET", "key", "4.12");
+    req.push("GET", "key");
+
+    response<ignore_t, double> resp;
+
+    conn->async_exec(req, resp, [conn](error_code ec, std::size_t) {
+        BOOST_TEST(!ec);
+        conn->cancel();
+    });
+
+    // Run the operations
+    ioc.run();
+
+    // Check
+    BOOST_TEST(std::get<1>(resp).value() == 4.12);
+}