Merge branch 'ticket_2587'

Conflicts:
	test/profiles.txt
	test/sql/test_selectable.py

diff --cc lib/sqlalchemy/engine/default.py
Simple merge

diff --cc lib/sqlalchemy/sql/compiler.py
Simple merge

diff --cc lib/sqlalchemy/sql/expression.py
Simple merge

diff --cc test/orm/test_eager_relations.py
Simple merge

diff --cc test/profiles.txt
index 62924b895f254add2b341a75fbeb5a7b1d35ab29,74c61a07ef2d8660eb60cb3f7ddf42140654d57f..4d89646390de8cf0a7b665efb799c9c1f69e1248
--- 1/test/profiles.txt
--- 2/test/profiles.txt
+++ b/test/profiles.txt
@@@ -1,15 -1,15 +1,15 @@@
 -# /Users/classic/dev/sqlalchemy/test/profiles.txt
 +# /mnt/hgfs/classic/dev/sqlalchemy/test/profiles.txt
  # This file is written out on a per-environment basis.
--# For each test in aaa_profiling, the corresponding function and 
++# For each test in aaa_profiling, the corresponding function and
  # environment is located within this file.  If it doesn't exist,
  # the test is skipped.
--# If a callcount does exist, it is compared to what we received. 
++# If a callcount does exist, it is compared to what we received.
  # assertions are raised if the counts do not match.
--# 
--# To add a new callcount test, apply the function_call_count 
--# decorator and re-run the tests using the --write-profiles 
++#
++# To add a new callcount test, apply the function_call_count
++# decorator and re-run the tests using the --write-profiles
  # option - this file will be rewritten including the new count.
--# 
++#
  
  # TEST: test.aaa_profiling.test_compiler.CompileTest.test_insert
  
@@@ -109,51 -97,40 +109,46 @@@ test.aaa_profiling.test_orm.LoadManyToO
  
  # TEST: test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity
  
- test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 2.6_sqlite_pysqlite_nocextensions 118319
+ test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 2.6_sqlite_pysqlite_nocextensions 154319
  test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 2.7_mysql_mysqldb_cextensions 124069
  test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 2.7_mysql_mysqldb_nocextensions 126819
 +test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 2.7_oracle_cx_oracle_nocextensions 128319
  test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 2.7_postgresql_psycopg2_cextensions 116569
  test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 2.7_postgresql_psycopg2_nocextensions 119319
- test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 2.7_sqlite_pysqlite_cextensions 115569
- test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 2.7_sqlite_pysqlite_nocextensions 118319
+ test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 2.7_sqlite_pysqlite_cextensions 151569
+ test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 2.7_sqlite_pysqlite_nocextensions 154319
  test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 3.2_postgresql_psycopg2_nocextensions 121790
  test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 3.2_sqlite_pysqlite_nocextensions 121822
 +test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 3.3_oracle_cx_oracle_nocextensions 130792
  test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 3.3_postgresql_psycopg2_nocextensions 121822
- test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_no_identity 3.3_sqlite_pysqlite_nocextensions 121822
  
  # TEST: test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks
  
- test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 2.6_sqlite_pysqlite_nocextensions 19534
+ test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 2.6_sqlite_pysqlite_nocextensions 21744
  test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 2.7_mysql_mysqldb_cextensions 19838
  test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 2.7_mysql_mysqldb_nocextensions 20098
 +test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 2.7_oracle_cx_oracle_nocextensions 20152
  test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 2.7_postgresql_psycopg2_cextensions 19237
  test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 2.7_postgresql_psycopg2_nocextensions 19467
- test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 2.7_sqlite_pysqlite_cextensions 19274
- test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 2.7_sqlite_pysqlite_nocextensions 19534
+ test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 2.7_sqlite_pysqlite_cextensions 21530
+ test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 2.7_sqlite_pysqlite_nocextensions 21790
  test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 3.2_postgresql_psycopg2_nocextensions 20424
