From: Mike Bayer Date: Sun, 8 Mar 2015 18:16:59 +0000 (-0400) Subject: - fix some more result_map calls X-Git-Tag: rel_1_0_0b1~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c9a0e18beadd73c94b8de4cba06eae2d78d2061;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - fix some more result_map calls --- diff --git a/test/dialect/mssql/test_compiler.py b/test/dialect/mssql/test_compiler.py index 54a23ee6e0..0eb369ed96 100644 --- a/test/dialect/mssql/test_compiler.py +++ b/test/dialect/mssql/test_compiler.py @@ -418,7 +418,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): ) c = s.compile(dialect=mssql.MSDialect()) eq_(len(c._result_columns), 2) - assert t.c.x in set(c.result_map['x'][1]) + assert t.c.x in set(c._create_result_map()['x'][1]) def test_offset_using_window(self): t = table('t', column('x', Integer), column('y', Integer)) @@ -439,7 +439,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): c = s.compile(dialect=mssql.MSDialect()) eq_(len(c._result_columns), 2) - assert t.c.x in set(c.result_map['x'][1]) + assert t.c.x in set(c._create_result_map()['x'][1]) def test_limit_offset_using_window(self): t = table('t', column('x', Integer), column('y', Integer)) @@ -458,8 +458,8 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): ) c = s.compile(dialect=mssql.MSDialect()) eq_(len(c._result_columns), 2) - assert t.c.x in set(c.result_map['x'][1]) - assert t.c.y in set(c.result_map['y'][1]) + assert t.c.x in set(c._create_result_map()['x'][1]) + assert t.c.y in set(c._create_result_map()['y'][1]) def test_limit_offset_with_correlated_order_by(self): t1 = table('t1', column('x', Integer), column('y', Integer)) @@ -484,8 +484,8 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): c = s.compile(dialect=mssql.MSDialect()) eq_(len(c._result_columns), 2) - assert t1.c.x in set(c.result_map['x'][1]) - assert t1.c.y in set(c.result_map['y'][1]) + assert t1.c.x in set(c._create_result_map()['x'][1]) + assert t1.c.y in set(c._create_result_map()['y'][1]) def test_limit_zero_offset_using_window(self): t = table('t', column('x', Integer), column('y', Integer)) diff --git a/test/dialect/mssql/test_query.py b/test/dialect/mssql/test_query.py index e0affe831f..3fce5e6fc3 100644 --- a/test/dialect/mssql/test_query.py +++ b/test/dialect/mssql/test_query.py @@ -35,12 +35,12 @@ class SchemaAliasingTest(fixtures.TestBase, AssertsCompiledSQL): def test_result_map(self): s = self.t2.select() c = s.compile(dialect=self.__dialect__) - assert self.t2.c.a in set(c.result_map['a'][1]) + assert self.t2.c.a in set(c._create_result_map()['a'][1]) def test_result_map_use_labels(self): s = self.t2.select(use_labels=True) c = s.compile(dialect=self.__dialect__) - assert self.t2.c.a in set(c.result_map['schema_t2_a'][1]) + assert self.t2.c.a in set(c._create_result_map()['schema_t2_a'][1]) def test_straight_select(self): self.assert_compile(self.t2.select(), diff --git a/test/dialect/test_oracle.py b/test/dialect/test_oracle.py index 58ea058c26..e080568cf3 100644 --- a/test/dialect/test_oracle.py +++ b/test/dialect/test_oracle.py @@ -229,7 +229,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): t = table('sometable', column('col1'), column('col2')) s = select([t]) c = s.compile(dialect=oracle.OracleDialect()) - assert t.c.col1 in set(c.result_map['col1'][1]) + assert t.c.col1 in set(c._create_result_map()['col1'][1]) s = select([t]).limit(10).offset(20) self.assert_compile(s, 'SELECT col1, col2 FROM (SELECT col1, ' @@ -241,7 +241,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): c = s.compile(dialect=oracle.OracleDialect()) eq_(len(c._result_columns), 2) - assert t.c.col1 in set(c.result_map['col1'][1]) + assert t.c.col1 in set(c._create_result_map()['col1'][1]) s2 = select([s.c.col1, s.c.col2]) self.assert_compile(s2, @@ -262,7 +262,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): ':param_2)') c = s2.compile(dialect=oracle.OracleDialect()) eq_(len(c._result_columns), 2) - assert s.c.col1 in set(c.result_map['col1'][1]) + assert s.c.col1 in set(c._create_result_map()['col1'][1]) s = select([t]).limit(10).offset(20).order_by(t.c.col2) self.assert_compile(s, @@ -276,7 +276,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): ) c = s.compile(dialect=oracle.OracleDialect()) eq_(len(c._result_columns), 2) - assert t.c.col1 in set(c.result_map['col1'][1]) + assert t.c.col1 in set(c._create_result_map()['col1'][1]) s = select([t], for_update=True).limit(10).order_by(t.c.col2) self.assert_compile(s, @@ -347,7 +347,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): stmt = select([type_coerce(column('x'), MyType).label('foo')]).limit(1) dialect = oracle.dialect() compiled = stmt.compile(dialect=dialect) - assert isinstance(compiled.result_map['foo'][-1], MyType) + assert isinstance(compiled._create_result_map()['foo'][-1], MyType) def test_use_binds_for_limits_disabled(self): t = table('sometable', column('col1'), column('col2')) @@ -659,7 +659,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): stmt = t1.insert().values(c1=1).returning(fn, t1.c.c3) compiled = stmt.compile(dialect=oracle.dialect()) eq_( - compiled.result_map, + compiled._create_result_map(), {'ret_1': ('ret_1', (t1.c.c3, 'c3', 'c3'), t1.c.c3.type), 'ret_0': ('ret_0', (fn, 'lower', None), fn.type)}