Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: iexact lookup with Transform expression crash issue when RHS is direct value and a transform function is involved #628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
May 20, 2021
Merged

fix: iexact lookup with Transform expression crash issue when RHS is direct value and a transform function is involved #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
924f1ee
Merge pull request #1 from googleapis/master
vi3k6i5 Apr 6, 2021
df919be
fix: lint_setup_py was failing in Kokoro is not fixed
vi3k6i5 Apr 6, 2021
ad5f15c
Merge pull request #2 from googleapis/master
vi3k6i5 Apr 7, 2021
5ec9841
Merge pull request #3 from googleapis/master
vi3k6i5 Apr 25, 2021
34c4dda
Merge pull request #4 from googleapis/master
vi3k6i5 Apr 27, 2021
caf5a43
Merge pull request #5 from googleapis/master
vi3k6i5 Apr 28, 2021
129e41e
Merge pull request #6 from googleapis/master
vi3k6i5 Apr 28, 2021
a1707fb
Merge branch 'googleapis:master' into master
vi3k6i5 May 7, 2021
ad8e43e
Merge branch 'googleapis:master' into master
vi3k6i5 May 10, 2021
f2f803a
Merge branch 'googleapis:master' into master
vi3k6i5 May 12, 2021
dfad1f6
Merge branch 'master' of github.com:googleapis/python-spanner-django
vi3k6i5 May 20, 2021
0ddda20
fix: iexact lookup with Transform expression chash issue #612
vi3k6i5 May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion django_spanner/lookups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ def iexact(self, compiler, connection):
# lhs_sql is the expression/column to use as the regular expression.
# Use concat to make the value case-insensitive.
lhs_sql = "CONCAT('^(?i)', " + lhs_sql + ", '$')"
rhs_sql = rhs_sql.replace("%%s", "%s")
if not self.rhs_is_direct_value() and not params:
# If rhs is not a direct value and parameter is not present we want
# to have only 1 formatable argument in rhs_sql else we need 2.
rhs_sql = rhs_sql.replace("%%s", "%s")
# rhs_sql is REGEXP_CONTAINS(%s, %%s), and lhs_sql is the column name.
return rhs_sql % lhs_sql, params

Expand Down
14 changes: 14 additions & 0 deletions tests/unit/django_spanner/test_lookups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,3 +283,17 @@ def test_iexact_sql_query_case_insensitive_function_transform(self):
+ "CONCAT('^(?i)', CAST(UPPER(tests_author.name) AS STRING), '$'))",
)
self.assertEqual(params, ())

def test_iexact_sql_query_case_insensitive_value_match(self):

qs1 = Author.objects.filter(name__upper__iexact="abc").values("name")
compiler = SQLCompiler(qs1.query, self.connection, "default")
sql_compiled, params = compiler.as_sql()

self.assertEqual(
sql_compiled,
"SELECT tests_author.name FROM tests_author WHERE "
+ "REGEXP_CONTAINS((UPPER(CONCAT('^(?i)', "
+ "CAST(UPPER(tests_author.name) AS STRING), '$'))), %s)",
)
self.assertEqual(params, ("abc",))