summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-07-24 12:55:49 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2011-07-24 12:55:49 -0400
commit05cbb6b2511d49f8829e54ffe7f6099f42b67b4b (patch)
tree5aeb473cf230b8bebc6ab8225718ab29fb393d18
parente1f9f9635ed60a738905364a585762efc1a01c56 (diff)
downloadsqlalchemy-05cbb6b2511d49f8829e54ffe7f6099f42b67b4b.tar.gz
- added CURRENT to reserved word list.
[ticket:2212] Also in 0.6.9.
-rw-r--r--CHANGES3
-rw-r--r--lib/sqlalchemy/dialects/oracle/base.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 15c530fe5..6744bfb0b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -195,6 +195,9 @@ CHANGES
generate the correct DDL. [ticket:2220]
Also in 0.6.9.
+ - added CURRENT to reserved word list.
+ [ticket:2212] Also in 0.6.9.
+
-ext
- Fixed bug in the mutable extension whereby
if the same type were used twice in one
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index b83eb0ffa..ff7020851 100644
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -158,7 +158,7 @@ RESERVED_WORDS = \
'AS IN VIEW EXCLUSIVE COMPRESS SYNONYM SELECT INSERT EXISTS '\
'NOT TRIGGER ELSE CREATE INTERSECT PCTFREE DISTINCT USER '\
'CONNECT SET MODE OF UNIQUE VARCHAR2 VARCHAR LOCK OR CHAR '\
- 'DECIMAL UNION PUBLIC AND START UID COMMENT'.split())
+ 'DECIMAL UNION PUBLIC AND START UID COMMENT CURRENT'.split())
NO_ARG_FNS = set('UID CURRENT_DATE SYSDATE USER '
'CURRENT_TIME CURRENT_TIMESTAMP'.split())