altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

fix: don't migrate dumpinfo. automate migrations and setting USE_TZ. (#4389)

Browse source 
* fix: don't migrate dumpinfo - it's already in UTC.

* chore: leave mode bits alone

* fix: migrate the container db, automating setting USE_TZ.
This commit is contained in:
Robert Sparks 2022-08-31 10:38:48 -05:00 committed by GitHub
parent c2c17cfeb1
commit f7f0ca99d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docker/scripts/app-init.sh
View file

@ -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!"

3
ietf/utils/migrations/0002_convert_timestamps_to_utc.py
View file

@ -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