浏览代码

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

(cherry picked from commit 7bb172365f)

# Conflicts:
#	frappe/database/database.py
version-14
Shariq Ansari 3 年前
committed by mergify-bot
父节点
当前提交
fbac6fbfb4
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. +5
    -0
      frappe/database/database.py

+ 5
- 0
frappe/database/database.py 查看文件

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


正在加载...
取消
保存