Skip to content

Commit 0aa03d7

Browse files
committed
Re-enable the tests on the README file
Since 5e5e6d259b9b the tests were disabled
1 parent 38ad704 commit 0aa03d7

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

README.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,23 +106,23 @@ Select on other schema::
106106
Insert query with default values::
107107

108108
>>> tuple(user.insert())
109-
('INSERT INTO "user" AS "a" DEFAULT VALUES', ())
109+
('INSERT INTO "user" DEFAULT VALUES', ())
110110

111111
Insert query with values::
112112

113113
>>> tuple(user.insert(columns=[user.name, user.login],
114114
... values=[['Foo', 'foo']]))
115-
('INSERT INTO "user" AS "a" ("name", "login") VALUES (%s, %s)', ('Foo', 'foo'))
115+
('INSERT INTO "user" ("name", "login") VALUES (%s, %s)', ('Foo', 'foo'))
116116
>>> tuple(user.insert(columns=[user.name, user.login],
117117
... values=[['Foo', 'foo'], ['Bar', 'bar']]))
118-
('INSERT INTO "user" AS "a" ("name", "login") VALUES (%s, %s), (%s, %s)', ('Foo', 'foo', 'Bar', 'bar'))
118+
('INSERT INTO "user" ("name", "login") VALUES (%s, %s), (%s, %s)', ('Foo', 'foo', 'Bar', 'bar'))
119119

120120
Insert query with query::
121121

122122
>>> passwd = Table('passwd')
123123
>>> select = passwd.select(passwd.login, passwd.passwd)
124124
>>> tuple(user.insert(values=select))
125-
('INSERT INTO "user" AS "b" SELECT "a"."login", "a"."passwd" FROM "passwd" AS "a"', ())
125+
('INSERT INTO "user" SELECT "a"."login", "a"."passwd" FROM "passwd" AS "a"', ())
126126

127127
Update query with values::
128128

@@ -166,23 +166,23 @@ Flavors::
166166
>>> select.offset = 10
167167
>>> Flavor.set(Flavor())
168168
>>> tuple(select)
169-
('SELECT * FROM "user" AS "a" OFFSET 10', ())
169+
('SELECT * FROM "user" AS "a" OFFSET %s', (10,))
170170
>>> Flavor.set(Flavor(max_limit=18446744073709551615))
171171
>>> tuple(select)
172-
('SELECT * FROM "user" AS "a" LIMIT 18446744073709551615 OFFSET 10', ())
172+
('SELECT * FROM "user" AS "a" LIMIT 18446744073709551615 OFFSET %s', (10,))
173173
>>> Flavor.set(Flavor(max_limit=-1))
174174
>>> tuple(select)
175-
('SELECT * FROM "user" AS "a" LIMIT -1 OFFSET 10', ())
175+
('SELECT * FROM "user" AS "a" LIMIT -1 OFFSET %s', (10,))
176176

177177
Limit style::
178178

179179
>>> select = user.select(limit=10, offset=20)
180180
>>> Flavor.set(Flavor(limitstyle='limit'))
181181
>>> tuple(select)
182-
('SELECT * FROM "user" AS "a" LIMIT 10 OFFSET 20', ())
182+
('SELECT * FROM "user" AS "a" LIMIT %s OFFSET %s', (10, 20))
183183
>>> Flavor.set(Flavor(limitstyle='fetch'))
184184
>>> tuple(select)
185-
('SELECT * FROM "user" AS "a" OFFSET (20) ROWS FETCH FIRST (10) ROWS ONLY', ())
185+
('SELECT * FROM "user" AS "a" OFFSET (%s) ROWS FETCH FIRST (%s) ROWS ONLY', (20, 10))
186186
>>> Flavor.set(Flavor(limitstyle='rownum'))
187187
>>> tuple(select)
188188
('SELECT "a".* FROM (SELECT "b".*, ROWNUM AS "rnum" FROM (SELECT * FROM "user" AS "c") AS "b" WHERE (ROWNUM <= %s)) AS "a" WHERE ("rnum" > %s)', (30, 20))

sql/tests/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import sql
77

88
here = os.path.dirname(__file__)
9-
readme = os.path.normpath(os.path.join(here, '..', '..', 'README'))
9+
readme = os.path.normpath(os.path.join(here, '..', '..', 'README.rst'))
1010

1111

1212
def load_tests(loader, tests, pattern):

0 commit comments

Comments
 (0)