X-Git-Url: https://git.jsancho.org/?p=datasette-pytables.git;a=blobdiff_plain;f=tests%2Ftest_api.py;h=71c926277900aeaea63a1de202886797f2e08a2d;hp=80e379c93d81595d7584647c1654b6390eaef7a7;hb=8f981acbd074be2eec098253112f8ef479373a5e;hpb=745f744d01ebe1eff321fb70c580eac1f8b3ad4f

diff --git a/tests/test_api.py b/tests/test_api.py
index 80e379c..71c9262 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -143,19 +143,16 @@ def test_table_json(app_client):
     )
     assert response.status == 200
     data = response.json
-    assert data['query']['sql'] == 'select rowid, * from [/group2/table2] order by rowid limit 51'
+    assert data['query']['sql'] == 'select identity, idnumber, speed from [/group2/table2] limit 51'
     assert data['rows'][3:6] == [{
-        'rowid': 3,
         'identity': 'This is particle:  3',
         'idnumber': 3,
         'speed': 6.0
     }, {
-        'rowid': 4,
         'identity': 'This is particle:  4',
         'idnumber': 4,
         'speed': 8.0
     }, {
-        'rowid': 5,
         'identity': 'This is particle:  5',
         'idnumber': 5,
         'speed': 10.0
@@ -176,8 +173,8 @@ def test_table_shape_arrays(app_client):
         '/test_tables/%2Fgroup2%2Ftable2.json?_shape=arrays',
     )
     assert [
-        [6, 'This is particle:  6', 6, 12.0],
-        [7, 'This is particle:  7', 7, 14.0],
+        ['This is particle:  6', 6, 12.0],
+        ['This is particle:  7', 7, 14.0],
     ] == response.json['rows'][6:8]
 
 def test_table_shape_objects(app_client):
@@ -185,12 +182,10 @@ def test_table_shape_objects(app_client):
         '/test_tables/%2Fgroup2%2Ftable2.json?_shape=objects',
     )
     assert [{
-        'rowid': 6,
         'identity': 'This is particle:  6',
         'idnumber': 6,
         'speed': 12.0,
     }, {
-        'rowid': 7,
         'identity': 'This is particle:  7',
         'idnumber': 7,
         'speed': 14.0,
@@ -201,12 +196,10 @@ def test_table_shape_array(app_client):
         '/test_tables/%2Fgroup2%2Ftable2.json?_shape=array',
     )
     assert [{
-        'rowid': 6,
         'identity': 'This is particle:  6',
         'idnumber': 6,
         'speed': 12.0,
     }, {
-        'rowid': 7,
         'identity': 'This is particle:  7',
         'idnumber': 7,
         'speed': 14.0,
@@ -234,12 +227,12 @@ def test_paginate_tables_and_arrays(app_client, path, expected_rows, expected_pa
     count = 0
     while path:
         response = app_client.get(path)
-        print("*****", response.json)
         assert 200 == response.status
         count += 1
         fetched.extend(response.json['rows'])
         path = response.json['next_url']
         if path:
+            path = path.replace('http://localhost', '')
             assert response.json['next']
             assert '_next={}'.format(response.json['next']) in path