diff options
| author | Diana Clarke <diana.joan.clarke@gmail.com> | 2012-11-19 23:29:08 -0500 | 
|---|---|---|
| committer | Diana Clarke <diana.joan.clarke@gmail.com> | 2012-11-19 23:29:08 -0500 | 
| commit | 014e9128546a0c32cdd90ad5ccdcc21269987ee0 (patch) | |
| tree | 915a9c89a5d3cd5d914867b3ab628c5f6f33bd8b /lib/sqlalchemy/dialects/oracle | |
| parent | e0dc5ed803de7a57de033c16f2fa0044b59ce374 (diff) | |
| download | sqlalchemy-014e9128546a0c32cdd90ad5ccdcc21269987ee0.tar.gz | |
juts a 'expected 2 blank lines' pep8 pass
Diffstat (limited to 'lib/sqlalchemy/dialects/oracle')
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/base.py | 12 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/cx_oracle.py | 19 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/zxjdbc.py | 1 | 
3 files changed, 31 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py index 7a4d835c9..5956a04b6 100644 --- a/lib/sqlalchemy/dialects/oracle/base.py +++ b/lib/sqlalchemy/dialects/oracle/base.py @@ -164,18 +164,22 @@ RESERVED_WORDS = \  NO_ARG_FNS = set('UID CURRENT_DATE SYSDATE USER '                  'CURRENT_TIME CURRENT_TIMESTAMP'.split()) +  class RAW(sqltypes._Binary):      __visit_name__ = 'RAW'  OracleRaw = RAW +  class NCLOB(sqltypes.Text):      __visit_name__ = 'NCLOB' +  class VARCHAR2(VARCHAR):      __visit_name__ = 'VARCHAR2'  NVARCHAR2 = NVARCHAR +  class NUMBER(sqltypes.Numeric, sqltypes.Integer):      __visit_name__ = 'NUMBER' @@ -207,12 +211,15 @@ class DOUBLE_PRECISION(sqltypes.Numeric):          super(DOUBLE_PRECISION, self).__init__(precision=precision, scale=scale, asdecimal=asdecimal) +  class BFILE(sqltypes.LargeBinary):      __visit_name__ = 'BFILE' +  class LONG(sqltypes.Text):      __visit_name__ = 'LONG' +  class INTERVAL(sqltypes.TypeEngine):      __visit_name__ = 'INTERVAL' @@ -243,6 +250,7 @@ class INTERVAL(sqltypes.TypeEngine):      def _type_affinity(self):          return sqltypes.Interval +  class ROWID(sqltypes.TypeEngine):      """Oracle ROWID type. @@ -388,6 +396,7 @@ class OracleTypeCompiler(compiler.GenericTypeCompiler):      def visit_ROWID(self, type_):          return "ROWID" +  class OracleCompiler(compiler.SQLCompiler):      """Oracle compiler modifies the lexical structure of Select      statements to work under non-ANSI configured Oracle databases, if @@ -613,6 +622,7 @@ class OracleCompiler(compiler.SQLCompiler):          else:              return super(OracleCompiler, self).for_update_clause(select) +  class OracleDDLCompiler(compiler.DDLCompiler):      def define_constraint_cascades(self, constraint): @@ -634,6 +644,7 @@ class OracleDDLCompiler(compiler.DDLCompiler):          return super(OracleDDLCompiler, self).\                      visit_create_index(create, include_schema=True) +  class OracleIdentifierPreparer(compiler.IdentifierPreparer):      reserved_words = set([x.lower() for x in RESERVED_WORDS]) @@ -658,6 +669,7 @@ class OracleExecutionContext(default.DefaultExecutionContext):                      self.dialect.identifier_preparer.format_sequence(seq) +                      ".nextval FROM DUAL", type_) +  class OracleDialect(default.DefaultDialect):      name = 'oracle'      supports_alter = True diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index 233f3cb27..50c8550ed 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -155,12 +155,12 @@ from .base import OracleCompiler, OracleDialect, \  from . import base as oracle  from ...engine import result as _result  from sqlalchemy import types as sqltypes, util, exc, processors -from datetime import datetime  import random  import collections  from sqlalchemy.util.compat import decimal  import re +  class _OracleNumeric(sqltypes.Numeric):      def bind_processor(self, dialect):          # cx_oracle accepts Decimal objects and floats @@ -204,6 +204,7 @@ class _OracleNumeric(sqltypes.Numeric):              return super(_OracleNumeric, self).\                              result_processor(dialect, coltype) +  class _OracleDate(sqltypes.Date):      def bind_processor(self, dialect):          return None @@ -216,6 +217,7 @@ class _OracleDate(sqltypes.Date):                  return value          return process +  class _LOBMixin(object):      def result_processor(self, dialect, coltype):          if not dialect.auto_convert_lobs: @@ -229,6 +231,7 @@ class _LOBMixin(object):                  return value          return process +  class _NativeUnicodeMixin(object):      # Py3K      #pass @@ -249,21 +252,26 @@ class _NativeUnicodeMixin(object):      # unicode in all cases, so the "native_unicode" flag      # will be set for the default String.result_processor. +  class _OracleChar(_NativeUnicodeMixin, sqltypes.CHAR):      def get_dbapi_type(self, dbapi):          return dbapi.FIXED_CHAR +  class _OracleNVarChar(_NativeUnicodeMixin, sqltypes.NVARCHAR):      def get_dbapi_type(self, dbapi):          return getattr(dbapi, 'UNICODE', dbapi.STRING) +  class _OracleText(_LOBMixin, sqltypes.Text):      def get_dbapi_type(self, dbapi):          return dbapi.CLOB +  class _OracleString(_NativeUnicodeMixin, sqltypes.String):      pass +  class _OracleUnicodeText(_LOBMixin, _NativeUnicodeMixin, sqltypes.UnicodeText):      def get_dbapi_type(self, dbapi):          return dbapi.NCLOB @@ -282,6 +290,7 @@ class _OracleUnicodeText(_LOBMixin, _NativeUnicodeMixin, sqltypes.UnicodeText):                  return string_processor(lob_processor(value))              return process +  class _OracleInteger(sqltypes.Integer):      def result_processor(self, dialect, coltype):          def to_int(val): @@ -290,6 +299,7 @@ class _OracleInteger(sqltypes.Integer):              return val          return to_int +  class _OracleBinary(_LOBMixin, sqltypes.LargeBinary):      def get_dbapi_type(self, dbapi):          return dbapi.BLOB @@ -297,17 +307,21 @@ class _OracleBinary(_LOBMixin, sqltypes.LargeBinary):      def bind_processor(self, dialect):          return None +  class _OracleInterval(oracle.INTERVAL):      def get_dbapi_type(self, dbapi):          return dbapi.INTERVAL +  class _OracleRaw(oracle.RAW):      pass +  class _OracleRowid(oracle.ROWID):      def get_dbapi_type(self, dbapi):          return dbapi.ROWID +  class OracleCompiler_cx_oracle(OracleCompiler):      def bindparam_string(self, name, quote=None, **kw):          if quote is True or quote is not False and \ @@ -421,6 +435,7 @@ class OracleExecutionContext_cx_oracle(OracleExecutionContext):          return result +  class OracleExecutionContext_cx_oracle_with_unicode(OracleExecutionContext_cx_oracle):      """Support WITH_UNICODE in Python 2.xx. @@ -442,6 +457,7 @@ class OracleExecutionContext_cx_oracle_with_unicode(OracleExecutionContext_cx_or          return super(OracleExecutionContext_cx_oracle_with_unicode, self).\                              _execute_scalar(unicode(stmt)) +  class ReturningResultProxy(_result.FullyBufferedResultProxy):      """Result proxy which stuffs the _returning clause + outparams into the fetch.""" @@ -461,6 +477,7 @@ class ReturningResultProxy(_result.FullyBufferedResultProxy):          return collections.deque([tuple(self._returning_params["ret_%d" % i]                      for i, c in enumerate(self._returning_params))]) +  class OracleDialect_cx_oracle(OracleDialect):      execution_ctx_cls = OracleExecutionContext_cx_oracle      statement_compiler = OracleCompiler_cx_oracle diff --git a/lib/sqlalchemy/dialects/oracle/zxjdbc.py b/lib/sqlalchemy/dialects/oracle/zxjdbc.py index 54608969b..7c828331b 100644 --- a/lib/sqlalchemy/dialects/oracle/zxjdbc.py +++ b/lib/sqlalchemy/dialects/oracle/zxjdbc.py @@ -24,6 +24,7 @@ import collections  SQLException = zxJDBC = None +  class _ZxJDBCDate(sqltypes.Date):      def result_processor(self, dialect, coltype):  | 