- test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 3.2_sqlite_pysqlite_nocextensions 20447
 +test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 3.3_oracle_cx_oracle_nocextensions 21244
  test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 3.3_postgresql_psycopg2_nocextensions 20344
- test.aaa_profiling.test_orm.MergeBackrefsTest.test_merge_pending_with_all_pks 3.3_sqlite_pysqlite_nocextensions 20433
  
  # TEST: test.aaa_profiling.test_orm.MergeTest.test_merge_load
  
- test.aaa_profiling.test_orm.MergeTest.test_merge_load 2.6_sqlite_pysqlite_nocextensions 1221
+ test.aaa_profiling.test_orm.MergeTest.test_merge_load 2.6_sqlite_pysqlite_nocextensions 1521
  test.aaa_profiling.test_orm.MergeTest.test_merge_load 2.7_mysql_mysqldb_cextensions 1388
  test.aaa_profiling.test_orm.MergeTest.test_merge_load 2.7_mysql_mysqldb_nocextensions 1413
 +test.aaa_profiling.test_orm.MergeTest.test_merge_load 2.7_oracle_cx_oracle_nocextensions 1349
  test.aaa_profiling.test_orm.MergeTest.test_merge_load 2.7_postgresql_psycopg2_cextensions 1296
  test.aaa_profiling.test_orm.MergeTest.test_merge_load 2.7_postgresql_psycopg2_nocextensions 1321
- test.aaa_profiling.test_orm.MergeTest.test_merge_load 2.7_sqlite_pysqlite_cextensions 1196
- test.aaa_profiling.test_orm.MergeTest.test_merge_load 2.7_sqlite_pysqlite_nocextensions 1221
+ test.aaa_profiling.test_orm.MergeTest.test_merge_load 2.7_sqlite_pysqlite_cextensions 1496
+ test.aaa_profiling.test_orm.MergeTest.test_merge_load 2.7_sqlite_pysqlite_nocextensions 1521
  test.aaa_profiling.test_orm.MergeTest.test_merge_load 3.2_postgresql_psycopg2_nocextensions 1332
- test.aaa_profiling.test_orm.MergeTest.test_merge_load 3.2_sqlite_pysqlite_nocextensions 1243
 +test.aaa_profiling.test_orm.MergeTest.test_merge_load 3.3_oracle_cx_oracle_nocextensions 1366
  test.aaa_profiling.test_orm.MergeTest.test_merge_load 3.3_postgresql_psycopg2_nocextensions 1357
- test.aaa_profiling.test_orm.MergeTest.test_merge_load 3.3_sqlite_pysqlite_nocextensions 1243
  
  # TEST: test.aaa_profiling.test_orm.MergeTest.test_merge_no_load
  

diff --cc test/sql/test_selectable.py
index 0c5cde9fb83bfe5807388e1f94fab18be662cf46,2ef952c658e8cac16063b7e7a2d41ea64d3a43c0..2ac04dce3cc8e308e07e3079d2af5ae92ed6cfd2
--- 1/test/sql/test_selectable.py
--- 2/test/sql/test_selectable.py
+++ b/test/sql/test_selectable.py
@@@ -787,15 -788,11 +788,16 @@@ class JoinConditionTest(fixtures.TestBa
                      Column('id', Integer),
                      Column('t1id', ForeignKey('t1.id')),
                      Column('t2id', ForeignKey('t2.id')))
 -        t4 = Table('t4', m,
 -                    Column('id', Integer),
 +        t4 = Table('t4', m, Column('id', Integer),
                      Column('t2id', ForeignKey('t2.id')))
 +        t5 = Table('t5', m,
 +                    Column('t1id1', ForeignKey('t1.id')),
 +                    Column('t1id2', ForeignKey('t1.id')),
 +            )
++
          t1t2 = t1.join(t2)
          t2t3 = t2.join(t3)
 +
          for (left, right, a_subset, expected) in [
              (t1, t2, None, t1.c.id == t2.c.t1id),
              (t1t2, t3, t2, t1t2.c.t2_id == t3.c.t2id),