Merge lp://staging/~jaypipes/glance/bug726685 into lp://staging/~glance-coresec/glance/cactus-trunk
Proposed by
Jay Pipes
| Status: | Merged |
|---|---|
| Approved by: | Rick Harris |
| Approved revision: | 99 |
| Merged at revision: | 107 |
| Proposed branch: | lp://staging/~jaypipes/glance/bug726685 |
| Merge into: | lp://staging/~glance-coresec/glance/cactus-trunk |
| Diff against target: |
319 lines (+218/-13) 9 files modified
glance/registry/db/api.py (+5/-5) glance/registry/db/migrate_repo/versions/006_key_to_name.py (+93/-0) glance/registry/db/migrate_repo/versions/006_mysql_downgrade.sql (+11/-0) glance/registry/db/migrate_repo/versions/006_mysql_upgrade.sql (+11/-0) glance/registry/db/migrate_repo/versions/006_sqlite_downgrade.sql (+46/-0) glance/registry/db/migrate_repo/versions/006_sqlite_upgrade.sql (+46/-0) glance/registry/db/models.py (+2/-4) glance/registry/server.py (+1/-1) tests/stubs.py (+3/-3) |
| To merge this branch: | bzr merge lp://staging/~jaypipes/glance/bug726685 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Rick Harris (community) | Approve | ||
| Glance Core security contacts | Pending | ||
|
Review via email:
|
|||
Commit message
Changes "key" column in image_properties to "name".
Description of the change
Changes "key" column in image_properties to "name".
As with all things migration, this was a pain in the ass.
MySQL doesn't support RENAME INDEX, so a custom SQL migration
file for it was needed.
Likewise, SQLite doesn't support either RENAME INDEX or
ALTER TABLE CHANGE COLUMN, so it also needed a custom migration
script.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Impressive work with the migrations to make this work out. Really nice job.