mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.8.x] Fixed #24183 -- Fixed wrong comparisons in Substr

Browse Source 
Backport of 61c102d010 from master
This commit is contained in:
Josh Smeaton
2015-01-20 11:47:13 +11:00
parent e69eea73d9
commit 504cd5d3be
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/functions.py
View File

@@ -110,13 +110,13 @@ class Substr(Func):
pos: an integer > 0, or an expression returning an integer
length: an optional number of characters to return
"""
if not hasattr('pos', 'resolve_expression'):
if not hasattr(pos, 'resolve_expression'):
if pos < 1:
raise ValueError("'pos' must be greater than 0")
pos = Value(pos)
expressions = [expression, pos]
if length is not None:
if not hasattr('length', 'resolve_expression'):
if not hasattr(length, 'resolve_expression'):
length = Value(length)
expressions.append(length)
super(Substr, self).__init__(*expressions, **extra)