launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/psycopg2-2.4.4 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #973159 in Launchpad itself: "Uses SERIALIZABLE isolation on PostgreSQL 9.1"
  https://bugs.launchpad.net/launchpad/+bug/973159

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/psycopg2-2.4.4/+merge/100912

We need to use REPEATABLE READ rather than SERIALIZABLE isolation for most things on PostgreSQL 9.1. But psycopg2 2.2 maps REPEATABLE READ to SERIALIZABLE, so we need to upgrade to at least 2.4.2. This branch takes us to 2.4.4.

But that exposes bug #959699 in Storm, so we need to upgrade Storm as well.
-- 
https://code.launchpad.net/~wgrant/launchpad/psycopg2-2.4.4/+merge/100912
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/psycopg2-2.4.4 into lp:launchpad.

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2012-04-03 16:06:43 +0000
+++ lib/lp/code/model/branch.py	2012-04-05 06:25:27 +0000
@@ -895,7 +895,7 @@
             (a and unicode(a) or None, b and unicode(b) or None)
                 for a, b in revision_id_sequence_pairs]
         store.execute(Insert(('revision_id', 'sequence'),
-            table=['RevidSequence'], expr=unicode_revid_sequence_pairs))
+            table=['RevidSequence'], values=unicode_revid_sequence_pairs))
         store.execute(
             """
             INSERT INTO BranchRevision (branch, revision, sequence)

=== modified file 'lib/lp/services/database/bulk.py'
--- lib/lp/services/database/bulk.py	2012-02-28 04:24:19 +0000
+++ lib/lp/services/database/bulk.py	2012-04-05 06:25:27 +0000
@@ -234,12 +234,12 @@
     if get_objects or get_primary_keys:
         result = IStore(cls).execute(
             Returning(Insert(
-                db_cols, expr=db_values, primary_columns=primary_key)))
+                db_cols, values=db_values, primary_columns=primary_key)))
         keys = map(itemgetter(0), result) if len(primary_key) == 1 else result
         if get_objects:
             return load(cls, keys)
         else:
             return list(keys)
     else:
-        IStore(cls).execute(Insert(db_cols, expr=db_values))
+        IStore(cls).execute(Insert(db_cols, values=db_values))
         return None

=== modified file 'versions.cfg'
--- versions.cfg	2012-04-03 22:08:39 +0000
+++ versions.cfg	2012-04-05 06:25:27 +0000
@@ -71,7 +71,7 @@
 PasteDeploy = 1.3.3
 pgbouncer = 0.0.7
 plone.recipe.command = 1.1
-psycopg2 = 2.2.2
+psycopg2 = 2.4.4
 pyasn1 = 0.0.9a
 pycrypto = 2.0.1
 pydkim = 0.3-mbp-r7
@@ -105,7 +105,7 @@
 soupmatchers = 0.1r53
 sourcecodegen = 0.6.9
 # lp:~launchpad-committers/storm/with-without-datetime
-storm = 0.19.0.99-lpwithnodatetime-r404
+storm = 0.19.0.99-lpwithnodatetime-r406
 testresources = 0.2.4-r58
 testtools = 0.9.14
 timeline = 0.0.3