summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-12-18 18:26:15 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-12-18 18:26:15 -0500
commit2692238f45ae4d2f46949dfa52b16132bd266e0e (patch)
tree3ea336d98a01461b51da530bf0aca155b891fdd0 /lib/sqlalchemy/sql
parentf701f87c1374c1e4d80b9f47c17632518cece765 (diff)
downloadsqlalchemy-2692238f45ae4d2f46949dfa52b16132bd266e0e.tar.gz
- Improvements to the system by which SQL types generate within
``__repr__()``, particularly with regards to the MySQL integer/numeric/ character types which feature a wide variety of keyword arguments. The ``__repr__()`` is important for use with Alembic autogenerate for when Python code is rendered in a migration script. [ticket:2893]
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/sqltypes.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py
index 6ed20084b..259749cc4 100644
--- a/lib/sqlalchemy/sql/sqltypes.py
+++ b/lib/sqlalchemy/sql/sqltypes.py
@@ -906,15 +906,15 @@ class SchemaType(SchemaEventTarget):
"""
- def __init__(self, **kw):
- name = kw.pop('name', None)
+ def __init__(self, name=None, schema=None, metadata=None,
+ inherit_schema=False, quote=None):
if name is not None:
- self.name = quoted_name(name, kw.pop('quote', None))
+ self.name = quoted_name(name, quote)
else:
self.name = None
- self.schema = kw.pop('schema', None)
- self.metadata = kw.pop('metadata', None)
- self.inherit_schema = kw.pop('inherit_schema', False)
+ self.schema = schema
+ self.metadata = metadata
+ self.inherit_schema = inherit_schema
if self.metadata:
event.listen(
self.metadata,
@@ -1110,10 +1110,9 @@ class Enum(String, SchemaType):
SchemaType.__init__(self, **kw)
def __repr__(self):
- return util.generic_repr(self, [
- ("native_enum", True),
- ("name", None)
- ])
+ return util.generic_repr(self,
+ to_inspect=[Enum, SchemaType],
+ )
def _should_create_constraint(self, compiler):
return not self.native_enum or \