vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: only remove \n\t from start and end

Browse source 
(cherry picked from commit 7bb172365f2c9ae6cca98ccc4dfee7714b9c3f0c)

# Conflicts:
#	frappe/database/database.py
This commit is contained in:
Shariq Ansari 2022-03-17 15:06:20 +05:30 • committed by mergify-bot
parent b2c0bf7a4e
commit fbac6fbfb4
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/database/database.py
View file

@ -121,9 +121,14 @@ class Database(object):
return query
=======
<<<<<<< HEAD
# remove \n \t from start of query and replace them with space anywhere in middle
query = re.sub(r'\s', ' ', query).lstrip()
>>>>>>> ac5effc7dd (fix: remove tab \t and newlines \n from start of query and remove from middle)
=======
# remove \n \t from start and end of query
query = re.sub(r'^\s*|\s*$', '', query)
>>>>>>> 7bb172365f (fix: only remove \n\t from start and end)
if re.search(r'ifnull\(', query, flags=re.IGNORECASE):
# replaces ifnull in query with coalesce