Skip to content

Commit

Permalink
reverse lookup: remove excess 's'
Browse files Browse the repository at this point in the history
  • Loading branch information
@powellnorma
powellnorma committed Dec 18, 2022
1 parent 9a5ba3e commit d6c6453
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions piccolo/columns/reverse_lookup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def get_select_string(self, engine_type: str, with_alias=True) -> str:
SELECT
"{table2_name}"."{column_name}"
FROM {reverse_select}
) AS "{reverse_lookup_name}s"
) AS "{reverse_lookup_name}"
"""
elif not self.serialisation_safe:
column_name = table2_pk
Expand All @@ -88,7 +88,7 @@ def get_select_string(self, engine_type: str, with_alias=True) -> str:
SELECT
"{table2_name}"."{column_name}"
FROM {reverse_select}
) AS "{reverse_lookup_name}s"
) AS "{reverse_lookup_name}"
"""
else:
if len(self.columns) > 0:
Expand All @@ -107,7 +107,7 @@ def get_select_string(self, engine_type: str, with_alias=True) -> str:
FROM (
SELECT {column_names} FROM {reverse_select}
) AS "{table2_name}s"
) AS "{reverse_lookup_name}s"
) AS "{reverse_lookup_name}"
"""
elif engine_type == "sqlite":
if len(self.columns) > 1 or not self.serialisation_safe:
Expand Down
32 changes: 16 additions & 16 deletions piccolo/query/methods/select.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,19 +455,19 @@ async def response_handler(self, response):
)
try:
for row in response:
data = row[f"{reverse_lookup_name}s"]
row[f"{reverse_lookup_name}s"] = (
data = row[f"{reverse_lookup_name}"]
row[f"{reverse_lookup_name}"] = (
[
value_type(i)
for i in row[f"{reverse_lookup_name}s"]
for i in row[f"{reverse_lookup_name}"]
]
if data
else []
)
except ValueError:
colored_warning(
"Unable to do type conversion for the "
f"{reverse_lookup_name}s relation"
f"{reverse_lookup_name} relation"
)

# If the user requested a single column, we just return that
Expand All @@ -482,7 +482,7 @@ async def response_handler(self, response):
response,
reverse_table,
reverse_table._meta.primary_key,
f"{reverse_lookup_name}s",
f"{reverse_lookup_name}",
reverse_lookup_select,
as_list=True,
)
Expand All @@ -495,11 +495,11 @@ async def response_handler(self, response):
0
]._meta.name
for row in response:
if row[f"{reverse_lookup_name}s"] is None:
row[f"{reverse_lookup_name}s"] = []
row[f"{reverse_lookup_name}s"] = [
if row[f"{reverse_lookup_name}"] is None:
row[f"{reverse_lookup_name}"] = []
row[f"{reverse_lookup_name}"] = [
{column_name: i}
for i in row[f"{reverse_lookup_name}s"]
for i in row[f"{reverse_lookup_name}"]
]
elif (
len(reverse_lookup_select.columns) == 0
Expand All @@ -510,7 +510,7 @@ async def response_handler(self, response):
set(
itertools.chain(
*[
row[f"{reverse_lookup_name}s"]
row[f"{reverse_lookup_name}"]
for row in response
]
)
Expand Down Expand Up @@ -546,16 +546,16 @@ async def response_handler(self, response):
for row in extra_rows
}
for row in response:
row[f"{reverse_lookup_name}s"] = [
row[f"{reverse_lookup_name}"] = [
extra_rows_map.get(i)
for i in row[f"{reverse_lookup_name}s"]
for i in row[f"{reverse_lookup_name}"]
]
else:
response = await self._splice_m2m_rows(
response,
reverse_table,
reverse_table._meta.primary_key,
f"{reverse_lookup_name}s",
f"{reverse_lookup_name}",
reverse_lookup_select,
as_list=False,
)
Expand All @@ -578,8 +578,8 @@ async def response_handler(self, response):
# are returned as a JSON string, so we need to deserialise
# it.
for row in response:
data = row[f"{reverse_lookup_name}s"]
row[f"{reverse_lookup_name}s"] = (
data = row[f"{reverse_lookup_name}"]
row[f"{reverse_lookup_name}"] = (
load_json(data) if data else []
)
else:
Expand All @@ -590,7 +590,7 @@ async def response_handler(self, response):
response,
reverse_table,
reverse_table._meta.primary_key,
f"{reverse_lookup_name}s",
f"{reverse_lookup_name}",
reverse_lookup_select,
as_list=False,
)
Expand Down

0 comments on commit d6c6453

Please sign in to comment.