diff options
Diffstat (limited to 'lib/sqlalchemy/databases/sybase.py')
| -rw-r--r-- | lib/sqlalchemy/databases/sybase.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/sqlalchemy/databases/sybase.py b/lib/sqlalchemy/databases/sybase.py index 2551e90c5..14734c6e0 100644 --- a/lib/sqlalchemy/databases/sybase.py +++ b/lib/sqlalchemy/databases/sybase.py @@ -24,7 +24,7 @@ Known issues / TODO: import datetime, operator -from sqlalchemy import util, sql, schema, exceptions +from sqlalchemy import util, sql, schema, exc from sqlalchemy.sql import compiler, expression from sqlalchemy.engine import default, base from sqlalchemy import types as sqltypes @@ -160,11 +160,11 @@ class SybaseTypeError(sqltypes.TypeEngine): def bind_processor(self, dialect): def process(value): - raise exceptions.NotSupportedError("Data type not supported", [value]) + raise exc.NotSupportedError("Data type not supported", [value]) return process def get_col_spec(self): - raise exceptions.NotSupportedError("Data type not supported") + raise exc.NotSupportedError("Data type not supported") class SybaseNumeric(sqltypes.Numeric): def get_col_spec(self): @@ -487,7 +487,7 @@ class SybaseSQLDialect(default.DefaultDialect): dialect_cls = dialect_mapping[module_name] return dialect_cls.import_dbapi() except KeyError: - raise exceptions.InvalidRequestError("Unsupported SybaseSQL module '%s' requested (must be " + " or ".join([x for x in dialect_mapping.keys()]) + ")" % module_name) + raise exc.InvalidRequestError("Unsupported SybaseSQL module '%s' requested (must be " + " or ".join([x for x in dialect_mapping.keys()]) + ")" % module_name) else: for dialect_cls in dialect_mapping.values(): try: @@ -527,7 +527,7 @@ class SybaseSQLDialect(default.DefaultDialect): self.context.rowcount = c.rowcount c.DBPROP_COMMITPRESERVE = "Y" except Exception, e: - raise exceptions.DBAPIError.instance(statement, parameters, e) + raise exc.DBAPIError.instance(statement, parameters, e) def table_names(self, connection, schema): """Ignore the schema and the charset for now.""" @@ -597,7 +597,7 @@ class SybaseSQLDialect(default.DefaultDialect): (type, name)) coltype = sqltypes.NULLTYPE coltype = coltype(*args) - colargs= [] + colargs = [] if default is not None: colargs.append(schema.PassiveDefault(sql.text(default))) @@ -624,16 +624,16 @@ class SybaseSQLDialect(default.DefaultDialect): row[0], row[1], row[2], row[3], ) if not primary_table in foreignKeys.keys(): - foreignKeys[primary_table] = [['%s'%(foreign_column)], ['%s.%s'%(primary_table,primary_column)]] + foreignKeys[primary_table] = [['%s' % (foreign_column)], ['%s.%s'%(primary_table, primary_column)]] else: foreignKeys[primary_table][0].append('%s'%(foreign_column)) - foreignKeys[primary_table][1].append('%s.%s'%(primary_table,primary_column)) + foreignKeys[primary_table][1].append('%s.%s'%(primary_table, primary_column)) for primary_table in foreignKeys.keys(): #table.append_constraint(schema.ForeignKeyConstraint(['%s.%s'%(foreign_table, foreign_column)], ['%s.%s'%(primary_table,primary_column)])) table.append_constraint(schema.ForeignKeyConstraint(foreignKeys[primary_table][0], foreignKeys[primary_table][1])) if not found_table: - raise exceptions.NoSuchTableError(table.name) + raise exc.NoSuchTableError(table.name) class SybaseSQLDialect_mxodbc(SybaseSQLDialect): @@ -749,7 +749,7 @@ class SybaseSQLCompiler(compiler.DefaultCompiler): def bindparam_string(self, name): res = super(SybaseSQLCompiler, self).bindparam_string(name) if name.lower().startswith('literal'): - res = 'STRING(%s)'%res + res = 'STRING(%s)' % res return res def get_select_precolumns(self, select): @@ -828,7 +828,7 @@ class SybaseSQLSchemaGenerator(compiler.SchemaGenerator): #colspec += " numeric(30,0) IDENTITY" colspec += " Integer IDENTITY" else: - colspec += " " + column.type.dialect_impl(self.dialect, _for_ddl=column).get_col_spec() + colspec += " " + column.type.dialect_impl(self.dialect).get_col_spec() if not column.nullable: colspec += " NOT NULL" |