From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 5 Jun 2007 19:19:16 +0000 (+0000)
Subject: - added 'fields' to reserved words [ticket:590]
X-Git-Tag: rel_0_3_9~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d761c24892a3a6412e2fc5045f59b5c6af8d4dc8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- added 'fields' to reserved words [ticket:590]
---

diff --git a/CHANGES b/CHANGES
index ffe8d4f78e..fa98520c85 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 - sql
     - long-identifier detection fixed to use > rather than >= for 
       max ident length [ticket:589]
+- mysql
+    - added 'fields' to reserved words [ticket:590]
+    
 0.3.8
 - engines
     - added detach() to Connection, allows underlying DBAPI connection
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 2039bdffe6..39364064fc 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -24,7 +24,7 @@ RESERVED_WORDS = util.Set(
      'declare', 'default', 'delayed', 'delete', 'desc', 'describe',
      'deterministic', 'distinct', 'distinctrow', 'div', 'double', 'drop',
      'dual', 'each', 'else', 'elseif', 'enclosed', 'escaped', 'exists',
-     'exit', 'explain', 'false', 'fetch', 'float', 'float4', 'float8',
+     'exit', 'explain', 'false', 'fetch', 'fields', 'float', 'float4', 'float8',
      'for', 'force', 'foreign', 'from', 'fulltext', 'grant', 'group', 'having',
      'high_priority', 'hour_microsecond', 'hour_minute', 'hour_second', 'if',
      'ignore', 'in', 'index', 'infile', 'inner', 'inout', 'insensitive',