diff --git a/modules/database/query_builder.cpp b/modules/database/query_builder.cpp index 9aba8f8cb..b2f1c294a 100644 --- a/modules/database/query_builder.cpp +++ b/modules/database/query_builder.cpp @@ -109,9 +109,6 @@ QueryBuilder *QueryBuilder::val() { QueryBuilder *QueryBuilder::vals(const String ¶m) { return nval(escape(param)); } -QueryBuilder *QueryBuilder::vals(const char *param) { - return this; -} QueryBuilder *QueryBuilder::vali(const int param) { return this; } @@ -147,9 +144,6 @@ QueryBuilder *QueryBuilder::cset() { QueryBuilder *QueryBuilder::setps(const String &col, const String ¶m) { return nsetp(col, escape(param)); } -QueryBuilder *QueryBuilder::setps(const String &col, const char *param) { - return this; -} QueryBuilder *QueryBuilder::setpi(const String &col, const int param) { return this; } @@ -175,9 +169,6 @@ QueryBuilder *QueryBuilder::setphr(const String &col, const String &p_raw_id) { QueryBuilder *QueryBuilder::wps(const String &col, const String ¶m) { return nwp(col, escape(param)); } -QueryBuilder *QueryBuilder::wps(const String &col, const char *param) { - return this; -} QueryBuilder *QueryBuilder::wpi(const String &col, const int param) { return this; } diff --git a/modules/database/query_builder.h b/modules/database/query_builder.h index bf579bda8..64c388995 100644 --- a/modules/database/query_builder.h +++ b/modules/database/query_builder.h @@ -74,7 +74,6 @@ public: virtual QueryBuilder *values(const String ¶ms_str = ""); virtual QueryBuilder *val(); virtual QueryBuilder *vals(const String ¶m); - virtual QueryBuilder *vals(const char *param); virtual QueryBuilder *vali(const int param); virtual QueryBuilder *valb(const bool param); virtual QueryBuilder *valf(const float param); @@ -90,7 +89,6 @@ public: virtual QueryBuilder *cset(); virtual QueryBuilder *setps(const String &col, const String ¶m); - virtual QueryBuilder *setps(const String &col, const char *param); virtual QueryBuilder *setpi(const String &col, const int param); virtual QueryBuilder *setpb(const String &col, const bool param); virtual QueryBuilder *setpf(const String &col, const float param); @@ -101,7 +99,6 @@ public: // Where param helpers virtual QueryBuilder *wps(const String &col, const String ¶m); - virtual QueryBuilder *wps(const String &col, const char *param); virtual QueryBuilder *wpi(const String &col, const int param); virtual QueryBuilder *wpb(const String &col, const bool param); virtual QueryBuilder *wph(const String &col); diff --git a/modules/database_sqlite/sqlite3_query_builder.cpp b/modules/database_sqlite/sqlite3_query_builder.cpp index 64cd1dfb9..c52ea8bad 100644 --- a/modules/database_sqlite/sqlite3_query_builder.cpp +++ b/modules/database_sqlite/sqlite3_query_builder.cpp @@ -172,13 +172,6 @@ QueryBuilder *SQLite3QueryBuilder::vals(const String ¶m) { return this; } -QueryBuilder *SQLite3QueryBuilder::vals(const char *param) { - query_result += "'"; - query_result += escape(String(param)); - query_result += "', "; - - return this; -} QueryBuilder *SQLite3QueryBuilder::vali(const int param) { query_result += itos(param); @@ -260,10 +253,10 @@ QueryBuilder *SQLite3QueryBuilder::nsetp(const String &col, const String ¶m) return this; } -QueryBuilder *SQLite3QueryBuilder::setps(const String &col, const char *param) { +QueryBuilder *SQLite3QueryBuilder::setps(const String &col, const String ¶m) { query_result += col; query_result += "='"; - query_result += escape(String(param)); + query_result += escape(param); query_result += "', "; return this; @@ -336,10 +329,10 @@ QueryBuilder *SQLite3QueryBuilder::nwp(const String &col, const String ¶m) { return this; } -QueryBuilder *SQLite3QueryBuilder::wps(const String &col, const char *param) { +QueryBuilder *SQLite3QueryBuilder::wps(const String &col, const String ¶m) { query_result += col; query_result += "='"; - query_result += escape(String(param)); + query_result += escape(param); query_result += "' "; return this; diff --git a/modules/database_sqlite/sqlite3_query_builder.h b/modules/database_sqlite/sqlite3_query_builder.h index 2e35c7729..16f504694 100644 --- a/modules/database_sqlite/sqlite3_query_builder.h +++ b/modules/database_sqlite/sqlite3_query_builder.h @@ -39,7 +39,6 @@ public: QueryBuilder *nval(const String ¶m); QueryBuilder *vals(const String ¶m); - QueryBuilder *vals(const char *param); QueryBuilder *vali(const int param); QueryBuilder *valb(const bool param); QueryBuilder *valf(const float param); @@ -55,7 +54,7 @@ public: QueryBuilder *nsetp(const String &col, const String ¶m); - QueryBuilder *setps(const String &col, const char *param); + QueryBuilder *setps(const String &col, const String ¶m); QueryBuilder *setpi(const String &col, const int param); QueryBuilder *setpb(const String &col, const bool param); QueryBuilder *setpf(const String &col, const float param); @@ -66,7 +65,7 @@ public: QueryBuilder *nwp(const String &col, const String ¶m); - QueryBuilder *wps(const String &col, const char *param); + QueryBuilder *wps(const String &col, const String ¶m); QueryBuilder *wpi(const String &col, const int param); QueryBuilder *wpb(const String &col, const bool param); virtual QueryBuilder *wph(const String &col);