DB IDO: Ensure that queries are not executed if categories don't match

refs #12147
refs #12147

diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index 5efda95ab9a1c63fedd34e65b19263693d8fa1a7..c781d8f2819465eae7dafdb2d8c05a2485e70548 100644 (file)
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -894,17 +894,19 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, DbQueryType
                return;
        }
 
-       if (!CanExecuteQuery(query)) {
-               m_QueryQueue.Enqueue(boost::bind(&IdoMysqlConnection::InternalExecuteQuery, this, query, typeOverride), query.Priority);
-               return;
-       }
-
+       /* check whether we're allowed to execute the query first */
        if (GetCategoryFilter() != DbCatEverything && (query.Category & GetCategoryFilter()) == 0)
                return;
 
        if (query.Object && query.Object->GetObject()->GetExtension("agent_check").ToBool())
                return;
 
+       /* check if there are missing object/insert ids and re-enqueue the query */
+       if (!CanExecuteQuery(query)) {
+               m_QueryQueue.Enqueue(boost::bind(&IdoMysqlConnection::InternalExecuteQuery, this, query, typeOverride), query.Priority);
+               return;
+       }
+
        std::ostringstream qbuf, where;
        int type;
 

diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
index b3f2e75d5aac5d675cf5bb30aed72a27d49bc913..71a970934a38e5b4a6e15e22246052b878ca8a1b 100644 (file)
--- a/lib/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -751,17 +751,19 @@ void IdoPgsqlConnection::InternalExecuteQuery(const DbQuery& query, DbQueryType
                return;
        }
 
-       if (!CanExecuteQuery(query)) {
-               m_QueryQueue.Enqueue(boost::bind(&IdoPgsqlConnection::InternalExecuteQuery, this, query, typeOverride), query.Priority);
-               return;
-       }
-
+       /* check whether we're allowed to execute the query first */
        if (GetCategoryFilter() != DbCatEverything && (query.Category & GetCategoryFilter()) == 0)
                return;
 
        if (query.Object && query.Object->GetObject()->GetExtension("agent_check").ToBool())
                return;
 
+       /* check if there are missing object/insert ids and re-enqueue the query */
+       if (!CanExecuteQuery(query)) {
+               m_QueryQueue.Enqueue(boost::bind(&IdoPgsqlConnection::InternalExecuteQuery, this, query, typeOverride), query.Priority);
+               return;
+       }
+
        std::ostringstream qbuf, where;
        int type;