From af8ac4b1116d3ecbfe4e967657f262073c47b34b Mon Sep 17 00:00:00 2001
From: Randall Smith <randall@tnr.cc>
Date: Sat, 25 Apr 2009 18:58:43 +0000
Subject: [PATCH] removed attrs key from get_columns return value

---
 lib/sqlalchemy/dialects/mssql/base.py    |  2 --
 lib/sqlalchemy/dialects/mysql/base.py    |  3 +--
 lib/sqlalchemy/dialects/oracle/base.py   |  1 -
 lib/sqlalchemy/dialects/postgres/base.py |  2 +-
 lib/sqlalchemy/dialects/sqlite/base.py   |  1 -
 lib/sqlalchemy/engine/base.py            | 10 ++++++++--
 lib/sqlalchemy/engine/reflection.py      |  3 ---
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index fee22ad11b..3baf7b3a08 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -1255,13 +1255,11 @@ class MSDialect(default.DefaultDialect):
                 kwargs['precision'] = numericprec
 
             coltype = coltype(**kwargs)
-            colargs = []
             cdict = {
                 'name' : name,
                 'type' : coltype,
                 'nullable' : nullable,
                 'default' : default,
-                'attrs' : colargs
             }
             cols.append(cdict)
         # autoincrement and identity
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index c2eb61afb7..eb4fb2d731 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -2343,8 +2343,7 @@ class MySQLTableDefinitionParser(object):
         elif default == 'NULL':
             # eliminates the need to deal with this later.
             default = None
-        col_d = dict(name=name, type=type_instance, attrs={},
-                     default=default)
+        col_d = dict(name=name, type=type_instance, default=default)
         col_d.update(col_kw)
         state.columns.append(col_d)
 
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 69461b456b..ab80a14177 100644
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -653,7 +653,6 @@ class OracleDialect(default.DefaultDialect):
                 'type': coltype,
                 'nullable': nullable,
                 'default': default,
-                'attrs': {}
             }
             columns.append(cdict)
         return columns
diff --git a/lib/sqlalchemy/dialects/postgres/base.py b/lib/sqlalchemy/dialects/postgres/base.py
index e6be822fd4..448d3b90ae 100644
--- a/lib/sqlalchemy/dialects/postgres/base.py
+++ b/lib/sqlalchemy/dialects/postgres/base.py
@@ -730,7 +730,7 @@ class PGDialect(default.DefaultDialect):
                         default = match.group(1) + ('"%s"' % sch) + '.' + match.group(2) + match.group(3)
 
             column_info = dict(name=name, type=coltype, nullable=nullable,
-                               default=default, attrs={})
+                               default=default)
             columns.append(column_info)
         return columns
 
diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py
index cf83a05000..def9b6f899 100644
--- a/lib/sqlalchemy/dialects/sqlite/base.py
+++ b/lib/sqlalchemy/dialects/sqlite/base.py
@@ -409,7 +409,6 @@ class SQLiteDialect(default.DefaultDialect):
                 'type' : coltype,
                 'nullable' : nullable,
                 'default' : default,
-                'attrs' : {},
                 'primary_key': primary_key
             })
         return columns
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 3fcbb9b37b..9d0f2cb4cd 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -198,8 +198,14 @@ class Dialect(object):
         default
           the column's default value
 
-        attrs
-          dict containing optional column attributes
+        autoincrement
+          boolean
+
+        sequence
+          a dictionary of the form
+              {'name' : str, 'start' :int, 'increment': int}
+
+        Additional column attributes may be present.
         """
 
         raise NotImplementedError()
diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py
index 6cbb2e2be2..d4ee364520 100644
--- a/lib/sqlalchemy/engine/reflection.py
+++ b/lib/sqlalchemy/engine/reflection.py
@@ -283,9 +283,6 @@ class Inspector(object):
             coltype = col_d['type']
             nullable = col_d['nullable']
             default = col_d['default']
-            attrs = col_d['attrs']
-            # construct additional colargs with attrs
-            # currently, it's not used here.
             colargs = []
             col_kw = {}
             if 'autoincrement' in col_d:
-- 
2.47.3