Index: /sqlalchemy/branches/rel_0_5/doc/build/sqlexpression.rst
===================================================================
--- /sqlalchemy/branches/rel_0_5/doc/build/sqlexpression.rst (revision 6526)
+++ /sqlalchemy/branches/rel_0_5/doc/build/sqlexpression.rst (revision 6548)
@@ -500,9 +500,9 @@
{stop}[(u'Wendy Williams, wendy@aol.com',)]
-To gain a "hybrid" approach, any of SA's SQL constructs can have text freely intermingled wherever you like - the ``text()`` construct can be placed within any other ``ClauseElement`` construct, and when used in a non-operator context, a direct string may be placed which converts to ``text()`` automatically. Below we combine the usage of ``text()`` and strings with our constructed ``select()`` object, by using the ``select()`` object to structure the statement, and the ``text()``/strings to provide all the content within the structure. For this example, SQLAlchemy is not given any ``Column`` or ``Table`` objects in any of its expressions, so it cannot generate a FROM clause. So we also give it the ``from_obj`` keyword argument, which is a list of ``ClauseElements`` (or strings) to be placed within the FROM clause:
-
-.. sourcecode:: pycon+sql
-
- >>> s = select([text("users.fullname || ', ' || addresses.email_address AS title")],
+To gain a "hybrid" approach, the `select()` construct accepts strings for most of its arguments. Below we combine the usage of strings with our constructed ``select()`` object, by using the ``select()`` object to structure the statement, and strings to provide all the content within the structure. For this example, SQLAlchemy is not given any ``Column`` or ``Table`` objects in any of its expressions, so it cannot generate a FROM clause. So we also give it the ``from_obj`` keyword argument, which is a list of ``ClauseElements`` (or strings) to be placed within the FROM clause:
+
+.. sourcecode:: pycon+sql
+
+ >>> s = select(["users.fullname || ', ' || addresses.email_address AS title"],
... and_(
... "users.id = addresses.user_id",
@@ -523,5 +523,4 @@
Using Aliases
==============
-
The alias corresponds to a "renamed" version of a table or arbitrary relation, which occurs anytime you say "SELECT .. FROM sometable AS someothername". The ``AS`` creates a new name for the table. Aliases are super important in SQL as they allow you to reference the same table more than once. Scenarios where you need to do this include when you self-join a table to itself, or more commonly when you need to join from a parent table to a child table multiple times. For example, we know that our user ``jack`` has two email addresses. How can we locate jack based on the combination of those two addresses? We need to join twice to it. Let's construct two distinct aliases for the ``addresses`` table and join:
Index: /sqlalchemy/trunk/doc/build/sqlexpression.rst
===================================================================
--- /sqlalchemy/trunk/doc/build/sqlexpression.rst (revision 6527)
+++ /sqlalchemy/trunk/doc/build/sqlexpression.rst (revision 6547)
@@ -501,9 +501,9 @@
{stop}[(u'Wendy Williams, wendy@aol.com',)]
-To gain a "hybrid" approach, any of SA's SQL constructs can have text freely intermingled wherever you like - the ``text()`` construct can be placed within any other ``ClauseElement`` construct, and when used in a non-operator context, a direct string may be placed which converts to ``text()`` automatically. Below we combine the usage of ``text()`` and strings with our constructed ``select()`` object, by using the ``select()`` object to structure the statement, and the ``text()``/strings to provide all the content within the structure. For this example, SQLAlchemy is not given any ``Column`` or ``Table`` objects in any of its expressions, so it cannot generate a FROM clause. So we also give it the ``from_obj`` keyword argument, which is a list of ``ClauseElements`` (or strings) to be placed within the FROM clause:
-
-.. sourcecode:: pycon+sql
-
- >>> s = select([text("users.fullname || ', ' || addresses.email_address AS title")],
+To gain a "hybrid" approach, the `select()` construct accepts strings for most of its arguments. Below we combine the usage of strings with our constructed ``select()`` object, by using the ``select()`` object to structure the statement, and strings to provide all the content within the structure. For this example, SQLAlchemy is not given any ``Column`` or ``Table`` objects in any of its expressions, so it cannot generate a FROM clause. So we also give it the ``from_obj`` keyword argument, which is a list of ``ClauseElements`` (or strings) to be placed within the FROM clause:
+
+.. sourcecode:: pycon+sql
+
+ >>> s = select(["users.fullname || ', ' || addresses.email_address AS title"],
... and_(
... "users.id = addresses.user_id",
@@ -524,5 +524,4 @@
Using Aliases
==============
-
The alias corresponds to a "renamed" version of a table or arbitrary relation, which occurs anytime you say "SELECT .. FROM sometable AS someothername". The ``AS`` creates a new name for the table. Aliases are super important in SQL as they allow you to reference the same table more than once. Scenarios where you need to do this include when you self-join a table to itself, or more commonly when you need to join from a parent table to a child table multiple times. For example, we know that our user ``jack`` has two email addresses. How can we locate jack based on the combination of those two addresses? We need to join twice to it. Let's construct two distinct aliases for the ``addresses`` table and join:
Index: /sqlalchemy/trunk/test/ext/test_associationproxy.py
===================================================================
--- /sqlalchemy/trunk/test/ext/test_associationproxy.py (revision 6251)
+++ /sqlalchemy/trunk/test/ext/test_associationproxy.py (revision 6546)
@@ -7,4 +7,5 @@
from sqlalchemy.orm.collections import collection
from sqlalchemy.ext.associationproxy import *
+from sqlalchemy.ext.associationproxy import _AssociationList
from sqlalchemy.test import *
from sqlalchemy.test.util import gc_collect
@@ -616,4 +617,54 @@
pass
+class ProxyFactoryTest(ListTest):
+ def setup(self):
+ metadata = MetaData(testing.db)
+
+ parents_table = Table('Parent', metadata,
+ Column('id', Integer, primary_key=True,
+ test_needs_autoincrement=True),
+ Column('name', String(128)))
+ children_table = Table('Children', metadata,
+ Column('id', Integer, primary_key=True,
+ test_needs_autoincrement=True),
+ Column('parent_id', Integer,
+ ForeignKey('Parent.id')),
+ Column('foo', String(128)),
+ Column('name', String(128)))
+
+ class CustomProxy(_AssociationList):
+ def __init__(self, lazy_collection, creator, value_attr, parent):
+ getter, setter = parent._default_getset(lazy_collection)
+ _AssociationList.__init__(self, lazy_collection, creator, getter, setter, parent)
+
+
+ class Parent(object):
+ children = association_proxy('_children', 'name',
+ proxy_factory=CustomProxy,
+ proxy_bulk_set=CustomProxy.extend
+ )
+
+ def __init__(self, name):
+ self.name = name
+
+ class Child(object):
+ def __init__(self, name):
+ self.name = name
+
+ mapper(Parent, parents_table, properties={
+ '_children': relation(Child, lazy=False,
+ collection_class=list)})
+ mapper(Child, children_table)
+
+ metadata.create_all()
+
+ self.metadata = metadata
+ self.session = create_session()
+ self.Parent, self.Child = Parent, Child
+
+ def test_sequence_ops(self):
+ self._test_sequence_ops()
+
+
class ScalarTest(TestBase):
def test_scalar_proxy(self):
Index: /sqlalchemy/trunk/lib/sqlalchemy/ext/associationproxy.py
===================================================================
--- /sqlalchemy/trunk/lib/sqlalchemy/ext/associationproxy.py (revision 6189)
+++ /sqlalchemy/trunk/lib/sqlalchemy/ext/associationproxy.py (revision 6546)
@@ -221,5 +221,5 @@
if self.proxy_factory:
- return self.proxy_factory(lazy_collection, creator, self.value_attr)
+ return self.proxy_factory(lazy_collection, creator, self.value_attr, self)
if self.getset_factory:
Index: /sqlalchemy/trunk/CHANGES
===================================================================
--- /sqlalchemy/trunk/CHANGES (revision 6544)
+++ /sqlalchemy/trunk/CHANGES (revision 6546)
@@ -746,4 +746,11 @@
in terms of the SqlSoup object's bind.
+ - The signature of the proxy_factory callable passed to
+ association_proxy is now (lazy_collection, creator,
+ value_attr, association_proxy), adding a fourth argument
+ that is the parent AssociationProxy argument. Allows
+ serializability and subclassing of the built in collections.
+ [ticket:1259]
+
0.5.7
=====
Index: /branches/1.1/turbogears/widgets/tests/test_widgets.py
===================================================================
--- /branches/1.1/turbogears/widgets/tests/test_widgets.py (revision 6973)
+++ /branches/1.1/turbogears/widgets/tests/test_widgets.py (revision 6974)
@@ -387,4 +387,7 @@
return False
+ def __hash__(self):
+ return hash(self.value)
+
class TestValidator:
@@ -411,17 +414,11 @@
'<option value="3">three</option>'
'<option value="4">four</option>') in output, output
+ assert single.render(None, format='xhtml') == output
+ assert single.render('', format='xhtml') == output
output = single.render(TestValue(3), format='xhtml')
assert ('<option value="1">one</option><option value="2">two</option>'
'<option selected="selected" value="3">three</option>'
'<option value="4">four</option>') in output, output
- # check with unvalidated values
- output = single.render('', format='xhtml')
- assert ('<option value="1">one</option><option value="2">two</option>'
- '<option value="3">three</option>'
- '<option value="4">four</option>') in output, output
- output = single.render('3', format='xhtml')
- assert ('<option value="1">one</option><option value="2">two</option>'
- '<option selected="selected" value="3">three</option>'
- '<option value="4">four</option>') in output, output
+ assert single.render(u'3', format='xhtml') == output
# Test MultipleSelectField
multiple = widgets.MultipleSelectField(
@@ -434,4 +431,8 @@
'<option value="3">three</option>'
'<option value="4">four</option>' in output), output
+ assert multiple.render(None, format='xhtml') == output
+ assert multiple.render('', format='xhtml') == output
+ assert multiple.render([], format='xhtml') == output
+ assert multiple.render(set(), format='xhtml') == output
output = multiple.render([TestValue(1), TestValue(3)], format='xhtml')
assert ('<option selected="selected" value="1">one</option>'
@@ -439,15 +440,7 @@
'<option selected="selected" value="3">three</option>'
'<option value="4">four</option>' in output), output
- # check with unvalidated values
- output = multiple.render('', format='xhtml')
- assert ('<option value="1">one</option>'
- '<option value="2">two</option>'
- '<option value="3">three</option>'
- '<option value="4">four</option>' in output), output
- output = multiple.render(['1', '3'], format='xhtml')
- assert ('<option selected="selected" value="1">one</option>'
- '<option value="2">two</option>'
- '<option selected="selected" value="3">three</option>'
- '<option value="4">four</option>' in output), output
+ assert multiple.render(set([TestValue(1), TestValue(3)]), format='xhtml') == output
+ assert multiple.render([u'1', u'3'], format='xhtml') == output
+ assert multiple.render(set([u'1', u'3']), format='xhtml') == output
Index: /branches/1.1/turbogears/widgets/forms.py
===================================================================
--- /branches/1.1/turbogears/widgets/forms.py (revision 6973)
+++ /branches/1.1/turbogears/widgets/forms.py (revision 6974)
@@ -992,9 +992,13 @@
if self._multiple_selection:
if value:
- if isinstance(value[0], basestring):
- try:
- value = self.validator.to_python(value)
- except validators.Invalid:
- return False
+ # check only one item in the given list or set
+ for v in value:
+ if isinstance(v, basestring):
+ # if it's a string, we need to convert it
+ try:
+ value = self.validator.to_python(value)
+ except validators.Invalid:
+ return False
+ break
if option_value is None:
for v in value:
@@ -1005,4 +1009,5 @@
return False
else:
+ # if the value is a string, we need to convert it
if isinstance(value, basestring):
try:
Index: /branches/1.5-genshi-widgets/turbogears/widgets/tests/test_widgets.py
===================================================================
--- /branches/1.5-genshi-widgets/turbogears/widgets/tests/test_widgets.py (revision 6973)
+++ /branches/1.5-genshi-widgets/turbogears/widgets/tests/test_widgets.py (revision 6974)
@@ -453,4 +453,7 @@
return False
+ def __hash__(self):
+ return hash(self.value)
+
class TestValidator:
@@ -477,21 +480,13 @@
'<option value="3">three</option>'
'<option value="4">four</option>') in output, output
+ assert single.render(None, format='xhtml') == output
+ assert single.render('', format='xhtml') == output
output = single.render(TestValue(3), format='xhtml')
- output = output.replace('selected="selected"', '*')
- output = output.replace('value="3" *', '* value="3"')
+ selected = output.replace('selected="selected"', '*')
+ selected = selected.replace('value="3" *', '* value="3"')
assert ('<option value="1">one</option><option value="2">two</option>'
'<option * value="3">three</option>'
- '<option value="4">four</option>') in output, output
- # check with unvalidated values
- output = single.render('', format='xhtml')
- assert ('<option value="1">one</option><option value="2">two</option>'
- '<option value="3">three</option>'
- '<option value="4">four</option>') in output, output
- output = single.render('3', format='xhtml')
- output = output.replace('selected="selected"', '*')
- output = output.replace('value="3" *', '* value="3"')
- assert ('<option value="1">one</option><option value="2">two</option>'
- '<option * value="3">three</option>'
- '<option value="4">four</option>') in output, output
+ '<option value="4">four</option>') in selected, output
+ assert single.render(u'3', format='xhtml') == output
# Test MultipleSelectField
multiple = widgets.MultipleSelectField(
@@ -504,26 +499,20 @@
'<option value="3">three</option>'
'<option value="4">four</option>' in output), output
+ assert multiple.render(None, format='xhtml') == output
+ assert multiple.render('', format='xhtml') == output
+ assert multiple.render([], format='xhtml') == output
+ assert multiple.render(set(), format='xhtml') == output
output = multiple.render([TestValue(1), TestValue(3)], format='xhtml')
- output = output.replace('selected="selected"', '*')
- output = output.replace('value="1" *', '* value="1"')
- output = output.replace('value="3" *', '* value="3"')
+ selected = output.replace('selected="selected"', '*')
+ selected = selected.replace('value="1" *', '* value="1"')
+ selected = selected.replace('value="3" *', '* value="3"')
assert ('<option * value="1">one</option>'
'<option value="2">two</option>'
'<option * value="3">three</option>'
- '<option value="4">four</option>' in output), output
- # check with unvalidated values
- output = multiple.render('', format='xhtml')
- assert ('<option value="1">one</option>'
- '<option value="2">two</option>'
- '<option value="3">three</option>'
- '<option value="4">four</option>' in output), output
- output = multiple.render(['1', '3'], format='xhtml')
- output = output.replace('selected="selected"', '*')
- output = output.replace('value="1" *', '* value="1"')
- output = output.replace('value="3" *', '* value="3"')
- assert ('<option * value="1">one</option>'
- '<option value="2">two</option>'
- '<option * value="3">three</option>'
- '<option value="4">four</option>' in output), output
+ '<option value="4">four</option>' in selected), output
+ assert multiple.render(
+ set([TestValue(1), TestValue(3)]), format='xhtml') == output
+ assert multiple.render([u'1', u'3'], format='xhtml') == output
+ assert multiple.render(set([u'1', u'3']), format='xhtml') == output
Index: /branches/1.5-genshi-widgets/turbogears/widgets/forms.py
===================================================================
--- /branches/1.5-genshi-widgets/turbogears/widgets/forms.py (revision 6973)
+++ /branches/1.5-genshi-widgets/turbogears/widgets/forms.py (revision 6974)
@@ -1051,11 +1051,16 @@
def _is_option_selected(self, option_value, value):
+ """Check whether an option value has been selected."""
if self._multiple_selection:
if value:
- if isinstance(value[0], basestring):
- try:
- value = self.validator.to_python(value)
- except validators.Invalid:
- return False
+ # check only one item in the given list or set
+ for v in value:
+ if isinstance(v, basestring):
+ # if it's a string, we need to convert it
+ try:
+ value = self.validator.to_python(value)
+ except validators.Invalid:
+ return False
+ break
if option_value is None:
for v in value:
@@ -1066,4 +1071,5 @@
return False
else:
+ # if the value is a string, we need to convert it
if isinstance(value, basestring):
try:
Index: /branches/1.5/turbogears/widgets/tests/test_widgets.py
===================================================================
--- /branches/1.5/turbogears/widgets/tests/test_widgets.py (revision 6973)
+++ /branches/1.5/turbogears/widgets/tests/test_widgets.py (revision 6974)
@@ -407,4 +407,7 @@
return False
+ def __hash__(self):
+ return hash(self.value)
+
class TestValidator:
@@ -431,17 +434,11 @@
'<option value="3">three</option>'
'<option value="4">four</option>') in output, output
+ assert single.render(None, format='xhtml') == output
+ assert single.render('', format='xhtml') == output
output = single.render(TestValue(3), format='xhtml')
assert ('<option value="1">one</option><option value="2">two</option>'
'<option selected="selected" value="3">three</option>'
'<option value="4">four</option>') in output, output
- # check with unvalidated values
- output = single.render('', format='xhtml')
- assert ('<option value="1">one</option><option value="2">two</option>'
- '<option value="3">three</option>'
- '<option value="4">four</option>') in output, output
- output = single.render('3', format='xhtml')
- assert ('<option value="1">one</option><option value="2">two</option>'
- '<option selected="selected" value="3">three</option>'
- '<option value="4">four</option>') in output, output
+ assert single.render(u'3', format='xhtml') == output
# Test MultipleSelectField
multiple = widgets.MultipleSelectField(
@@ -454,4 +451,8 @@
'<option value="3">three</option>'
'<option value="4">four</option>' in output), output
+ assert multiple.render(None, format='xhtml') == output
+ assert multiple.render('', format='xhtml') == output
+ assert multiple.render([], format='xhtml') == output
+ assert multiple.render(set(), format='xhtml') == output
output = multiple.render([TestValue(1), TestValue(3)], format='xhtml')
assert ('<option selected="selected" value="1">one</option>'
@@ -459,15 +460,7 @@
'<option selected="selected" value="3">three</option>'
'<option value="4">four</option>' in output), output
- # check with unvalidated values
- output = multiple.render('', format='xhtml')
- assert ('<option value="1">one</option>'
- '<option value="2">two</option>'
- '<option value="3">three</option>'
- '<option value="4">four</option>' in output), output
- output = multiple.render(['1', '3'], format='xhtml')
- assert ('<option selected="selected" value="1">one</option>'
- '<option value="2">two</option>'
- '<option selected="selected" value="3">three</option>'
- '<option value="4">four</option>' in output), output
+ assert multiple.render(set([TestValue(1), TestValue(3)]), format='xhtml') == output
+ assert multiple.render([u'1', u'3'], format='xhtml') == output
+ assert multiple.render(set([u'1', u'3']), format='xhtml') == output
def test_empty_selection_field():
Index: /branches/1.5/turbogears/widgets/forms.py
===================================================================
--- /branches/1.5/turbogears/widgets/forms.py (revision 6973)
+++ /branches/1.5/turbogears/widgets/forms.py (revision 6974)
@@ -992,9 +992,13 @@
if self._multiple_selection:
if value:
- if isinstance(value[0], basestring):
- try:
- value = self.validator.to_python(value)
- except validators.Invalid:
- return False
+ # check only one item in the given list or set
+ for v in value:
+ if isinstance(v, basestring):
+ # if it's a string, we need to convert it
+ try:
+ value = self.validator.to_python(value)
+ except validators.Invalid:
+ return False
+ break
if option_value is None:
for v in value:
@@ -1005,4 +1009,5 @@
return False
else:
+ # if the value is a string, we need to convert it
if isinstance(value, basestring):
try:
Index: /branches/1.1/turbogears/widgets/tests/test_widgets.py
===================================================================
--- /branches/1.1/turbogears/widgets/tests/test_widgets.py (revision 6960)
+++ /branches/1.1/turbogears/widgets/tests/test_widgets.py (revision 6973)
@@ -407,5 +407,18 @@
(TestValue(3), 'three'), (TestValue(4), 'four')],
validator=TestValidator())
+ output = single.render(format='xhtml')
+ assert ('<option value="1">one</option><option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>') in output, output
output = single.render(TestValue(3), format='xhtml')
+ assert ('<option value="1">one</option><option value="2">two</option>'
+ '<option selected="selected" value="3">three</option>'
+ '<option value="4">four</option>') in output, output
+ # check with unvalidated values
+ output = single.render('', format='xhtml')
+ assert ('<option value="1">one</option><option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>') in output, output
+ output = single.render('3', format='xhtml')
assert ('<option value="1">one</option><option value="2">two</option>'
'<option selected="selected" value="3">three</option>'
@@ -416,4 +429,9 @@
(TestValue(3), 'three'), (TestValue(4), 'four')],
validator=validators.ForEach(TestValidator()))
+ output = multiple.render(format='xhtml')
+ assert ('<option value="1">one</option>'
+ '<option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>' in output), output
output = multiple.render([TestValue(1), TestValue(3)], format='xhtml')
assert ('<option selected="selected" value="1">one</option>'
@@ -421,4 +439,16 @@
'<option selected="selected" value="3">three</option>'
'<option value="4">four</option>' in output), output
+ # check with unvalidated values
+ output = multiple.render('', format='xhtml')
+ assert ('<option value="1">one</option>'
+ '<option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>' in output), output
+ output = multiple.render(['1', '3'], format='xhtml')
+ assert ('<option selected="selected" value="1">one</option>'
+ '<option value="2">two</option>'
+ '<option selected="selected" value="3">three</option>'
+ '<option value="4">four</option>' in output), output
+
def test_empty_selection_field():
Index: /branches/1.1/turbogears/widgets/forms.py
===================================================================
--- /branches/1.1/turbogears/widgets/forms.py (revision 6968)
+++ /branches/1.1/turbogears/widgets/forms.py (revision 6973)
@@ -990,18 +990,28 @@
def _is_option_selected(self, option_value, value):
- if option_value is None:
- if self._multiple_selection:
- if value:
+ if self._multiple_selection:
+ if value:
+ if isinstance(value[0], basestring):
+ try:
+ value = self.validator.to_python(value)
+ except validators.Invalid:
+ return False
+ if option_value is None:
for v in value:
if v is None:
return True
- return False
- return value is None
- else:
- if self._multiple_selection:
- if value:
+ else:
return option_value in value
- return False
- return option_value == value
+ return False
+ else:
+ if isinstance(value, basestring):
+ try:
+ value = self.validator.to_python(value)
+ except validators.Invalid:
+ return False
+ if option_value is None:
+ return value is None
+ else:
+ return option_value == value
Index: /branches/1.5-genshi-widgets/turbogears/widgets/tests/test_widgets.py
===================================================================
--- /branches/1.5-genshi-widgets/turbogears/widgets/tests/test_widgets.py (revision 6961)
+++ /branches/1.5-genshi-widgets/turbogears/widgets/tests/test_widgets.py (revision 6973)
@@ -473,5 +473,20 @@
(TestValue(3), 'three'), (TestValue(4), 'four')],
validator=TestValidator())
+ output = single.render(format='xhtml')
+ assert ('<option value="1">one</option><option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>') in output, output
output = single.render(TestValue(3), format='xhtml')
+ output = output.replace('selected="selected"', '*')
+ output = output.replace('value="3" *', '* value="3"')
+ assert ('<option value="1">one</option><option value="2">two</option>'
+ '<option * value="3">three</option>'
+ '<option value="4">four</option>') in output, output
+ # check with unvalidated values
+ output = single.render('', format='xhtml')
+ assert ('<option value="1">one</option><option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>') in output, output
+ output = single.render('3', format='xhtml')
output = output.replace('selected="selected"', '*')
output = output.replace('value="3" *', '* value="3"')
@@ -484,5 +499,24 @@
(TestValue(3), 'three'), (TestValue(4), 'four')],
validator=validators.ForEach(TestValidator()))
+ output = multiple.render(format='xhtml')
+ assert ('<option value="1">one</option>'
+ '<option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>' in output), output
output = multiple.render([TestValue(1), TestValue(3)], format='xhtml')
+ output = output.replace('selected="selected"', '*')
+ output = output.replace('value="1" *', '* value="1"')
+ output = output.replace('value="3" *', '* value="3"')
+ assert ('<option * value="1">one</option>'
+ '<option value="2">two</option>'
+ '<option * value="3">three</option>'
+ '<option value="4">four</option>' in output), output
+ # check with unvalidated values
+ output = multiple.render('', format='xhtml')
+ assert ('<option value="1">one</option>'
+ '<option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>' in output), output
+ output = multiple.render(['1', '3'], format='xhtml')
output = output.replace('selected="selected"', '*')
output = output.replace('value="1" *', '* value="1"')
Index: /branches/1.5-genshi-widgets/turbogears/widgets/forms.py
===================================================================
--- /branches/1.5-genshi-widgets/turbogears/widgets/forms.py (revision 6972)
+++ /branches/1.5-genshi-widgets/turbogears/widgets/forms.py (revision 6973)
@@ -1051,18 +1051,28 @@
def _is_option_selected(self, option_value, value):
- if option_value is None:
- if self._multiple_selection:
- if value:
+ if self._multiple_selection:
+ if value:
+ if isinstance(value[0], basestring):
+ try:
+ value = self.validator.to_python(value)
+ except validators.Invalid:
+ return False
+ if option_value is None:
for v in value:
if v is None:
return True
- return False
- return value is None
- else:
- if self._multiple_selection:
- if value:
+ else:
return option_value in value
- return False
- return option_value == value
+ return False
+ else:
+ if isinstance(value, basestring):
+ try:
+ value = self.validator.to_python(value)
+ except validators.Invalid:
+ return False
+ if option_value is None:
+ return value is None
+ else:
+ return option_value == value
Index: /branches/1.5/turbogears/widgets/tests/test_widgets.py
===================================================================
--- /branches/1.5/turbogears/widgets/tests/test_widgets.py (revision 6960)
+++ /branches/1.5/turbogears/widgets/tests/test_widgets.py (revision 6973)
@@ -427,5 +427,18 @@
(TestValue(3), 'three'), (TestValue(4), 'four')],
validator=TestValidator())
+ output = single.render(format='xhtml')
+ assert ('<option value="1">one</option><option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>') in output, output
output = single.render(TestValue(3), format='xhtml')
+ assert ('<option value="1">one</option><option value="2">two</option>'
+ '<option selected="selected" value="3">three</option>'
+ '<option value="4">four</option>') in output, output
+ # check with unvalidated values
+ output = single.render('', format='xhtml')
+ assert ('<option value="1">one</option><option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>') in output, output
+ output = single.render('3', format='xhtml')
assert ('<option value="1">one</option><option value="2">two</option>'
'<option selected="selected" value="3">three</option>'
@@ -436,5 +449,21 @@
(TestValue(3), 'three'), (TestValue(4), 'four')],
validator=validators.ForEach(TestValidator()))
+ output = multiple.render(format='xhtml')
+ assert ('<option value="1">one</option>'
+ '<option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>' in output), output
output = multiple.render([TestValue(1), TestValue(3)], format='xhtml')
+ assert ('<option selected="selected" value="1">one</option>'
+ '<option value="2">two</option>'
+ '<option selected="selected" value="3">three</option>'
+ '<option value="4">four</option>' in output), output
+ # check with unvalidated values
+ output = multiple.render('', format='xhtml')
+ assert ('<option value="1">one</option>'
+ '<option value="2">two</option>'
+ '<option value="3">three</option>'
+ '<option value="4">four</option>' in output), output
+ output = multiple.render(['1', '3'], format='xhtml')
assert ('<option selected="selected" value="1">one</option>'
'<option value="2">two</option>'
Index: /branches/1.5/turbogears/widgets/forms.py
===================================================================
--- /branches/1.5/turbogears/widgets/forms.py (revision 6968)
+++ /branches/1.5/turbogears/widgets/forms.py (revision 6973)
@@ -990,18 +990,28 @@
def _is_option_selected(self, option_value, value):
- if option_value is None:
- if self._multiple_selection:
- if value:
+ if self._multiple_selection:
+ if value:
+ if isinstance(value[0], basestring):
+ try:
+ value = self.validator.to_python(value)
+ except validators.Invalid:
+ return False
+ if option_value is None:
for v in value:
if v is None:
return True
- return False
- return value is None
- else:
- if self._multiple_selection:
- if value:
+ else:
return option_value in value
- return False
- return option_value == value
+ return False
+ else:
+ if isinstance(value, basestring):
+ try:
+ value = self.validator.to_python(value)
+ except validators.Invalid:
+ return False
+ if option_value is None:
+ return value is None
+ else:
+ return option_value == value
Index: /branches/subunit-4004/twisted/trial/test/test_reporter.py
===================================================================
--- /branches/subunit-4004/twisted/trial/test/test_reporter.py (revision 27710)
+++ /branches/subunit-4004/twisted/trial/test/test_reporter.py (revision 27711)
@@ -841,85 +841,4 @@
- def test_startStop(self):
- """
- Test start and stop.
- """
- self.result.startTest(self.test)
- self.result.stopTest(self.test)
-
-
- def test_addUnexpectedSuccess(self):
- """
- Test addUnexpectedSuccess.
- """
- self.result.startTest(self.test)
- self.result.addUnexpectedSuccess(self.test, "todo")
- self.result.stopTest(self.test)
-
-
- def test_addSuccess(self):
- """
- Test addSuccess.
- """
- self.result.startTest(self.test)
- self.result.addSuccess(self.test)
- self.result.stopTest(self.test)
-
-
- def test_addError(self):
- """
- Test addError.
- """
- self.result.startTest(self.test)
- try:
- raise Exception('woo')
- except Exception:
- self.result.addError(self.test, self._exc_info())
- self.result.stopTest(self.test)
-
-
- def test_addFailure(self):
- """
- Test addFailure.
- """
- self.result.startTest(self.test)
- try:
- raise Exception('woo')
- except Exception:
- self.result.addFailure(self.test, self._exc_info())
- self.result.stopTest(self.test)
-
-
- def test_addExpectedFailure(self):
- """
- Test addExpectedFailure.
- """
- self.result.startTest(self.test)
- try:
- raise Exception('woo')
- except Exception:
- self.result.addExpectedFailure(self.test, self._exc_info(),
- Todo(""))
- self.result.stopTest(self.test)
-
-
- def test_addUnexpectedSuccess_todo(self):
- """
- Test addUnexpectedSuccess.
- """
- self.result.startTest(self.test)
- self.result.addUnexpectedSuccess(self.test, Todo(""))
- self.result.stopTest(self.test)
-
-
- def test_addSkip(self):
- """
- Test addSkip.
- """
- self.result.startTest(self.test)
- self.result.addSkip(self.test, "todo")
- self.result.stopTest(self.test)
-
-
def test_stop(self):
"""
@@ -930,12 +849,4 @@
self.result.stop()
self.assertEqual(True, self.result.shouldStop)
-
-
- def test_done(self):
- """
- done() is called when the test suite is done.
- """
- # XXX: Drop this and replace with verifyObject
- self.result.done()
@@ -973,5 +884,6 @@
def test_startStop(self):
- TestReporterInterface.test_startStop(self)
+ self.result.startTest(self.test)
+ self.result.stopTest(self.test)
self.assertTrue(self.result._lastTime > 0)
self.assertEqual(self.result.testsRun, 1)
Index: /branches/subunit-4004/twisted/trial/test/test_reporter.py
===================================================================
--- /branches/subunit-4004/twisted/trial/test/test_reporter.py (revision 27680)
+++ /branches/subunit-4004/twisted/trial/test/test_reporter.py (revision 27710)
@@ -936,4 +936,5 @@
done() is called when the test suite is done.
"""
+ # XXX: Drop this and replace with verifyObject
self.result.done()
@@ -1177,4 +1178,25 @@
+ def assertForwardsToSubunit(self, methodName, *args, **kwargs):
+ """
+ Assert that 'methodName' on L{SubunitReporter} forwards to the
+ equivalent method on subunit.
+
+ Checks that the return value from subunit is returned from the
+ L{SubunitReporter} and that the reporter writes the same data to its
+ stream as subunit does to its own.
+
+ Assumes that the method on subunit has the same name as the method on
+ L{SubunitReporter}.
+ """
+ stream = StringIO.StringIO()
+ subunitClient = reporter.TestProtocolClient(stream)
+ subunitReturn = getattr(subunitClient, methodName)(*args, **kwargs)
+ subunitOutput = stream.getvalue()
+ reporterReturn = getattr(self.result, methodName)(*args, **kwargs)
+ self.assertEqual(subunitReturn, reporterReturn)
+ self.assertEqual(subunitOutput, self.stream.getvalue())
+
+
def test_oldSubunitInstalled(self):
"""
@@ -1220,4 +1242,77 @@
+ def test_doneDoesNothing(self):
+ """
+ The subunit reporter doesn't need to print out a summary -- the stream
+ of results is everything. Thus, done() does nothing.
+ """
+ self.result.done()
+ self.assertEqual('', self.stream.getvalue())
+
+
+ def test_startTest_sends_subunit_startTest(self):
+ """
+ SubunitReporter.startTest() sends the subunit 'startTest' message.
+ """
+ self.assertForwardsToSubunit('startTest', self.test)
+
+
+ def test_stopTest_sends_subunit_stopTest(self):
+ """
+ SubunitReporter.stopTest() sends the subunit 'stopTest' message.
+ """
+ self.assertForwardsToSubunit('stopTest', self.test)
+
+
+ def test_addSuccess_sends_subunit_addSuccess(self):
+ """
+ SubunitReporter.addSuccess() sends the subunit 'addSuccess' message.
+ """
+ self.assertForwardsToSubunit('addSuccess', self.test)
+
+
+ def test_addSkip_sends_subunit_addSkip(self):
+ """
+ SubunitReporter.addSkip() sends the subunit 'addSkip' message.
+ """
+ self.assertForwardsToSubunit('addSkip', self.test, 'reason')
+
+
+ def test_addError_sends_subunit_addError(self):
+ """
+ SubunitReporter.addError() sends the subunit 'addError' message.
+ """
+ try:
+ 1 / 0
+ except ZeroDivisionError:
+ error = sys.exc_info()
+ self.assertForwardsToSubunit('addError', self.test, error)
+
+
+ def test_addFailure_sends_subunit_addFailure(self):
+ """
+ SubunitReporter.addFailure() sends the subunit 'addFailure' message.
+ """
+ try:
+ self.fail('hello')
+ except self.failureException:
+ failure = sys.exc_info()
+ self.assertForwardsToSubunit('addFailure', self.test, failure)
+
+
+ def test_addUnexpectedSuccess_sends_subunit_addSuccess(self):
+ """
+ SubunitReporter.addFailure() sends the subunit 'addSuccess' message,
+ since subunit doesn't model unexpected success.
+ """
+ stream = StringIO.StringIO()
+ subunitClient = reporter.TestProtocolClient(stream)
+ subunitClient.addSuccess(self.test)
+ subunitOutput = stream.getvalue()
+ self.result.addUnexpectedSuccess(self.test, 'todo')
+ self.assertEqual(subunitOutput, self.stream.getvalue())
+
+
+
class TestSubunitReporterNotInstalled(unittest.TestCase):
"""
Index: /branches/isupport-aware-mode-parsing-3296/twisted/words/test/test_irc.py
===================================================================
--- /branches/isupport-aware-mode-parsing-3296/twisted/words/test/test_irc.py (revision 27552)
+++ /branches/isupport-aware-mode-parsing-3296/twisted/words/test/test_irc.py (revision 27709)
@@ -884,5 +884,9 @@
- def testISupport(self):
+ def test_ISUPPORT(self):
+ """
+ The client parses ISUPPORT messages sent by the server and calls
+ L{IRCClient.isupport}.
+ """
self._sendISUPPORT()
@@ -1075,6 +1079,6 @@
def test_modeMissingDirection(self):
"""
- Mode strings that do not begin with a directional character, C{+} or
- C{-}, have C{+} automatically prepended.
+ Mode strings that do not begin with a directional character, C{'+'} or
+ C{'-'}, have C{'+'} automatically prepended.
"""
self._sendModeChange('s')
Index: /branches/isupport-aware-mode-parsing-3296/twisted/words/protocols/irc.py
===================================================================
--- /branches/isupport-aware-mode-parsing-3296/twisted/words/protocols/irc.py (revision 27551)
+++ /branches/isupport-aware-mode-parsing-3296/twisted/words/protocols/irc.py (revision 27709)
@@ -1747,5 +1747,5 @@
"""
channel, modes, args = params[0], params[1], params[2:]
-
+
if modes[0] not in '-+':
modes = '+' + modes
@@ -1761,7 +1761,6 @@
added, removed = parseModes(modes, args, paramModes)
except IRCBadModes:
- log.msg('An error occured while parsing the following MODE message:'
- ' MODE %s' % (' '.join(params),))
- log.err()
+ log.err(None, 'An error occured while parsing the following '
+ 'MODE message: MODE %s' % (' '.join(params),))
else:
if added:
Index: /sqlalchemy/branches/rel_0_5/test/orm/test_session.py
===================================================================
--- /sqlalchemy/branches/rel_0_5/test/orm/test_session.py (revision 6309)
+++ /sqlalchemy/branches/rel_0_5/test/orm/test_session.py (revision 6545)
@@ -106,47 +106,72 @@
@engines.close_open_connections
@testing.resolve_artifact_names
- def test_table_binds_from_expression(self):
- """Session can extract Table objects from ClauseElements and match them to tables."""
-
- mapper(Address, addresses)
- mapper(User, users, properties={
+ def test_mapped_binds(self):
+
+ # ensure tables are unbound
+ m2 = sa.MetaData()
+ users_unbound =users.tometadata(m2)
+ addresses_unbound = addresses.tometadata(m2)
+
+ mapper(Address, addresses_unbound)
+ mapper(User, users_unbound, properties={
'addresses':relation(Address,
backref=backref("user", cascade="all"),
cascade="all")})
- Session = sessionmaker(binds={users: self.metadata.bind,
- addresses: self.metadata.bind})
+ Session = sessionmaker(binds={User: self.metadata.bind,
+ Address: self.metadata.bind})
sess = Session()
- sess.execute(users.insert(), params=dict(id=1, name='ed'))
- eq_(sess.execute(users.select(users.c.id == 1)).fetchall(),
- [(1, 'ed')])
-
- eq_(sess.execute(users.select(User.id == 1)).fetchall(),
- [(1, 'ed')])
-
+ u1 = User(id=1, name='ed')
+ sess.add(u1)
+ eq_(sess.query(User).filter(User.id==1).all(),
+ [User(id=1, name='ed')])
+
+ # test expression binding
+ sess.execute(users_unbound.insert(), params=dict(id=2, name='jack'))
+ eq_(sess.execute(users_unbound.select(users_unbound.c.id == 2)).fetchall(),
+ [(2, 'jack')])
+
+ eq_(sess.execute(users_unbound.select(User.id == 2)).fetchall(),
+ [(2, 'jack')])
+
+ sess.execute(users_unbound.delete())
+ eq_(sess.execute(users_unbound.select()).fetchall(), [])
+
sess.close()
@engines.close_open_connections
@testing.resolve_artifact_names
- def test_mapped_binds_from_expression(self):
- """Session can extract Table objects from ClauseElements and match them to tables."""
-
- mapper(Address, addresses)
- mapper(User, users, properties={
+ def test_table_binds(self):
+
+ # ensure tables are unbound
+ m2 = sa.MetaData()
+ users_unbound =users.tometadata(m2)
+ addresses_unbound = addresses.tometadata(m2)
+
+ mapper(Address, addresses_unbound)
+ mapper(User, users_unbound, properties={
'addresses':relation(Address,
backref=backref("user", cascade="all"),
cascade="all")})
- Session = sessionmaker(binds={User: self.metadata.bind,
- Address: self.metadata.bind})
+ Session = sessionmaker(binds={users_unbound: self.metadata.bind,
+ addresses_unbound: self.metadata.bind})
sess = Session()
- sess.execute(users.insert(), params=dict(id=1, name='ed'))
- eq_(sess.execute(users.select(users.c.id == 1)).fetchall(),
- [(1, 'ed')])
-
- eq_(sess.execute(users.select(User.id == 1)).fetchall(),
- [(1, 'ed')])
+ u1 = User(id=1, name='ed')
+ sess.add(u1)
+ eq_(sess.query(User).filter(User.id==1).all(),
+ [User(id=1, name='ed')])
+
+ sess.execute(users_unbound.insert(), params=dict(id=2, name='jack'))
+ eq_(sess.execute(users_unbound.select(users_unbound.c.id == 2)).fetchall(),
+ [(2, 'jack')])
+
+ eq_(sess.execute(users_unbound.select(User.id == 2)).fetchall(),
+ [(2, 'jack')])
+
+ sess.execute(users_unbound.delete())
+ eq_(sess.execute(users_unbound.select()).fetchall(), [])
sess.close()
Index: /sqlalchemy/branches/rel_0_5/lib/sqlalchemy/orm/session.py
===================================================================
--- /sqlalchemy/branches/rel_0_5/lib/sqlalchemy/orm/session.py (revision 6535)
+++ /sqlalchemy/branches/rel_0_5/lib/sqlalchemy/orm/session.py (revision 6545)
@@ -571,11 +571,9 @@
if binds is not None:
- for mapperortable, value in binds.iteritems():
- if isinstance(mapperortable, type):
- mapperortable = _class_mapper(mapperortable).base_mapper
- self.__binds[mapperortable] = value
- if isinstance(mapperortable, Mapper):
- for t in mapperortable._all_tables:
- self.__binds[t] = value
+ for mapperortable, bind in binds.iteritems():
+ if isinstance(mapperortable, (type, Mapper)):
+ self.bind_mapper(mapperortable, bind)
+ else:
+ self.bind_table(mapperortable, bind)
if not self.autocommit:
@@ -858,5 +856,5 @@
c_mapper = mapper is not None and _class_to_mapper(mapper) or None
-
+
# manually bound?
if self.__binds:
@@ -867,5 +865,5 @@
return self.__binds[c_mapper.mapped_table]
if clause:
- for t in sql_util.find_tables(clause):
+ for t in sql_util.find_tables(clause, include_crud=True):
if t in self.__binds:
return self.__binds[t]
Index: /sqlalchemy/branches/rel_0_5/lib/sqlalchemy/sql/util.py
===================================================================
--- /sqlalchemy/branches/rel_0_5/lib/sqlalchemy/sql/util.py (revision 6298)
+++ /sqlalchemy/branches/rel_0_5/lib/sqlalchemy/sql/util.py (revision 6545)
@@ -48,5 +48,7 @@
-def find_tables(clause, check_columns=False, include_aliases=False, include_joins=False, include_selects=False):
+def find_tables(clause, check_columns=False,
+ include_aliases=False, include_joins=False,
+ include_selects=False, include_crud=False):
"""locate Table objects within the given expression."""
@@ -62,5 +64,9 @@
if include_aliases:
_visitors['alias'] = tables.append
-
+
+ if include_crud:
+ _visitors['insert'] = _visitors['update'] = \
+ _visitors['delete'] = lambda ent: tables.append(ent.table)
+
if check_columns:
def visit_column(column):
Index: /sqlalchemy/branches/rel_0_5/CHANGES
===================================================================
--- /sqlalchemy/branches/rel_0_5/CHANGES (revision 6541)
+++ /sqlalchemy/branches/rel_0_5/CHANGES (revision 6545)
@@ -23,5 +23,10 @@
by contains_eager() out of individual instance states.
[ticket:1553]
-
+
+ - Session.execute() now locates table- and
+ mapper-specific binds based on a passed
+ in expression which is an insert()/update()/delete()
+ construct. [ticket:1054]
+
- Fixed a needless select which would occur when merging
transient objects that contained a null primary key
Index: /sqlalchemy/trunk/test/orm/test_session.py
===================================================================
--- /sqlalchemy/trunk/test/orm/test_session.py (revision 6407)
+++ /sqlalchemy/trunk/test/orm/test_session.py (revision 6544)
@@ -105,47 +105,72 @@
@engines.close_open_connections
@testing.resolve_artifact_names
- def test_table_binds_from_expression(self):
- """Session can extract Table objects from ClauseElements and match them to tables."""
-
- mapper(Address, addresses)
- mapper(User, users, properties={
+ def test_mapped_binds(self):
+
+ # ensure tables are unbound
+ m2 = sa.MetaData()
+ users_unbound =users.tometadata(m2)
+ addresses_unbound = addresses.tometadata(m2)
+
+ mapper(Address, addresses_unbound)
+ mapper(User, users_unbound, properties={
'addresses':relation(Address,
backref=backref("user", cascade="all"),
cascade="all")})
- Session = sessionmaker(binds={users: self.metadata.bind,
- addresses: self.metadata.bind})
+ Session = sessionmaker(binds={User: self.metadata.bind,
+ Address: self.metadata.bind})
sess = Session()
- sess.execute(users.insert(), params=dict(id=1, name='ed'))
- eq_(sess.execute(users.select(users.c.id == 1)).fetchall(),
- [(1, 'ed')])
-
- eq_(sess.execute(users.select(User.id == 1)).fetchall(),
- [(1, 'ed')])
-
+ u1 = User(id=1, name='ed')
+ sess.add(u1)
+ eq_(sess.query(User).filter(User.id==1).all(),
+ [User(id=1, name='ed')])
+
+ # test expression binding
+ sess.execute(users_unbound.insert(), params=dict(id=2, name='jack'))
+ eq_(sess.execute(users_unbound.select(users_unbound.c.id == 2)).fetchall(),
+ [(2, 'jack')])
+
+ eq_(sess.execute(users_unbound.select(User.id == 2)).fetchall(),
+ [(2, 'jack')])
+
+ sess.execute(users_unbound.delete())
+ eq_(sess.execute(users_unbound.select()).fetchall(), [])
+
sess.close()
@engines.close_open_connections
@testing.resolve_artifact_names
- def test_mapped_binds_from_expression(self):
- """Session can extract Table objects from ClauseElements and match them to tables."""
-
- mapper(Address, addresses)
- mapper(User, users, properties={
+ def test_table_binds(self):
+
+ # ensure tables are unbound
+ m2 = sa.MetaData()
+ users_unbound =users.tometadata(m2)
+ addresses_unbound = addresses.tometadata(m2)
+
+ mapper(Address, addresses_unbound)
+ mapper(User, users_unbound, properties={
'addresses':relation(Address,
backref=backref("user", cascade="all"),
cascade="all")})
- Session = sessionmaker(binds={User: self.metadata.bind,
- Address: self.metadata.bind})
+ Session = sessionmaker(binds={users_unbound: self.metadata.bind,
+ addresses_unbound: self.metadata.bind})
sess = Session()
- sess.execute(users.insert(), params=dict(id=1, name='ed'))
- eq_(sess.execute(users.select(users.c.id == 1)).fetchall(),
- [(1, 'ed')])
-
- eq_(sess.execute(users.select(User.id == 1)).fetchall(),
- [(1, 'ed')])
+ u1 = User(id=1, name='ed')
+ sess.add(u1)
+ eq_(sess.query(User).filter(User.id==1).all(),
+ [User(id=1, name='ed')])
+
+ sess.execute(users_unbound.insert(), params=dict(id=2, name='jack'))
+ eq_(sess.execute(users_unbound.select(users_unbound.c.id == 2)).fetchall(),
+ [(2, 'jack')])
+
+ eq_(sess.execute(users_unbound.select(User.id == 2)).fetchall(),
+ [(2, 'jack')])
+
+ sess.execute(users_unbound.delete())
+ eq_(sess.execute(users_unbound.select()).fetchall(), [])
sess.close()
Index: /sqlalchemy/trunk/lib/sqlalchemy/orm/session.py
===================================================================
--- /sqlalchemy/trunk/lib/sqlalchemy/orm/session.py (revision 6534)
+++ /sqlalchemy/trunk/lib/sqlalchemy/orm/session.py (revision 6544)
@@ -555,11 +555,9 @@
if binds is not None:
- for mapperortable, value in binds.iteritems():
- if isinstance(mapperortable, type):
- mapperortable = _class_mapper(mapperortable).base_mapper
- self.__binds[mapperortable] = value
- if isinstance(mapperortable, Mapper):
- for t in mapperortable._all_tables:
- self.__binds[t] = value
+ for mapperortable, bind in binds.iteritems():
+ if isinstance(mapperortable, (type, Mapper)):
+ self.bind_mapper(mapperortable, bind)
+ else:
+ self.bind_table(mapperortable, bind)
if not self.autocommit:
@@ -840,5 +838,5 @@
c_mapper = mapper is not None and _class_to_mapper(mapper) or None
-
+
# manually bound?
if self.__binds:
@@ -849,5 +847,5 @@
return self.__binds[c_mapper.mapped_table]
if clause is not None:
- for t in sql_util.find_tables(clause):
+ for t in sql_util.find_tables(clause, include_crud=True):
if t in self.__binds:
return self.__binds[t]
Index: /sqlalchemy/trunk/lib/sqlalchemy/sql/util.py
===================================================================
--- /sqlalchemy/trunk/lib/sqlalchemy/sql/util.py (revision 6529)
+++ /sqlalchemy/trunk/lib/sqlalchemy/sql/util.py (revision 6544)
@@ -48,5 +48,7 @@
-def find_tables(clause, check_columns=False, include_aliases=False, include_joins=False, include_selects=False):
+def find_tables(clause, check_columns=False,
+ include_aliases=False, include_joins=False,
+ include_selects=False, include_crud=False):
"""locate Table objects within the given expression."""
@@ -62,5 +64,9 @@
if include_aliases:
_visitors['alias'] = tables.append
-
+
+ if include_crud:
+ _visitors['insert'] = _visitors['update'] = \
+ _visitors['delete'] = lambda ent: tables.append(ent.table)
+
if check_columns:
def visit_column(column):
Index: /sqlalchemy/trunk/CHANGES
===================================================================
--- /sqlalchemy/trunk/CHANGES (revision 6543)
+++ /sqlalchemy/trunk/CHANGES (revision 6544)
@@ -764,5 +764,10 @@
by contains_eager() out of individual instance states.
[ticket:1553]
-
+
+ - Session.execute() now locates table- and
+ mapper-specific binds based on a passed
+ in expression which is an insert()/update()/delete()
+ construct. [ticket:1054]
+
- Fixed a needless select which would occur when merging
transient objects that contained a null primary key