summaryrefslogtreecommitdiff
path: root/test/engine
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-11-16 15:53:14 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2010-11-16 15:53:14 -0500
commit041a329e69f6aa60bdd2f3fb87b5172481806c4a (patch)
tree30df0342ad2499d30964c70c6f2bddb9dfede714 /test/engine
parent40d5a32e59a49075129211358f00e857dac73885 (diff)
downloadsqlalchemy-041a329e69f6aa60bdd2f3fb87b5172481806c4a.tar.gz
- adapt initial patch from [ticket:1917] to current tip
- raise TypeError for immutability
Diffstat (limited to 'test/engine')
-rw-r--r--test/engine/test_metadata.py27
-rw-r--r--test/engine/test_reflection.py1
2 files changed, 26 insertions, 2 deletions
diff --git a/test/engine/test_metadata.py b/test/engine/test_metadata.py
index b2250c808..b3a9cef2e 100644
--- a/test/engine/test_metadata.py
+++ b/test/engine/test_metadata.py
@@ -353,7 +353,6 @@ class MetaDataTest(TestBase, ComparesTables):
[d, b, a, c, e]
)
-
def test_tometadata_strip_schema(self):
meta = MetaData()
@@ -387,7 +386,7 @@ class MetaDataTest(TestBase, ComparesTables):
MetaData(testing.db), autoload=True)
-class TableOptionsTest(TestBase, AssertsCompiledSQL):
+class TableTest(TestBase, AssertsCompiledSQL):
def test_prefixes(self):
table1 = Table("temporary_table_1", MetaData(),
Column("col1", Integer),
@@ -418,3 +417,27 @@ class TableOptionsTest(TestBase, AssertsCompiledSQL):
t.info['bar'] = 'zip'
assert t.info['bar'] == 'zip'
+ def test_c_immutable(self):
+ m = MetaData()
+ t1 = Table('t', m, Column('x', Integer), Column('y', Integer))
+ assert_raises(
+ TypeError,
+ t1.c.extend, [Column('z', Integer)]
+ )
+
+ def assign():
+ t1.c['z'] = Column('z', Integer)
+ assert_raises(
+ TypeError,
+ assign
+ )
+
+ def assign():
+ t1.c.z = Column('z', Integer)
+ assert_raises(
+ TypeError,
+ assign
+ )
+
+
+ \ No newline at end of file
diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py
index d0d6e31e1..91e73d4f2 100644
--- a/test/engine/test_reflection.py
+++ b/test/engine/test_reflection.py
@@ -611,6 +611,7 @@ class ReflectionTest(TestBase, ComparesTables):
self.assert_tables_equal(multi, table)
self.assert_tables_equal(multi2, table2)
j = sa.join(table, table2)
+
self.assert_(sa.and_(table.c.multi_id == table2.c.foo,
table.c.multi_rev == table2.c.bar,
table.c.multi_hoho