From f7f0ca99d33993e56cd2b31a8850b9db74f769ed Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Wed, 31 Aug 2022 10:38:48 -0500 Subject: [PATCH] fix: don't migrate dumpinfo. automate migrations and setting USE_TZ. (#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. --- docker/scripts/app-init.sh | 3 ++- ietf/utils/migrations/0002_convert_timestamps_to_utc.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/scripts/app-init.sh b/docker/scripts/app-init.sh index bd3d51a98..5d07ecfc2 100755 --- a/docker/scripts/app-init.sh +++ b/docker/scripts/app-init.sh @@ -100,7 +100,8 @@ echo "Starting memcached..." echo "Running initial checks..." /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check --settings=settings_local -# /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py migrate --settings=settings_local + +/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) echo "-----------------------------------------------------------------" echo "Done!" diff --git a/ietf/utils/migrations/0002_convert_timestamps_to_utc.py b/ietf/utils/migrations/0002_convert_timestamps_to_utc.py index 3b25bcfa0..512a4aa7d 100644 --- a/ietf/utils/migrations/0002_convert_timestamps_to_utc.py +++ b/ietf/utils/migrations/0002_convert_timestamps_to_utc.py @@ -105,7 +105,6 @@ expected_datetime_columns = ( ('submit_submissioncheck', 'time'), ('submit_submissionevent', 'time'), ('tastypie_apikey', 'created'), - ('utils_dumpinfo', 'date'), ('utils_versioninfo', 'time'), ) @@ -142,6 +141,7 @@ def forward(apps, schema_editor): WHERE table_schema='ietf_utf8' AND column_type LIKE 'datetime%' AND NOT table_name LIKE 'django_celery_beat_%' + AND NOT table_name='utils_dumpinfo' ORDER BY table_name, column_name; """) assert cursor.fetchall() == expected_datetime_columns, 'unexpected or missing datetime columns in db' @@ -253,7 +253,6 @@ UPDATE submit_preapproval SET time = CONVERT_TZ(time, 'PST8PDT', 'UTC'); UPDATE submit_submissioncheck SET time = CONVERT_TZ(time, 'PST8PDT', 'UTC'); UPDATE submit_submissionevent SET time = CONVERT_TZ(time, 'PST8PDT', 'UTC'); UPDATE tastypie_apikey SET created = CONVERT_TZ(created, 'PST8PDT', 'UTC'); -UPDATE utils_dumpinfo SET date = CONVERT_TZ(date, 'PST8PDT', 'UTC'); UPDATE utils_versioninfo SET time = CONVERT_TZ(time, 'PST8PDT', 'UTC'); UPDATE meeting_timeslot