mirror of
https://github.com/sqlalchemy/sqlalchemy.git
synced 2026-05-17 14:17:29 -04:00
91f376692d
Several weeks of using the future_select() construct has led to the proposal there be just one select() construct again which features the new join() method, and otherwise accepts both the 1.x and 2.x argument styles. This would make migration simpler and reduce confusion. However, confusion may be increased by the fact that select().join() is different Current thinking is we may be better off with a few hard behavioral changes to old and relatively unknown APIs rather than trying to play both sides within two extremely similar but subtly different APIs. At the moment, the .join() thing seems to be the only behavioral change that occurs without the user taking any explicit steps. Session.execute() will still behave the old way as we are adding a future flag. This change also adds the "future" flag to Session() and session.execute(), so that interpretation of the incoming statement, as well as that the new style result is returned, does not occur for existing applications unless they add the use of this flag. The change in general is moving the "removed in 2.0" system further along where we want the test suite to fully pass even if the SQLALCHEMY_WARN_20 flag is set. Get many tests to pass when SQLALCHEMY_WARN_20 is set; this should be ongoing after this patch merges. Improve the RemovedIn20 warning; these are all deprecated "since" 1.4, so ensure that's what the messages read. Make sure the inforamtion link is on all warnings. Add deprecation warnings for parameters present and add warnings to all FromClause.select() types of methods. Fixes: #5379 Fixes: #5284 Change-Id: I765a0b912b3dcd0e995426427d8bb7997cbffd51 References: #5159
186 lines
5.3 KiB
Python
186 lines
5.3 KiB
Python
from sqlalchemy import exc
|
|
from sqlalchemy import select
|
|
from sqlalchemy import testing
|
|
from sqlalchemy.engine import result_tuple
|
|
from sqlalchemy.orm import aliased
|
|
from sqlalchemy.orm import loading
|
|
from sqlalchemy.orm import mapper
|
|
from sqlalchemy.orm import relationship
|
|
from sqlalchemy.orm import Session
|
|
from sqlalchemy.testing import mock
|
|
from sqlalchemy.testing.assertions import assert_raises
|
|
from sqlalchemy.testing.assertions import assert_raises_message
|
|
from sqlalchemy.testing.assertions import eq_
|
|
from . import _fixtures
|
|
|
|
# class GetFromIdentityTest(_fixtures.FixtureTest):
|
|
# class LoadOnIdentTest(_fixtures.FixtureTest):
|
|
|
|
|
|
class InstanceProcessorTest(_fixtures.FixtureTest):
|
|
def test_state_no_load_path_comparison(self):
|
|
# test issue #5110
|
|
User, Order, Address = self.classes("User", "Order", "Address")
|
|
users, orders, addresses = self.tables("users", "orders", "addresses")
|
|
|
|
mapper(
|
|
User,
|
|
users,
|
|
properties={
|
|
"addresses": relationship(Address, lazy="joined"),
|
|
"orders": relationship(
|
|
Order, lazy="joined", order_by=orders.c.id
|
|
),
|
|
},
|
|
)
|
|
mapper(
|
|
Order,
|
|
orders,
|
|
properties={"address": relationship(Address, lazy="joined")},
|
|
)
|
|
mapper(Address, addresses)
|
|
|
|
s = Session()
|
|
|
|
def go():
|
|
eq_(
|
|
User(
|
|
id=7,
|
|
orders=[
|
|
Order(id=1, address=Address(id=1)),
|
|
Order(id=3, address=Address(id=1)),
|
|
Order(id=5, address=None),
|
|
],
|
|
),
|
|
s.query(User).populate_existing().get(7),
|
|
)
|
|
|
|
self.assert_sql_count(testing.db, go, 1)
|
|
|
|
|
|
class InstancesTest(_fixtures.FixtureTest):
|
|
run_setup_mappers = "once"
|
|
run_inserts = "once"
|
|
run_deletes = None
|
|
|
|
@classmethod
|
|
def setup_mappers(cls):
|
|
cls._setup_stock_mapping()
|
|
|
|
def test_cursor_close_w_failed_rowproc(self):
|
|
User = self.classes.User
|
|
s = Session()
|
|
|
|
q = s.query(User)
|
|
|
|
ctx = q._compile_context()
|
|
cursor = mock.Mock()
|
|
ctx.compile_state._entities = [
|
|
mock.Mock(row_processor=mock.Mock(side_effect=Exception("boom")))
|
|
]
|
|
assert_raises(Exception, loading.instances, cursor, ctx)
|
|
assert cursor.close.called, "Cursor wasn't closed"
|
|
|
|
def test_row_proc_not_created(self):
|
|
User = self.classes.User
|
|
s = Session()
|
|
|
|
q = s.query(User.id, User.name)
|
|
stmt = select(User.id)
|
|
|
|
assert_raises_message(
|
|
exc.NoSuchColumnError,
|
|
"Could not locate column in row for column 'users.name'",
|
|
q.from_statement(stmt).all,
|
|
)
|
|
|
|
|
|
class MergeResultTest(_fixtures.FixtureTest):
|
|
run_setup_mappers = "once"
|
|
run_inserts = "once"
|
|
run_deletes = None
|
|
|
|
@classmethod
|
|
def setup_mappers(cls):
|
|
cls._setup_stock_mapping()
|
|
|
|
def _fixture(self):
|
|
User = self.classes.User
|
|
|
|
s = Session()
|
|
u1, u2, u3, u4 = (
|
|
User(id=1, name="u1"),
|
|
User(id=2, name="u2"),
|
|
User(id=7, name="u3"),
|
|
User(id=8, name="u4"),
|
|
)
|
|
s.query(User).filter(User.id.in_([7, 8])).all()
|
|
s.close()
|
|
return s, [u1, u2, u3, u4]
|
|
|
|
def test_single_entity(self):
|
|
s, (u1, u2, u3, u4) = self._fixture()
|
|
User = self.classes.User
|
|
|
|
q = s.query(User)
|
|
collection = [u1, u2, u3, u4]
|
|
it = loading.merge_result(q, collection)
|
|
eq_([x.id for x in it], [1, 2, 7, 8])
|
|
|
|
def test_single_column(self):
|
|
User = self.classes.User
|
|
|
|
s = Session()
|
|
|
|
q = s.query(User.id)
|
|
collection = [(1,), (2,), (7,), (8,)]
|
|
it = loading.merge_result(q, collection)
|
|
eq_(list(it), [(1,), (2,), (7,), (8,)])
|
|
|
|
def test_entity_col_mix_plain_tuple(self):
|
|
s, (u1, u2, u3, u4) = self._fixture()
|
|
User = self.classes.User
|
|
|
|
q = s.query(User, User.id)
|
|
collection = [(u1, 1), (u2, 2), (u3, 7), (u4, 8)]
|
|
it = loading.merge_result(q, collection)
|
|
it = list(it)
|
|
eq_([(x.id, y) for x, y in it], [(1, 1), (2, 2), (7, 7), (8, 8)])
|
|
eq_(list(it[0]._mapping.keys()), ["User", "id"])
|
|
|
|
def test_entity_col_mix_keyed_tuple(self):
|
|
s, (u1, u2, u3, u4) = self._fixture()
|
|
User = self.classes.User
|
|
|
|
q = s.query(User, User.id)
|
|
|
|
row = result_tuple(["User", "id"])
|
|
|
|
def kt(*x):
|
|
return row(x)
|
|
|
|
collection = [kt(u1, 1), kt(u2, 2), kt(u3, 7), kt(u4, 8)]
|
|
it = loading.merge_result(q, collection)
|
|
it = list(it)
|
|
eq_([(x.id, y) for x, y in it], [(1, 1), (2, 2), (7, 7), (8, 8)])
|
|
eq_(list(it[0]._mapping.keys()), ["User", "id"])
|
|
|
|
def test_none_entity(self):
|
|
s, (u1, u2, u3, u4) = self._fixture()
|
|
User = self.classes.User
|
|
|
|
ua = aliased(User)
|
|
q = s.query(User, ua)
|
|
|
|
row = result_tuple(["User", "useralias"])
|
|
|
|
def kt(*x):
|
|
return row(x)
|
|
|
|
collection = [kt(u1, u2), kt(u1, None), kt(u2, u3)]
|
|
it = loading.merge_result(q, collection)
|
|
eq_(
|
|
[(x and x.id or None, y and y.id or None) for x, y in it],
|
|
[(u1.id, u2.id), (u1.id, None), (u2.id, u3.id)],
|
|
)
|