|
| 1 | + |
| 2 | +import re |
1 | 3 | import sqlite3 |
2 | 4 |
|
3 | 5 | import data_algebra |
@@ -102,22 +104,32 @@ def test_sqllite_g2(): |
102 | 104 |
|
103 | 105 | sql_model = data_algebra.SQLite.SQLiteModel() |
104 | 106 |
|
105 | | - q = ops.to_sql(db_model=sql_model) |
| 107 | + q = ops.to_sql(db_model=sql_model, pretty=False) |
| 108 | + q_pretty = ops.to_sql(db_model=sql_model, pretty=True) |
106 | 109 |
|
107 | | - conn = sqlite3.connect(":memory:") |
108 | | - sql_model.prepare_connection(conn) |
109 | | - sql_model.insert_table(conn, d, table_name="d") |
| 110 | + pattern_ws = re.compile(r'\s+') |
| 111 | + q_ns = re.sub(pattern_ws, '', q) |
| 112 | + q_pretty_ns = re.sub(pattern_ws, '', q_pretty) |
| 113 | + assert q_ns == q_pretty_ns |
110 | 114 |
|
111 | | - # conn.execute('CREATE TABLE res AS ' + q) |
112 | | - # res_sql = sql_model.read_table(conn, 'res') |
113 | | - res_sql = sql_model.read_query(conn, q) |
| 115 | + with sqlite3.connect(":memory:") as conn: |
| 116 | + sql_model.prepare_connection(conn) |
| 117 | + db_handle = sql_model.db_handle(conn) |
| 118 | + db_handle.insert_table(d, table_name="d") |
114 | 119 |
|
115 | | - conn.close() |
| 120 | + # conn.execute('CREATE TABLE res AS ' + q) |
| 121 | + # res_sql = sql_model.read_table(conn, 'res') |
| 122 | + res_sql = db_handle.read_query(q) |
| 123 | + res_sql_pretty = db_handle.read_query(q_pretty) |
116 | 124 |
|
117 | 125 | assert data_algebra.test_util.equivalent_frames( |
118 | 126 | res_pandas, res_sql, check_row_order=True |
119 | 127 | ) |
120 | 128 |
|
| 129 | + assert data_algebra.test_util.equivalent_frames( |
| 130 | + res_pandas, res_sql_pretty, check_row_order=True |
| 131 | + ) |
| 132 | + |
121 | 133 |
|
122 | 134 | def test_join_g2(): |
123 | 135 | d1 = data_algebra.default_data_model.pd.DataFrame( |
|
0 commit comments