Selaa lähdekoodia

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

(cherry picked from commit 7bb172365f)

# Conflicts:
#	frappe/database/database.py
version-14
Shariq Ansari 3 vuotta sitten
committed by mergify-bot
vanhempi
commit
fbac6fbfb4
1 muutettua tiedostoa jossa 5 lisäystä ja 0 poistoa
  1. +5
    -0
      frappe/database/database.py

+ 5
- 0
frappe/database/database.py Näytä tiedosto

@@ -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


Ladataan…
Peruuta
Tallenna