diff options
| author | Peter Powell <petpow@saberuk.com> | 2019-11-13 12:58:18 +0000 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2019-11-13 12:58:18 +0000 |
| commit | 43fb2f9972de22cafb93f2a8a67039176095f4c0 (patch) | |
| tree | 010ddba2a333fdd8dea2aea544b0e49c1490b24c /src/modules/extra | |
| parent | 78a72b90b0213f774d3a65de093c9b61f2abe210 (diff) | |
Add GetId() to the SQL::Provider class.
Diffstat (limited to 'src/modules/extra')
| -rw-r--r-- | src/modules/extra/m_mysql.cpp | 6 | ||||
| -rw-r--r-- | src/modules/extra/m_pgsql.cpp | 6 | ||||
| -rw-r--r-- | src/modules/extra/m_sqlite3.cpp | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index dcdbe0004..a79ef01ad 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -284,8 +284,10 @@ class SQLConnection : public SQL::Provider Mutex lock; // This constructor creates an SQLConnection object with the given credentials, but does not connect yet. - SQLConnection(Module* p, ConfigTag* tag) : SQL::Provider(p, "SQL/" + tag->getString("id")), - config(tag), connection(NULL) + SQLConnection(Module* p, ConfigTag* tag) + : SQL::Provider(p, tag->getString("id")) + , config(tag) + , connection(NULL) { } diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 37cf92704..b0f0b4597 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -176,7 +176,11 @@ class SQLConn : public SQL::Provider, public EventHandler QueueItem qinprog; /* If there is currently a query in progress */ SQLConn(Module* Creator, ConfigTag* tag) - : SQL::Provider(Creator, "SQL/" + tag->getString("id")), conf(tag), sql(NULL), status(CWRITE), qinprog(NULL, "") + : SQL::Provider(Creator, tag->getString("id")) + , conf(tag) + , sql(NULL) + , status(CWRITE) + , qinprog(NULL, "") { if (!DoConnect()) { diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 8efdf876f..405d4b783 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -112,7 +112,9 @@ class SQLConn : public SQL::Provider reference<ConfigTag> config; public: - SQLConn(Module* Parent, ConfigTag* tag) : SQL::Provider(Parent, "SQL/" + tag->getString("id")), config(tag) + SQLConn(Module* Parent, ConfigTag* tag) + : SQL::Provider(Parent, tag->getString("id")) + , config(tag) { std::string host = tag->getString("hostname"); if (sqlite3_open_v2(host.c_str(), &conn, SQLITE_OPEN_READWRITE, 0) != SQLITE_OK) |