Hopiu/django-model-utils
1
0
Fork 0
mirror of https://github.com/Hopiu/django-model-utils.git synced 2026-03-16 20:00:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #618 from ProtixIT/joinqueryset-quoted

Browse source 
Remove `JoinQueryset.get_quoted_query()`
This commit is contained in:
Jelmer 2024-05-02 12:52:23 +02:00 committed by GitHub
commit f20c3945ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
model_utils/managers.py
View file

@ -293,21 +293,6 @@ class SoftDeletableManager(SoftDeletableManagerMixin, models.Manager):
class JoinQueryset(models.QuerySet):
def get_quoted_query(self, query):
query, params = query.sql_with_params()
# Put additional quotes around string.
params = [
f'\'{p}\''
if isinstance(p, str) else p
for p in params
]
# Cast list of parameters to tuple because I got
# "not enough format characters" otherwise.
params = tuple(params)
return query % params
def join(self, qs=None):
'''
Join one queryset together with another using a temporary table. If
@ -349,7 +334,7 @@ class JoinQueryset(models.QuerySet):
new_qs = self.model.objects.all()
TABLE_NAME = 'temp_stuff'
query = self.get_quoted_query(qs.query)
query, params = qs.query.sql_with_params()
sql = '''
DROP TABLE IF EXISTS {table_name};
DROP INDEX IF EXISTS {table_name}_id;
@ -358,7 +343,7 @@ class JoinQueryset(models.QuerySet):
'''.format(table_name=TABLE_NAME, fk_column=fk_column, query=str(query))
with connection.cursor() as cursor:
cursor.execute(sql)
cursor.execute(sql, params)
class TempModel(models.Model):
temp_key = models.ForeignKey(