Fix Convert::ToString.

Fixes #5054

diff --git a/components/compat/statusdatawriter.cpp b/components/compat/statusdatawriter.cpp
index a8c384d7a0af851aa581f9d6c62b93fb3297d75a..da05da571834729896375573609383db7b584f0a 100644 (file)
--- a/components/compat/statusdatawriter.cpp
+++ b/components/compat/statusdatawriter.cpp
@@ -114,7 +114,7 @@ void StatusDataWriter::DumpTimePeriod(std::ostream& fp, const TimePeriod::Ptr& t
                String key;
                Value value;
                BOOST_FOREACH(boost::tie(key, value), ranges) {
-                       fp << "\t" << key << "\t" << Convert::ToString(value) << "\n";
+                       fp << "\t" << key << "\t" << value << "\n";
                }
        }
 
@@ -151,7 +151,7 @@ void StatusDataWriter::DumpCommand(std::ostream& fp, const Command::Ptr& command
                        fp << " \"" << CompatUtility::EscapeString(arg) << "\"";
                }
        } else if (!commandLine.IsEmpty()) {
-               fp << CompatUtility::EscapeString(Convert::ToString(commandLine));
+               fp << CompatUtility::EscapeString(commandLine);
        } else {
                fp << "<internal>";
        }
@@ -543,7 +543,7 @@ void StatusDataWriter::DumpCustomAttributes(std::ostream& fp, const DynamicObjec
                    key != "icon_image" && key != "icon_image_alt" && key != "statusmap_image" && "2d_coords")
                        fp << "_";
 
-               fp << key << "\t" << Convert::ToString(value) << "\n";
+               fp << key << "\t" << value << "\n";
        }
 }
 

diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/components/db_ido_mysql/idomysqlconnection.cpp
index cf80061d7f5ba2739368cfde4ed21c03edd2da03..14d74db9b01ade4455bde8adb1a78fa069349d33 100644 (file)
--- a/components/db_ido_mysql/idomysqlconnection.cpp
+++ b/components/db_ido_mysql/idomysqlconnection.cpp
@@ -557,7 +557,7 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query)
                                }
 
                                cols += key;
-                               values += Convert::ToString(value);
+                               values += value;
                        } else {
                                if (!first)
                                        qbuf << ", ";

diff --git a/components/db_ido_pgsql/idopgsqlconnection.cpp b/components/db_ido_pgsql/idopgsqlconnection.cpp
index 677771e8ff8870ea22d520b5411ae159f98098c3..32d363dd527bb5ae352fe167627e99b57a9177b4 100644 (file)
--- a/components/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/components/db_ido_pgsql/idopgsqlconnection.cpp
@@ -566,7 +566,7 @@ void IdoPgsqlConnection::InternalExecuteQuery(const DbQuery& query)
                                }
 
                                cols += key;
-                               values += Convert::ToString(value);
+                               values += value;
                        } else {
                                if (!first)
                                        qbuf << ", ";

diff --git a/lib/base/convert.cpp b/lib/base/convert.cpp
index b2727df749e2a4b9f76b8082925e1deb4f62bc3c..e676525e5eba27525894c76a7edc010e01203e5a 100644 (file)
--- a/lib/base/convert.cpp
+++ b/lib/base/convert.cpp
@@ -27,3 +27,12 @@ bool Convert::ToBool(const String& val)
        return (ToLong(val) != 0);
 }
 
+String Convert::ToString(const String& val)
+{
+       return val;
+}
+
+String Convert::ToString(const Value& val)
+{
+       return val;
+}

diff --git a/lib/base/convert.h b/lib/base/convert.h
index 435a2fa388f0ffd7d513464b36be8f4caab6921c..559b952e8ea66d7b64997f0ed2bac3887a921427 100644 (file)
--- a/lib/base/convert.h
+++ b/lib/base/convert.h
@@ -55,6 +55,9 @@ public:
                return boost::lexical_cast<String>(val);
        }
 
+       static String ToString(const String& val);
+       static String ToString(const Value& val);
+
 private:
        Convert(void);
 };

diff --git a/test/base-convert.cpp b/test/base-convert.cpp
index 1a7d889be52dec69f247b07ad32ea2de918bbe17..cc27bd2b37fa8b692b6e2ff6d87a47513f81c916 100644 (file)
--- a/test/base-convert.cpp
+++ b/test/base-convert.cpp
@@ -31,6 +31,8 @@ BOOST_AUTO_TEST_CASE(tolong)
        BOOST_CHECK_THROW(Convert::ToLong(" 7"), boost::exception);
        BOOST_CHECK(Convert::ToLong("-7") == -7);
        BOOST_CHECK_THROW(Convert::ToLong("7a"), boost::exception);
+
+       BOOST_CHECK(Convert::ToLong(Value(-7)) == -7);
 }
 
 BOOST_AUTO_TEST_CASE(todouble)
@@ -38,6 +40,7 @@ BOOST_AUTO_TEST_CASE(todouble)
        BOOST_CHECK_THROW(Convert::ToDouble(" 7.3"), boost::exception);
        BOOST_CHECK(Convert::ToDouble("-7.3") == -7.3);
        BOOST_CHECK_THROW(Convert::ToDouble("7.3a"), boost::exception);
+       BOOST_CHECK(Convert::ToDouble(Value(-7.3)) == -7.3);
 }
 
 BOOST_AUTO_TEST_CASE(tostring)
@@ -45,6 +48,11 @@ BOOST_AUTO_TEST_CASE(tostring)
        BOOST_CHECK(Convert::ToString(7) == "7");
        BOOST_CHECK(Convert::ToString(7.5) == "7.5");
        BOOST_CHECK(Convert::ToString("hello") == "hello");
+
+       BOOST_CHECK(Convert::ToString(Value(7)) == "7");
+       BOOST_CHECK(Convert::ToString(Value(7.5)) == "7.5");
+       BOOST_CHECK(Convert::ToString(Value("hello")) == "hello");
+       BOOST_CHECK(Convert::ToString(Value("hello hello")) == "hello hello");
 }
 
 BOOST_AUTO_TEST_CASE(tobool)
@@ -53,6 +61,8 @@ BOOST_AUTO_TEST_CASE(tobool)
        BOOST_CHECK(Convert::ToBool("0") == false);
        BOOST_CHECK(Convert::ToBool("1") == true);
        BOOST_CHECK(Convert::ToBool("2") == true);
+       BOOST_CHECK(Convert::ToBool(Value(true)) == true);
+       BOOST_CHECK(Convert::ToBool(Value(false)) == false);
 }
 
 BOOST_AUTO_TEST_SUITE_END()