Skip to content

Commit 7b95b05

Browse files
committed
intermediate commit, testing a bug fix, reinstating get_sql_create_template_values
1 parent faaa47a commit 7b95b05

File tree

1 file changed

+22
-4
lines changed

1 file changed

+22
-4
lines changed

django_celery_beat/models.py

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Database models."""
22
from __future__ import absolute_import, unicode_literals
3-
import logging
3+
44
from datetime import timedelta
55
import dateutil
66

@@ -49,9 +49,11 @@ def _is_mysql_backend(self, connection):
4949

5050
def _create_sql(self, model, schema_editor, using=''):
5151
sql_create_index = 'CREATE INDEX %(name)s ON %(table)s (%(columns)s(%(size)d))%(extra)s'
52-
sql_parameters = super(CeleryMySQLIndex, self).create_sql(model, schema_editor, using=using)
53-
logging.warning('creat index content - {c}'.format(c=sql_parameters))
54-
print(sql_parameters)
52+
sql_parameters = self.get_sql_create_template_values(
53+
model,
54+
schema_editor,
55+
using
56+
)
5557
sql_parameters['size'] = getattr(
5658
settings,
5759
'DJANGO_CELERY_BEAT_NAME_MAX_LENGTH',
@@ -66,6 +68,22 @@ def create_sql(self, model, schema_editor, using=''):
6668
else:
6769
return super(CeleryMySQLIndex, self).create_sql(model, schema_editor, using=using)
6870

71+
def get_sql_create_template_values(self, model, schema_editor, using):
72+
fields = [model._meta.get_field(field_name) for field_name, order in self.fields_orders]
73+
tablespace_sql = schema_editor._get_index_tablespace_sql(model, fields)
74+
quote_name = schema_editor.quote_name
75+
columns = [
76+
('%s %s' % (quote_name(field.column), order)).strip()
77+
for field, (field_name, order) in zip(fields, self.fields_orders)
78+
]
79+
return {
80+
'table': quote_name(model._meta.db_table),
81+
'name': quote_name(self.name),
82+
'columns': ', '.join(columns),
83+
'using': using,
84+
'extra': tablespace_sql,
85+
}
86+
6987

7088
@python_2_unicode_compatible
7189
class SolarSchedule(models.Model):

0 commit comments

Comments
 (0)