bugs in recent commit

[Shane Caraveo]

several upgrade issues in the current code, patch to be attached.

[Michael Renzmann]

Thanks for the report, seems I messed things up a little. I will commit your patch in a minute, minus one thing:

In hunk 1 of your patch, you add current_version == self._get_version(db) again. That's not necessary, since it's already there (see ​line 38).

The rest of the patch is fine, and I wonder why I didn't hit any of these things in my testing.

[Michael Renzmann]

(In [4951]) TracPastePlugin: Fix bugs/shortcomings introduced in r4949, as reported by mixedpuppy in #4211.

• Wrap code to set/update tracpaste_version with a try/except, to catch exceptions. The changes made to that field are now also committed (doh!).
• Add missing import of DatabaseManager class in _to_sql helper.
• Use env directly where available, rather than referencing it via self.

Thanks a lot for the patch, mixedpuppy. Closes #4211.

[Shane Caraveo]

Replying to otaku42:

In hunk 1 of your patch, you add current_version == self._get_version(db) again. That's not necessary, since it's already there (see ​line 38).

That is necessary because in the loop above you might INSERT into the system table in one case. If the version is not retrieved again, you end up trying to INSERT into the system table again (rather than UPDATE), and that fails. This actually happened to me.

[Shane Caraveo]

Note, you also need to change the get call in the loop:

for function in version_map.get(version, []):

[Michael Renzmann]

Replying to mixedpuppy:

That is necessary because in the loop above you might INSERT into the system table in one case.

You're right, it's required if the schema is updated from v1 to v2. Didn't notice that in the first place.

Replying to mixedpuppy:

Note, you also need to change the get call in the loop:

for function in version_map.get(version, []):

I see... so that get() returns [] if version is not in version_map. What puzzles me is the fact that at least Python 2.5 did not complain before (just checked that again).

[Michael Renzmann]

(In [4952]) TracPastePlugin: Fix remaining r4949 issues as reported by mixedpuppy in #4211. Thanks again, mixedpuppy. Closes #4211.