Skip to content

Commit f7f0ca9

Browse files
authored
fix: don't migrate dumpinfo. automate migrations and setting USE_TZ. (ietf-tools#4389)
* fix: don't migrate dumpinfo - it's already in UTC. * chore: leave mode bits alone * fix: migrate the container db, automating setting USE_TZ.
1 parent c2c17cf commit f7f0ca9

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

docker/scripts/app-init.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ echo "Starting memcached..."
100100

101101
echo "Running initial checks..."
102102
/usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check --settings=settings_local
103-
# /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py migrate --settings=settings_local
103+
104+
/usr/local/bin/python $WORKSPACEDIR/ietf/manage.py migrate --settings=settings_local || (echo "USE_TZ = True" >> $WORKSPACEDIR/ietf/settings_local.py; /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py migrate --settings=settings_local)
104105

105106
echo "-----------------------------------------------------------------"
106107
echo "Done!"

ietf/utils/migrations/0002_convert_timestamps_to_utc.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
('submit_submissioncheck', 'time'),
106106
('submit_submissionevent', 'time'),
107107
('tastypie_apikey', 'created'),
108-
('utils_dumpinfo', 'date'),
109108
('utils_versioninfo', 'time'),
110109
)
111110

@@ -142,6 +141,7 @@ def forward(apps, schema_editor):
142141
WHERE table_schema='ietf_utf8'
143142
AND column_type LIKE 'datetime%'
144143
AND NOT table_name LIKE 'django_celery_beat_%'
144+
AND NOT table_name='utils_dumpinfo'
145145
ORDER BY table_name, column_name;
146146
""")
147147
assert cursor.fetchall() == expected_datetime_columns, 'unexpected or missing datetime columns in db'
@@ -253,7 +253,6 @@ class Migration(migrations.Migration):
253253
UPDATE submit_submissioncheck SET time = CONVERT_TZ(time, 'PST8PDT', 'UTC');
254254
UPDATE submit_submissionevent SET time = CONVERT_TZ(time, 'PST8PDT', 'UTC');
255255
UPDATE tastypie_apikey SET created = CONVERT_TZ(created, 'PST8PDT', 'UTC');
256-
UPDATE utils_dumpinfo SET date = CONVERT_TZ(date, 'PST8PDT', 'UTC');
257256
UPDATE utils_versioninfo SET time = CONVERT_TZ(time, 'PST8PDT', 'UTC');
258257
259258
UPDATE meeting_timeslot

0 commit comments

Comments
 (0)