summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/dialect/postgres.py3
-rw-r--r--test/profiling/compiler.py2
-rw-r--r--test/profiling/zoomark.py12
3 files changed, 10 insertions, 7 deletions
diff --git a/test/dialect/postgres.py b/test/dialect/postgres.py
index 82f41f80a..4affabb6c 100644
--- a/test/dialect/postgres.py
+++ b/test/dialect/postgres.py
@@ -101,6 +101,9 @@ class ReturningTest(AssertMixin):
result3 = table.insert(postgres_returning=[(table.c.id*2).label('double_id')]).execute({'persons': 4, 'full': False})
self.assertEqual([dict(row) for row in result3], [{'double_id':8}])
+
+ result4 = testbase.db.execute('insert into tables (id, persons, "full") values (5, 10, true) returning persons')
+ self.assertEqual([dict(row) for row in result4], [{'persons': 10}])
finally:
table.drop()
diff --git a/test/profiling/compiler.py b/test/profiling/compiler.py
index 544e674f3..6fa4f9659 100644
--- a/test/profiling/compiler.py
+++ b/test/profiling/compiler.py
@@ -24,7 +24,7 @@ class CompileTest(AssertMixin):
t1.update().compile()
# TODO: this is alittle high
- @profiling.profiled('ctest_select', call_range=(130, 150), always=True)
+ @profiling.profiled('ctest_select', call_range=(110, 130), always=True)
def test_select(self):
s = select([t1], t1.c.c2==t2.c.c1)
s.compile()
diff --git a/test/profiling/zoomark.py b/test/profiling/zoomark.py
index d18502c72..48f0432cb 100644
--- a/test/profiling/zoomark.py
+++ b/test/profiling/zoomark.py
@@ -50,7 +50,7 @@ class ZooMarkTest(testing.AssertMixin):
metadata.create_all()
@testing.supported('postgres')
- @profiling.profiled('populate', call_range=(2800, 3700), always=True)
+ @profiling.profiled('populate', call_range=(2700, 3700), always=True)
def test_1a_populate(self):
Zoo = metadata.tables['Zoo']
Animal = metadata.tables['Animal']
@@ -126,7 +126,7 @@ class ZooMarkTest(testing.AssertMixin):
tick = i.execute(Species='Tick', Name='Tick %d' % x, Legs=8)
@testing.supported('postgres')
- @profiling.profiled('properties', call_range=(2900, 3330), always=True)
+ @profiling.profiled('properties', call_range=(2300, 3030), always=True)
def test_3_properties(self):
Zoo = metadata.tables['Zoo']
Animal = metadata.tables['Animal']
@@ -149,7 +149,7 @@ class ZooMarkTest(testing.AssertMixin):
ticks = fullobject(Animal.select(Animal.c.Species=='Tick'))
@testing.supported('postgres')
- @profiling.profiled('expressions', call_range=(10350, 12200), always=True)
+ @profiling.profiled('expressions', call_range=(9200, 12050), always=True)
def test_4_expressions(self):
Zoo = metadata.tables['Zoo']
Animal = metadata.tables['Animal']
@@ -203,7 +203,7 @@ class ZooMarkTest(testing.AssertMixin):
assert len(fulltable(Animal.select(func.date_part('day', Animal.c.LastEscape) == 21))) == 1
@testing.supported('postgres')
- @profiling.profiled('aggregates', call_range=(960, 1170), always=True)
+ @profiling.profiled('aggregates', call_range=(800, 1170), always=True)
def test_5_aggregates(self):
Animal = metadata.tables['Animal']
Zoo = metadata.tables['Zoo']
@@ -245,7 +245,7 @@ class ZooMarkTest(testing.AssertMixin):
legs.sort()
@testing.supported('postgres')
- @profiling.profiled('editing', call_range=(1150, 1280), always=True)
+ @profiling.profiled('editing', call_range=(1050, 1180), always=True)
def test_6_editing(self):
Zoo = metadata.tables['Zoo']
@@ -274,7 +274,7 @@ class ZooMarkTest(testing.AssertMixin):
assert SDZ['Founded'] == datetime.date(1935, 9, 13)
@testing.supported('postgres')
- @profiling.profiled('multiview', call_range=(2300, 2500), always=True)
+ @profiling.profiled('multiview', call_range=(1900, 2300), always=True)
def test_7_multiview(self):
Zoo = metadata.tables['Zoo']
Animal = metadata.tables['Animal']