From: Lele Gaifax Date: Fri, 7 Aug 2009 12:10:33 +0000 (+0000) Subject: M-x whitespace-cleanup X-Git-Tag: rel_0_6beta1~357 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a9ce60778f0a0b660f636ac205ecf64bb65f48f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git M-x whitespace-cleanup --- diff --git a/lib/sqlalchemy/dialects/firebird/base.py b/lib/sqlalchemy/dialects/firebird/base.py index 57b89ed058..e9d0c0319e 100644 --- a/lib/sqlalchemy/dialects/firebird/base.py +++ b/lib/sqlalchemy/dialects/firebird/base.py @@ -257,10 +257,10 @@ class FBCompiler(sql.compiler.SQLCompiler): columns = [ self.process( - self.label_select_column(None, c, asfrom=False), - within_columns_clause=True, + self.label_select_column(None, c, asfrom=False), + within_columns_clause=True, result_map=self.result_map - ) + ) for c in expression._select_iterables(returning_cols) ] return 'RETURNING ' + ', '.join(columns) @@ -311,12 +311,12 @@ class FBDialect(default.DefaultDialect): name = 'firebird' max_identifier_length = 31 - + supports_sequences = True sequences_optional = False supports_default_values = True postfetch_lastrowid = False - + requires_name_normalize = True supports_empty_insert = False @@ -346,7 +346,7 @@ class FBDialect(default.DefaultDialect): } else: self.implicit_returning = True - + def normalize_name(self, name): # Remove trailing spaces: FB uses a CHAR() type, # that is padded with spaces