Merge lp:~jtv/launchpad/bug-682933 into lp:launchpad/db-devel

Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 10023
Proposed branch: lp:~jtv/launchpad/bug-682933
Merge into: lp:launchpad/db-devel
Diff against target: 14 lines (+2/-2)
1 file modified
lib/lp/translations/scripts/migrate_current_flag.py (+2/-2)
To merge this branch: bzr merge lp:~jtv/launchpad/bug-682933
Reviewer Review Type Date Requested Status
Henning Eggers (community) code Approve
Review via email: mp+42217@code.launchpad.net

Commit message

[r=henninge][ui=none][bug=682933] Work around Storm bug.

Description of the change

= Bug 682933 =

This fixes a problem with the migration to the "Recife" data model. It works around Storm bug 682989, where the Reference class gets compiled to SQL that does not take ClassAliases into account. This resulted in a seemingly correct query that nevertheless didn't do quite what we meant it to.

Kudos to Thomas Hervé, who came up with the simple workaround on very short notice.

{{{
./bin/test -vvc lp.translations -t migrate.current.flag
}}}

Jeroen

To post a comment you must log in.
Revision history for this message
Henning Eggers (henninge) wrote :

If you say so ... ;-) Thanks for figuring this out!

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/translations/scripts/migrate_current_flag.py'
2--- lib/lp/translations/scripts/migrate_current_flag.py 2010-11-26 23:28:27 +0000
3+++ lib/lp/translations/scripts/migrate_current_flag.py 2010-11-30 09:06:44 +0000
4@@ -71,8 +71,8 @@
5 PreviousImported.is_current_upstream == True,
6 (PreviousImported.potmsgsetID ==
7 CurrentTranslation.potmsgsetID),
8- Or(And(PreviousImported.potemplate == None,
9- CurrentTranslation.potemplate == None),
10+ Or(And(PreviousImported.potemplateID == None,
11+ CurrentTranslation.potemplateID == None),
12 (PreviousImported.potemplateID ==
13 CurrentTranslation.potemplateID)),
14 PreviousImported.languageID == CurrentTranslation.languageID,

Subscribers

People subscribed via source and target branches

to status/vote changes: