fix: iexact lookup with Transform expression crash issue when RHS is … · googleapis/python-spanner-django@2772b57 · GitHub

This repository was archived by the owner on Jun 8, 2026. It is now read-only.

googleapis / python-spanner-django Public archive

• Notifications You must be signed in to change notification settings
• Fork 32
• Star 94

• Code
• Issues
• Pull requests 1
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 2772b57

Browse filesBrowse the repository at this point in the historyBrowse files

vi3k6i5

authored

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

* fix: lint_setup_py was failing in Kokoro is not fixed * fix: iexact lookup with Transform expression chash issue #612

1 parent 3a8d922 commit 2772b57
Copy full SHA for 2772b57

2 files changed

+18-1Lines changed: 18 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• django_spanner
  • lookups.py
• tests/unit/django_spanner
  • test_lookups.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎django_spanner/lookups.py‎

Copy file name to clipboardExpand all lines: django_spanner/lookups.py

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -100,7 +100,10 @@ def iexact(self, compiler, connection):
100	100	# lhs_sql is the expression/column to use as the regular expression.
101	101	# Use concat to make the value case-insensitive.
102	102	lhs_sql = "CONCAT('^(?i)', " + lhs_sql + ", '$')"
103		- rhs_sql = rhs_sql.replace("%%s", "%s")
	103	+ if not self.rhs_is_direct_value() and not params:
	104	+ # If rhs is not a direct value and parameter is not present we want
	105	+ # to have only 1 formatable argument in rhs_sql else we need 2.
	106	+ rhs_sql = rhs_sql.replace("%%s", "%s")
104	107	# rhs_sql is REGEXP_CONTAINS(%s, %%s), and lhs_sql is the column name.
105	108	return rhs_sql % lhs_sql, params
106	109

Collapse file

‎tests/unit/django_spanner/test_lookups.py‎

Copy file name to clipboardExpand all lines: tests/unit/django_spanner/test_lookups.py

+14Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -283,3 +283,17 @@ def test_iexact_sql_query_case_insensitive_function_transform(self):
283	283	+ "CONCAT('^(?i)', CAST(UPPER(tests_author.name) AS STRING), '$'))",
284	284	)
285	285	self.assertEqual(params, ())
	286	+
	287	+ def test_iexact_sql_query_case_insensitive_value_match(self):
	288	+
	289	+ qs1 = Author.objects.filter(name__upper__iexact="abc").values("name")
	290	+ compiler = SQLCompiler(qs1.query, self.connection, "default")
	291	+ sql_compiled, params = compiler.as_sql()
	292	+
	293	+ self.assertEqual(
	294	+ sql_compiled,
	295	+ "SELECT tests_author.name FROM tests_author WHERE "
	296	+ + "REGEXP_CONTAINS((UPPER(CONCAT('^(?i)', "
	297	+ + "CAST(UPPER(tests_author.name) AS STRING), '$'))), %s)",
	298	+ )
	299	+ self.assertEqual(params, ("abc",))

0 commit comments

Comments

0 (0)