From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 5 Sep 2014 21:03:43 +0000 (-0400)
Subject: - set flavor to "index" here as MySQL is sending None
X-Git-Tag: rel_0_9_8~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb03b4d837629e6a0b81817f823a437831424604;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- set flavor to "index" here as MySQL is sending None
---

diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py
index cf1f2d3dd1..48a70664f1 100644
--- a/lib/sqlalchemy/engine/reflection.py
+++ b/lib/sqlalchemy/engine/reflection.py
@@ -583,7 +583,7 @@ class Inspector(object):
                     not set(columns).issubset(include_columns):
                 util.warn(
                     "Omitting %s key for (%s), key covers omitted columns." %
-                    (flavor, ', '.join(columns)))
+                    (flavor or "index", ', '.join(columns)))
                 continue
             # look for columns by orig name in cols_by_orig_name,
             # but support columns that are in-Python only as fallback
@@ -596,7 +596,7 @@ class Inspector(object):
                     util.warn(
                         "%s key '%s' was not located in "
                         "columns for table '%s'" % (
-                            flavor, c, table_name
+                            flavor or "index", c, table_name
                         ))
                 else:
                     idx_cols.append(idx_col)