Update test and fix MYSQL plugin

Expensify · Jul 25, 2024 · a99813b · a99813b
1 parent 4123bec
commit a99813b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/plugins/MySQL.cpp b/plugins/MySQL.cpp
@@ -1,10 +1,10 @@
 #include "MySQL.h"
 
-#include <pcrecpp.h>
-
 #include <bedrockVersion.h>
 #include <libstuff/SQResult.h>
 
+#include <cstring>
+
 #undef SLOGPREFIX
 #define SLOGPREFIX "{" << getName() << "} "
 
@@ -269,9 +269,10 @@ void BedrockPlugin_MySQL::onPortRecv(STCPManager::Socket* s, SData& request) {
             SINFO("Processing query '" << query << "'");
 
             // See if it's asking for a global variable
-            string varName;
             string regExp = "^(?:(?:SELECT\\s+)?@@(?:\\w+\\.)?|SHOW VARIABLES LIKE ')(\\w+).*$";
-            if (pcrecpp::RE(regExp, pcrecpp::RE_Options().set_caseless(true)).FullMatch(query, &varName)) {
+            vector<string> matches;
+            if (SREMatch(regExp, query, false, false, &matches)) {
+                string varName = matches[0];
                 // Loop across and look for it
                 SQResult result;
                 result.headers.push_back(varName);

diff --git a/test/tests/LibStuffTest.cpp b/test/tests/LibStuffTest.cpp
@@ -661,6 +661,17 @@ struct LibStuff : tpunit::TestFixture {
 
         // Now try with partial specified, should work.
         ASSERT_TRUE(SREMatch("cat", "this contains cat", true, true));
+
+        // Test returning matches.
+        vector<string> matches;
+        SREMatch(R"((\w+) (\w+) (\w+))", "this contains cat", false, false, &matches);
+
+        // The whole string, and the three groups.
+        ASSERT_EQUAL(matches.size(), 4);
+        ASSERT_EQUAL(matches[0], "this contains cat");
+        ASSERT_EQUAL(matches[1], "this");
+        ASSERT_EQUAL(matches[2], "contains");
+        ASSERT_EQUAL(matches[3], "cat");
     }
 
     void SREReplaceTest() {