X-Git-Url: https://git.jsancho.org/?p=datasette-pytables.git;a=blobdiff_plain;f=tests%2Ftest_api.py;h=97e07dc560cb4202f927c63b33b8990753c2ca0e;hp=86f0b23b0d2b7ce38b09de9839d67efc71c79823;hb=d62ba74e92c673f170c444899e14cae4b065e79a;hpb=33d28d65d042098544a3aff3763beebe825b60d7

diff --git a/tests/test_api.py b/tests/test_api.py
index 86f0b23..97e07dc 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -57,14 +57,38 @@ def test_database_page(app_client):
 def test_custom_sql(app_client):
     response = app_client.get(
         '/test_tables.json?' + urlencode({
-            'sql': 'select identity from [/group1/table1] where speed > 100 and identity < 55',
+            'sql': 'select identity from [/group1/table1]',
             '_shape': 'objects'
         }),
         gather_request=False
     )
     data = response.json
     assert {
-        'sql': 'select identity from [/group1/table1] where speed > 100 and identity < 55',
+        'sql': 'select identity from [/group1/table1]',
+        'params': {}
+    } == data['query']
+    assert 1000 == len(data['rows'])
+    assert [
+        {'identity': 'This is particle:  0'},
+        {'identity': 'This is particle:  1'},
+        {'identity': 'This is particle:  2'},
+        {'identity': 'This is particle:  3'}
+    ] == data['rows'][:4]
+    assert ['identity'] == data['columns']
+    assert 'test_tables' == data['database']
+    assert data['truncated']
+
+def test_custom_complex_sql(app_client):
+    response = app_client.get(
+        '/test_tables.json?' + urlencode({
+            'sql': 'select identity from [/group1/table1] where speed > 100 and idnumber < 55',
+            '_shape': 'objects'
+        }),
+        gather_request=False
+    )
+    data = response.json
+    assert {
+        'sql': 'select identity from [/group1/table1] where speed > 100 and idnumber < 55',
         'params': {}
     } == data['query']
     assert 4 == len(data['rows'])
@@ -76,7 +100,7 @@ def test_custom_sql(app_client):
     ] == data['rows']
     assert ['identity'] == data['columns']
     assert 'test_tables' == data['database']
-    assert False == data['truncated']
+    assert not data['truncated']
 
 def test_custom_pytables_sql(app_client):
     response = app_client.get(
@@ -99,7 +123,7 @@ def test_custom_pytables_sql(app_client):
     ] == data['rows'][:3]
     assert ['identity'] == data['columns']
     assert 'test_tables' == data['database']
-    assert data['truncated']
+    assert not data['truncated']
 
 def test_invalid_custom_sql(app_client):
     response = app_client.get(