diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-11-12 15:48:40 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-11-12 15:48:40 -0500 |
| commit | 6397a4ff4bce537487a3b30552622544868da9a0 (patch) | |
| tree | ec7e985ee344749c47bd8a1f5e44c3851713960f /lib/sqlalchemy/dialects/oracle | |
| parent | 37c943233a4b01428cf4b67d766d2685309ab0e8 (diff) | |
| download | sqlalchemy-6397a4ff4bce537487a3b30552622544868da9a0.tar.gz | |
Fixed bug in type_coerce() whereby typing information
could be lost if the statement were used as a subquery
inside of another statement, as well as other similar
situations. Among other things, would cause
typing information to be lost when the Oracle/mssql dialects
would apply limit/offset wrappings. [ticket:2603]
Diffstat (limited to 'lib/sqlalchemy/dialects/oracle')
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/base.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/__init__.py b/lib/sqlalchemy/dialects/oracle/__init__.py index 34192530a..a4235f023 100644 --- a/lib/sqlalchemy/dialects/oracle/__init__.py +++ b/lib/sqlalchemy/dialects/oracle/__init__.py @@ -12,7 +12,7 @@ from sqlalchemy.dialects.oracle.base import \ VARCHAR, NVARCHAR, CHAR, DATE, DATETIME, NUMBER,\ BLOB, BFILE, CLOB, NCLOB, TIMESTAMP, RAW,\ FLOAT, DOUBLE_PRECISION, LONG, dialect, INTERVAL,\ - VARCHAR2, NVARCHAR2, ROWID + VARCHAR2, NVARCHAR2, ROWID, dialect __all__ = ( diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py index 7b1470f63..7a4d835c9 100644 --- a/lib/sqlalchemy/dialects/oracle/base.py +++ b/lib/sqlalchemy/dialects/oracle/base.py @@ -586,7 +586,7 @@ class OracleCompiler(compiler.SQLCompiler): limitselect._is_wrapper = True offsetselect = sql.select( - [c for c in limitselect.c if c.key!='ora_rn']) + [c for c in limitselect.c if c.key != 'ora_rn']) offsetselect._oracle_visit = True offsetselect._is_wrapper = True @@ -594,7 +594,7 @@ class OracleCompiler(compiler.SQLCompiler): if not self.dialect.use_binds_for_limits: offset_value = sql.literal_column("%d" % offset_value) offsetselect.append_whereclause( - sql.literal_column("ora_rn")>offset_value) + sql.literal_column("ora_rn") > offset_value) offsetselect.for_update = select.for_update select = offsetselect |