From: Jason Kirtland <jek@discorporate.us>
Date: Tue, 5 Jun 2007 19:31:42 +0000 (+0000)
Subject: - Rearrange placement of 'fields' (mysql 4.1 reserved word) so that it
X-Git-Tag: rel_0_3_9~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8d99d81188c32c805f08b0a4fba4240f7045a61;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Rearrange placement of 'fields' (mysql 4.1 reserved word) so that it
  won't accidentally get lost
---

diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 39364064fc..451b7f36cf 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', 'fields', 'float', 'float4', 'float8',
+     'exit', 'explain', 'false', 'fetch', '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',
@@ -49,9 +49,11 @@ RESERVED_WORDS = util.Set(
      'union', 'unique', 'unlock', 'unsigned', 'update', 'usage', 'use',
      'using', 'utc_date', 'utc_time', 'utc_timestamp', 'values', 'varbinary',
      'varchar', 'varcharacter', 'varying', 'when', 'where', 'while', 'with',
-     'write', 'x509', 'xor', 'year_month', 'zerofill',
+     'write', 'x509', 'xor', 'year_month', 'zerofill', # 5.0
+     'fields', # 4.1
      'accessible', 'linear', 'master_ssl_verify_server_cert', 'range',
-     'read_only', 'read_write'])
+     'read_only', 'read_write', # 5.1
+     ])
 
 class _NumericType(object):
     "Base for MySQL numeric types."