diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-12-28 16:38:36 -0500 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-12-28 16:38:36 -0500 |
commit | bb9bc68d7764674fd95cf4d38d30dd384db62951 (patch) | |
tree | bece0cd0606d684b48be8c24237d6283955b62a6 /lib/sqlalchemy/sql/elements.py | |
parent | 3f95f26237e77f940c1bd9674506d8823ae84537 (diff) | |
parent | cac7320eeb16e62f347dbf009a1b18edff7faa18 (diff) | |
download | sqlalchemy-bb9bc68d7764674fd95cf4d38d30dd384db62951.tar.gz |
Merge branch 'master' into rel_0_9
Diffstat (limited to 'lib/sqlalchemy/sql/elements.py')
-rw-r--r-- | lib/sqlalchemy/sql/elements.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py index dfebf09a8..56fca5dd8 100644 --- a/lib/sqlalchemy/sql/elements.py +++ b/lib/sqlalchemy/sql/elements.py @@ -1766,14 +1766,7 @@ class Cast(ColumnElement): """ self.type = type_api.to_instance(type_) - self.clause = _literal_as_binds(expression, None) - if isinstance(self.clause, BindParameter) and ( - self.clause.type._isnull - or self.clause.type._type_affinity is self.type._type_affinity - ): - self.clause = self.clause._clone() - self.clause.type = self.type - + self.clause = _literal_as_binds(expression, type_=self.type) self.typeclause = TypeClause(self.type) def _copy_internals(self, clone=_clone, **kw): @@ -2785,7 +2778,6 @@ def _only_column_elements(element, name): "'%s'; got: '%s', type %s" % (name, element, type(element))) return element - def _literal_as_binds(element, name=None, type_=None): if hasattr(element, '__clause_element__'): return element.__clause_element__() |