github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-15 14:15:49 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

Fix changes in the PCRE (wxRegEx template)

Browse source 
Были проблемы при выполнении pgScript.
This commit is contained in:
lsv 2023-08-02 11:48:02 +05:00
parent d5388d72d7
commit 06c0c71bc3
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pgscript/expressions/pgsExecute.cpp
View file

@ -60,7 +60,7 @@ pgsOperand pgsExecute::eval(pgsVarMap &vars) const
wxString stmt(m_query); wxString stmt(m_query);
// Build regular expressions // 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 wxRegEx escaped(wxT("\\\\(@|\\\\)")); // Backslash followed by @ or backslash
wxASSERT(identifier.IsValid() && escaped.IsValid()); wxASSERT(identifier.IsValid() && escaped.IsValid());

2
pgscript/objects/pgsString.cpp
View file

@ -193,7 +193,7 @@ pgsRecord pgsString::record() const
// Try to find the representation of a record in the string // 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); wxString data(m_data);
wxRegEx regex1(wxString() << wxT("^[[:space:]]*\\([[:space:]]*(") wxRegEx regex1(wxString() << wxT("^[[:space:]]*\\([[:space:]]*(")
<< element << wxT(")[[:space:]]*([,][[:space:]]*(") << element << wxT(")[[:space:]]*([,][[:space:]]*(")