summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/oracle/base.py
diff options
context:
space:
mode:
authorDiana Clarke <diana.joan.clarke@gmail.com>2012-11-20 00:03:21 -0500
committerDiana Clarke <diana.joan.clarke@gmail.com>2012-11-20 00:03:21 -0500
commit63a953e59dbd3389f96c2ab39aa149dc0ba063e4 (patch)
tree503fc1de2a021927773dcf90c005e4de9061d6ab /lib/sqlalchemy/dialects/oracle/base.py
parent014e9128546a0c32cdd90ad5ccdcc21269987ee0 (diff)
downloadsqlalchemy-63a953e59dbd3389f96c2ab39aa149dc0ba063e4.tar.gz
just a pep8 pass
Diffstat (limited to 'lib/sqlalchemy/dialects/oracle/base.py')
-rw-r--r--lib/sqlalchemy/dialects/oracle/base.py34
1 files changed, 14 insertions, 20 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 5956a04b6..1daea3cef 100644
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -260,7 +260,6 @@ class ROWID(sqltypes.TypeEngine):
__visit_name__ = 'ROWID'
-
class _OracleBoolean(sqltypes.Boolean):
def get_dbapi_type(self, dbapi):
return dbapi.NUMBER
@@ -343,9 +342,11 @@ class OracleTypeCompiler(compiler.GenericTypeCompiler):
if precision is None:
return name
elif scale is None:
- return "%(name)s(%(precision)s)" % {'name':name,'precision': precision}
+ n = "%(name)s(%(precision)s)"
+ return n % {'name': name, 'precision': precision}
else:
- return "%(name)s(%(precision)s, %(scale)s)" % {'name':name,'precision': precision, 'scale' : scale}
+ n = "%(name)s(%(precision)s, %(scale)s)"
+ return n % {'name': name, 'precision': precision, 'scale': scale}
def visit_string(self, type_):
return self.visit_VARCHAR2(type_)
@@ -362,12 +363,11 @@ class OracleTypeCompiler(compiler.GenericTypeCompiler):
def _visit_varchar(self, type_, n, num):
if not n and self.dialect._supports_char_length:
- return "VARCHAR%(two)s(%(length)s CHAR)" % {
- 'length' : type_.length,
- 'two':num}
+ varchar = "VARCHAR%(two)s(%(length)s CHAR)"
+ return varchar % {'length': type_.length, 'two': num}
else:
- return "%(n)sVARCHAR%(two)s(%(length)s)" % {'length' : type_.length,
- 'two':num, 'n':n}
+ varchar = "%(n)sVARCHAR%(two)s(%(length)s)"
+ return varchar % {'length': type_.length, 'two': num, 'n': n}
def visit_text(self, type_):
return self.visit_CLOB(type_)
@@ -469,7 +469,7 @@ class OracleCompiler(compiler.SQLCompiler):
elif binary.right.table is join.right:
binary.right = _OuterJoinColumn(binary.right)
clauses.append(visitors.cloned_traverse(join.onclause, {},
- {'binary':visit_binary}))
+ {'binary': visit_binary}))
else:
clauses.append(join.onclause)
@@ -866,7 +866,6 @@ class OracleDialect(default.DefaultDialect):
cursor = connection.execute(s, owner=schema)
return [self.normalize_name(row[0]) for row in cursor]
-
@reflection.cache
def get_view_names(self, connection, schema=None, **kw):
schema = self.denormalize_name(schema or self.default_schema_name)
@@ -904,12 +903,12 @@ class OracleDialect(default.DefaultDialect):
"SELECT column_name, data_type, %(char_length_col)s, data_precision, data_scale, "
"nullable, data_default FROM ALL_TAB_COLUMNS%(dblink)s "
"WHERE table_name = :table_name AND owner = :owner "
- "ORDER BY column_id" % {'dblink': dblink, 'char_length_col':char_length_col}),
+ "ORDER BY column_id" % {'dblink': dblink, 'char_length_col': char_length_col}),
table_name=table_name, owner=schema)
for row in c:
(colname, orig_colname, coltype, length, precision, scale, nullable, default) = \
- (self.normalize_name(row[0]), row[0], row[1], row[2], row[3], row[4], row[5]=='Y', row[6])
+ (self.normalize_name(row[0]), row[0], row[1], row[2], row[3], row[4], row[5] == 'Y', row[6])
if coltype == 'NUMBER' :
coltype = NUMBER(precision, scale)
@@ -931,7 +930,7 @@ class OracleDialect(default.DefaultDialect):
'type': coltype,
'nullable': nullable,
'default': default,
- 'autoincrement':default is None
+ 'autoincrement': default is None
}
if orig_colname.lower() == orig_colname:
cdict['quote'] = True
@@ -943,7 +942,6 @@ class OracleDialect(default.DefaultDialect):
def get_indexes(self, connection, table_name, schema=None,
resolve_synonyms=False, dblink='', **kw):
-
info_cache = kw.get('info_cache')
(table_name, schema, dblink, synonym) = \
self._prepare_reflection_args(connection, table_name, schema,
@@ -1054,7 +1052,7 @@ class OracleDialect(default.DefaultDialect):
if constraint_name is None:
constraint_name = self.normalize_name(cons_name)
pkeys.append(local_column)
- return {'constrained_columns':pkeys, 'name':constraint_name}
+ return {'constrained_columns': pkeys, 'name': constraint_name}
@reflection.cache
def get_foreign_keys(self, connection, table_name, schema=None, **kw):
@@ -1103,7 +1101,7 @@ class OracleDialect(default.DefaultDialect):
util.warn(
("Got 'None' querying 'table_name' from "
"all_cons_columns%(dblink)s - does the user have "
- "proper rights to the table?") % {'dblink':dblink})
+ "proper rights to the table?") % {'dblink': dblink})
continue
rec = fkeys[cons_name]
@@ -1153,12 +1151,8 @@ class OracleDialect(default.DefaultDialect):
return None
-
class _OuterJoinColumn(sql.ClauseElement):
__visit_name__ = 'outer_join_column'
def __init__(self, column):
self.column = column
-
-
-