Remove unused timestamp function in DB IDO

refs #6584

diff --git a/lib/db_ido/dbvalue.cpp b/lib/db_ido/dbvalue.cpp
index a626e59fedf53cc388e200d884c1a0b366752f7a..9f1f22bc9a5e1b800af102081d63ff2fce66467a 100644 (file)
--- a/lib/db_ido/dbvalue.cpp
+++ b/lib/db_ido/dbvalue.cpp
@@ -33,11 +33,6 @@ Value DbValue::FromTimestamp(const Value& ts)
        return new DbValue(DbValueTimestamp, ts);
 }
 
-Value DbValue::FromTimestampNow()
-{
-       return new DbValue(DbValueTimestampNow, Empty);
-}
-
 Value DbValue::FromValue(const Value& value)
 {
        return value;
@@ -57,15 +52,6 @@ bool DbValue::IsTimestamp(const Value& value)
        return dbv->GetType() == DbValueTimestamp;
 }
 
-bool DbValue::IsTimestampNow(const Value& value)
-{
-       if (!value.IsObjectType<DbValue>())
-               return false;
-
-       DbValue::Ptr dbv = value;
-       return dbv->GetType() == DbValueTimestampNow;
-}
-
 bool DbValue::IsObjectInsertID(const Value& value)
 {
        if (!value.IsObjectType<DbValue>())

diff --git a/lib/db_ido/dbvalue.hpp b/lib/db_ido/dbvalue.hpp
index fcb9854097755493d3c96e3479d91fa79c0d1bd4..146189ca0e84a62346699ddbb226797118c5720a 100644 (file)
--- a/lib/db_ido/dbvalue.hpp
+++ b/lib/db_ido/dbvalue.hpp
@@ -30,7 +30,6 @@ namespace icinga
 enum DbValueType
 {
        DbValueTimestamp,
-       DbValueTimestampNow,
        DbValueObjectInsertID
 };
 
@@ -47,12 +46,10 @@ public:
        DbValue(DbValueType type, Value value);
 
        static Value FromTimestamp(const Value& ts);
-       static Value FromTimestampNow();
        static Value FromValue(const Value& value);
        static Value FromObjectInsertID(const Value& value);
 
        static bool IsTimestamp(const Value& value);
-       static bool IsTimestampNow(const Value& value);
        static bool IsObjectInsertID(const Value& value);
 
        static Value ExtractValue(const Value& value);

diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index 051206231626ac146b2094ad67eaeb745b65c096..24f6ce66dc088f49f0dbfcc12e9e8dafe4e30d72 100644 (file)
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -831,8 +831,6 @@ bool IdoMysqlConnection::FieldToEscapedString(const String& key, const Value& va
                std::ostringstream msgbuf;
                msgbuf << "FROM_UNIXTIME(" << ts << ")";
                *result = Value(msgbuf.str());
-       } else if (DbValue::IsTimestampNow(value)) {
-               *result = "NOW()";
        } else if (DbValue::IsObjectInsertID(value)) {
                auto id = static_cast<long>(rawvalue);
 

diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
index 9771d4027fbf3577fd81e52fabaa9c3e95a852a5..d895710e8eb03ffaf8cfbc2de16222907f9036c9 100644 (file)
--- a/lib/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -675,8 +675,6 @@ bool IdoPgsqlConnection::FieldToEscapedString(const String& key, const Value& va
                std::ostringstream msgbuf;
                msgbuf << "TO_TIMESTAMP(" << ts << ") AT TIME ZONE 'UTC'";
                *result = Value(msgbuf.str());
-       } else if (DbValue::IsTimestampNow(value)) {
-               *result = "NOW()";
        } else if (DbValue::IsObjectInsertID(value)) {
                auto id = static_cast<long>(rawvalue);