tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-22 21:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6621 from Icinga/bugfix/ido-remove-unused-timestamp-function

Browse Source 
Remove unused timestamp function in DB IDO
This commit is contained in:
Michael Friedrich 2018-09-17 11:16:47 +02:00 committed by GitHub
commit 05f7e0dae8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/db_ido/dbvalue.cpp
View File

@ -33,11 +33,6 @@ Value DbValue::FromTimestamp(const Value& ts)
return new DbValue(DbValueTimestamp, ts); return new DbValue(DbValueTimestamp, ts);
} }
Value DbValue::FromTimestampNow()
{
return new DbValue(DbValueTimestampNow, Empty);
}
Value DbValue::FromValue(const Value& value) Value DbValue::FromValue(const Value& value)
{ {
return value; return value;
@ -57,15 +52,6 @@ bool DbValue::IsTimestamp(const Value& value)
return dbv->GetType() == DbValueTimestamp; 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) bool DbValue::IsObjectInsertID(const Value& value)
{ {
if (!value.IsObjectType<DbValue>()) if (!value.IsObjectType<DbValue>())

3
lib/db_ido/dbvalue.hpp
View File

@ -30,7 +30,6 @@ namespace icinga
enum DbValueType enum DbValueType
{ {
DbValueTimestamp, DbValueTimestamp,
DbValueTimestampNow,
DbValueObjectInsertID DbValueObjectInsertID
}; };
@ -47,12 +46,10 @@ public:
DbValue(DbValueType type, Value value); DbValue(DbValueType type, Value value);
static Value FromTimestamp(const Value& ts); static Value FromTimestamp(const Value& ts);
static Value FromTimestampNow();
static Value FromValue(const Value& value); static Value FromValue(const Value& value);
static Value FromObjectInsertID(const Value& value); static Value FromObjectInsertID(const Value& value);
static bool IsTimestamp(const Value& value); static bool IsTimestamp(const Value& value);
static bool IsTimestampNow(const Value& value);
static bool IsObjectInsertID(const Value& value); static bool IsObjectInsertID(const Value& value);
static Value ExtractValue(const Value& value); static Value ExtractValue(const Value& value);

2
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -831,8 +831,6 @@ bool IdoMysqlConnection::FieldToEscapedString(const String& key, const Value& va
std::ostringstream msgbuf; std::ostringstream msgbuf;
msgbuf << "FROM_UNIXTIME(" << ts << ")"; msgbuf << "FROM_UNIXTIME(" << ts << ")";
*result = Value(msgbuf.str()); *result = Value(msgbuf.str());
} else if (DbValue::IsTimestampNow(value)) {
*result = "NOW()";
} else if (DbValue::IsObjectInsertID(value)) { } else if (DbValue::IsObjectInsertID(value)) {
auto id = static_cast<long>(rawvalue); auto id = static_cast<long>(rawvalue);

2
lib/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -675,8 +675,6 @@ bool IdoPgsqlConnection::FieldToEscapedString(const String& key, const Value& va
std::ostringstream msgbuf; std::ostringstream msgbuf;
msgbuf << "TO_TIMESTAMP(" << ts << ") AT TIME ZONE 'UTC'"; msgbuf << "TO_TIMESTAMP(" << ts << ") AT TIME ZONE 'UTC'";
*result = Value(msgbuf.str()); *result = Value(msgbuf.str());
} else if (DbValue::IsTimestampNow(value)) {
*result = "NOW()";
} else if (DbValue::IsObjectInsertID(value)) { } else if (DbValue::IsObjectInsertID(value)) {
auto id = static_cast<long>(rawvalue); auto id = static_cast<long>(rawvalue);