summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2007-06-05 19:31:42 +0000
committerJason Kirtland <jek@discorporate.us>2007-06-05 19:31:42 +0000
commitf8d99d81188c32c805f08b0a4fba4240f7045a61 (patch)
treefaa219d5b997fb0de700d71e029c03e687cd308b /lib/sqlalchemy/databases
parentd761c24892a3a6412e2fc5045f59b5c6af8d4dc8 (diff)
downloadsqlalchemy-f8d99d81188c32c805f08b0a4fba4240f7045a61.tar.gz
- Rearrange placement of 'fields' (mysql 4.1 reserved word) so that it
won't accidentally get lost
Diffstat (limited to 'lib/sqlalchemy/databases')
-rw-r--r--lib/sqlalchemy/databases/mysql.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 39364064f..451b7f36c 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."