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

diff --git a/CHANGES b/CHANGES
index ffe8d4f78e9e9d806a961f03cbd228060f10ea29..fa98520c858b39f42569447ad9c1dcff1a849f0f 100644 (file)
--- 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 2039bdffe614f19e03cf32ad8a092cb4625726de..39364064fca3173753b972c9df58c38a04ae8bc2 100644 (file)
--- 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',