lp://staging/~adam-collard/storm/sqlobject2-compatibility
- Get this branch:
- bzr branch lp://staging/~adam-collard/storm/sqlobject2-compatibility
Branch merges
- Adam Collard (community): Abstain
- Benji York (community): Approve
-
Diff: 38 lines (+12/-12)1 file modifiedtests/sqlobject.py (+12/-12)
Branch information
Recent revisions
- 478. By Björn Tillenius
-
Merge lp:~cjwatson/storm/psycopg-2.5 [r=adam-
collard, r=bjornt, a=cjwatson] Use ABCMeta for exception base class injection.
This lets us be compatible with psycopg2 >= 2.5, where Error and subclasses are implemented in a C extension so can't have their __bases__ attribute patched.
- 476. By Free Ekanayaka
-
Merge get-uri [r=ack]
Add a Database.get_uri() method for returning the URI the
database was created with. This is useful for code that
needs to look at connection details. - 473. By Björn Tillenius
-
Fix intermittent test_advance test failure [r=free]
The Zope tests weren't cleaning up their created modules properly, which
causes test_advance to fail if the Zope tests were run before. - 472. By Björn Tillenius
-
Merge union-different
-class- column [f=1445477] [r=ack] Allow doing union of two result sets for different columns in different
model classes as long as the columns are of the same type.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/storm