|
7 | 7 | from utils import run, dbtest, set_expanded_output, is_expanded_output, assert_result_equal
|
8 | 8 |
|
9 | 9 | try:
|
| 10 | + import sqlean as sqlite3 |
10 | 11 | from sqlean import OperationalError, ProgrammingError
|
11 | 12 | except ImportError:
|
| 13 | + import sqlite3 |
12 | 14 | from sqlite3 import OperationalError, ProgrammingError
|
13 | 15 |
|
14 | 16 |
|
@@ -41,20 +43,40 @@ def test_binary(executor):
|
41 | 43 | assert_result_equal(results, headers=["blb"], rows=[(expected,)])
|
42 | 44 |
|
43 | 45 |
|
44 |
| -## Failing in Travis for some unknown reason. |
45 | 46 | @dbtest
|
46 |
| -def test_table_and_columns_query(executor): |
| 47 | +def test_table_and_columns_query_w_sqlean(executor): |
47 | 48 | run(executor, "create table a(x text, y text)")
|
48 | 49 | run(executor, "create table b(z text)")
|
49 | 50 | run(executor, "create table t(t text)")
|
50 | 51 |
|
51 |
| - assert set(executor.tables()) == set([("sqlean_define",), ("a",), ("b",), ("t",)]) |
52 |
| - assert set(executor.table_columns()) == set( |
53 |
| - [("sqlean_define", "type"), ("sqlean_define", "body"), ("sqlean_define", "name"), ("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")] |
54 |
| - ) |
55 |
| - assert set(executor.table_columns()) == set( |
56 |
| - [("sqlean_define", "type"), ("sqlean_define", "body"), ("sqlean_define", "name"), ("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")] |
57 |
| - ) |
| 52 | + if "sqlean" in sqlite3.__file__: |
| 53 | + assert set(executor.tables()) == set([("sqlean_define",), ("a",), ("b",), ("t",)]) |
| 54 | + assert set(executor.table_columns()) == set( |
| 55 | + [ |
| 56 | + ("sqlean_define", "type"), |
| 57 | + ("sqlean_define", "body"), |
| 58 | + ("sqlean_define", "name"), |
| 59 | + ("a", "x"), |
| 60 | + ("a", "y"), |
| 61 | + ("b", "z"), |
| 62 | + ("t", "t"), |
| 63 | + ] |
| 64 | + ) |
| 65 | + assert set(executor.table_columns()) == set( |
| 66 | + [ |
| 67 | + ("sqlean_define", "type"), |
| 68 | + ("sqlean_define", "body"), |
| 69 | + ("sqlean_define", "name"), |
| 70 | + ("a", "x"), |
| 71 | + ("a", "y"), |
| 72 | + ("b", "z"), |
| 73 | + ("t", "t"), |
| 74 | + ] |
| 75 | + ) |
| 76 | + else: |
| 77 | + assert set(executor.tables()) == set([("a",), ("b",), ("t",)]) |
| 78 | + assert set(executor.table_columns()) == set([("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")]) |
| 79 | + assert set(executor.table_columns()) == set([("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")]) |
58 | 80 |
|
59 | 81 |
|
60 | 82 | @dbtest
|
|
0 commit comments