Merge branch '2.3' into 2.4

2020-08-19 16:37:52 +03:00
parent f3d4c27e58 bf6ff8a578
commit 02b0a4c52c
1 changed files with 10 additions and 7 deletions
--- a/query_classifier/qc_sqlite/qc_sqlite.cc
+++ b/query_classifier/qc_sqlite/qc_sqlite.cc
@ -1422,6 +1422,8 @@ public:

    void update_names_from_srclist(QcAliases* pAliases,
                                   const SrcList* pSrc)
+    {
+        if (pSrc) // TODO: Figure out in what contexts pSrc can be NULL.
        {
            for (int i = 0; i < pSrc->nSrc; ++i)
            {
@ -1436,6 +1438,7 @@ public:
                }
            }
        }
+    }

    static void update_function_fields(const QcAliases* pAliases,
                                       const char* zDatabase,