diff --git a/pgscript/expressions/pgsExecute.cpp b/pgscript/expressions/pgsExecute.cpp index d6ac015..14c9c8c 100644 --- a/pgscript/expressions/pgsExecute.cpp +++ b/pgscript/expressions/pgsExecute.cpp @@ -60,7 +60,7 @@ pgsOperand pgsExecute::eval(pgsVarMap &vars) const wxString stmt(m_query); // Build regular expressions - wxRegEx identifier(wxT("([^\\])(@[a-zA-Z0-9_#@]+)")); + wxRegEx identifier(wxT("([^\\\\])(@[a-zA-Z0-9_#@]+)")); wxRegEx escaped(wxT("\\\\(@|\\\\)")); // Backslash followed by @ or backslash wxASSERT(identifier.IsValid() && escaped.IsValid()); diff --git a/pgscript/objects/pgsString.cpp b/pgscript/objects/pgsString.cpp index a6cde77..1d7d438 100644 --- a/pgscript/objects/pgsString.cpp +++ b/pgscript/objects/pgsString.cpp @@ -193,7 +193,7 @@ pgsRecord pgsString::record() const // Try to find the representation of a record in the string { - wxString element(wxT("(\"([^\"\\\\]|\\\\.)*\")|((-|[a-zA-Z0-9\\+\\.])+)")); + wxString element(wxT("(\"([^\"\\\\\\\\]|\\\\.)*\")|((-|[a-zA-Z0-9\\+\\.])+)")); wxString data(m_data); wxRegEx regex1(wxString() << wxT("^[[:space:]]*\\([[:space:]]*(") << element << wxT(")[[:space:]]*([,][[:space:]]*(")