Revert #216 until I can get tests to pass in Travis

Revert "Fix for _sort_desc=sortable_with_nulls test, refs #216"

This reverts commit 07fc2d113e.

Revert "Fixed #216 - paginate correctly when sorting by nullable column"

This reverts commit 2abe539a0f.
This commit is contained in:
Simon Willison 2018-04-16 17:52:22 -07:00
commit 5364fa7f33
No known key found for this signature in database
GPG key ID: 17E2DEA2588B7F52
3 changed files with 14 additions and 61 deletions

View file

@ -55,7 +55,6 @@ def generate_sortable_rows(num):
'sortable_with_nulls_2': rand.choice([
None, rand.random(), rand.random()
]),
'text': rand.choice(['$null', '$blah']),
}
@ -79,7 +78,6 @@ METADATA = {
'sortable',
'sortable_with_nulls',
'sortable_with_nulls_2',
'text',
]
},
'no_primary_key': {
@ -155,7 +153,6 @@ CREATE TABLE sortable (
sortable integer,
sortable_with_nulls real,
sortable_with_nulls_2 real,
text text,
PRIMARY KEY (pk1, pk2)
);
@ -238,7 +235,7 @@ CREATE VIEW simple_view AS
]) + '\n'.join([
'''INSERT INTO sortable VALUES (
"{pk1}", "{pk2}", "{content}", {sortable},
{sortable_with_nulls}, {sortable_with_nulls_2}, "{text}");
{sortable_with_nulls}, {sortable_with_nulls_2});
'''.format(
**row
).replace('None', 'null') for row in generate_sortable_rows(201)