Skip to content

Commit a9f92f3

Browse files
somewessomewes
committed
fake
1 parent 1c51894 commit a9f92f3

File tree

11 files changed

+91
-38
lines changed

11 files changed

+91
-38
lines changed

‎querybuilder/query.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ def set_right_table(self, table):
173173
# check if this join type is for a foreign key
174174
for field in self.left_table.model._meta.fields:
175175
if (
176-
field.get_internal_type() == 'OneToOneField' or
177-
field.get_internal_type() == 'ForeignKey'
176+
field.get_internal_type() == 'OneToOneField'
177+
or field.get_internal_type() == 'ForeignKey'
178178
):
179179
if field.remote_field.model == self.right_table.model:
180180
if self.right_table.field_prefix is None:
@@ -213,8 +213,8 @@ def get_condition(self):
213213
# check if this join type is for a foreign key
214214
for field in self.right_table.model._meta.fields:
215215
if (
216-
field.get_internal_type() == 'OneToOneField' or
217-
field.get_internal_type() == 'ForeignKey'
216+
field.get_internal_type() == 'OneToOneField'
217+
or field.get_internal_type() == 'ForeignKey'
218218
):
219219
if field.remote_field.model == self.left_table.model:
220220
table_join_field = field.column

‎querybuilder/tests/aggregate_tests.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ def test_stddev(self):
9696
]
9797
)
9898
query_str = query.get_sql()
99-
expected_query = 'SELECT STDDEV(querybuilder_tests_order.margin) AS "margin_stddev" FROM querybuilder_tests_order'
99+
expected_query = (
100+
'SELECT STDDEV(querybuilder_tests_order.margin) AS "margin_stddev" FROM querybuilder_tests_order'
101+
)
100102
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
101103

102104
def test_sum_field(self):
@@ -121,7 +123,9 @@ def test_variance(self):
121123
]
122124
)
123125
query_str = query.get_sql()
124-
expected_query = 'SELECT VARIANCE(querybuilder_tests_order.margin) AS "margin_variance" FROM querybuilder_tests_order'
126+
expected_query = (
127+
'SELECT VARIANCE(querybuilder_tests_order.margin) AS "margin_variance" FROM querybuilder_tests_order'
128+
)
125129
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
126130

127131
def test_count(self):
@@ -139,7 +143,10 @@ def test_count(self):
139143
received
140144
)
141145
)
142-
self.assertEqual(query.get_count_query().get_sql(), 'SELECT COUNT(querybuilder_tests_user.*) AS "all_count" FROM querybuilder_tests_user')
146+
self.assertEqual(
147+
query.get_count_query().get_sql(),
148+
'SELECT COUNT(querybuilder_tests_user.*) AS "all_count" FROM querybuilder_tests_user'
149+
)
143150

144151
# Make sure the copy didn't modify the original
145152
self.assertEqual(len(query.tables[0].fields), 2)

‎querybuilder/tests/date_tests.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ def test_year(self):
1313
]
1414
)
1515
query_str = query.get_sql()
16-
expected_query = 'SELECT CAST(EXTRACT(year FROM querybuilder_tests_order.time) AS INT) AS "time__year" FROM querybuilder_tests_order'
16+
expected_query = (
17+
'SELECT CAST(EXTRACT(year FROM querybuilder_tests_order.time) AS INT) AS "time__year" '
18+
'FROM querybuilder_tests_order'
19+
)
1720
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
1821

1922
def test_year_auto(self):

‎querybuilder/tests/field_tests.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ def test_cast(self):
1616
table=Order,
1717
fields=[SimpleField(field='revenue', cast='INT')]
1818
).order_by('revenue').limit(1)
19-
expected_query = 'SELECT CAST(querybuilder_tests_order.revenue AS INT) FROM querybuilder_tests_order ORDER BY revenue ASC LIMIT 1'
19+
expected_query = (
20+
'SELECT CAST(querybuilder_tests_order.revenue AS INT) FROM querybuilder_tests_order '
21+
'ORDER BY revenue ASC LIMIT 1'
22+
)
2023
self.assertEqual(expected_query, query.get_sql())
2124
rows = query.select()
2225
self.assertEqual(1, len(rows))
@@ -47,7 +50,9 @@ def test_get_alias(self):
4750
prefix_fields=True,
4851
field_prefix='my_field_prefix',
4952
)
50-
expected_query = 'SELECT querybuilder_tests_order.revenue AS "my_field_prefix__my_alias" FROM querybuilder_tests_order'
53+
expected_query = (
54+
'SELECT querybuilder_tests_order.revenue AS "my_field_prefix__my_alias" FROM querybuilder_tests_order'
55+
)
5156
self.assertEqual(expected_query, query.get_sql())
5257

5358
field.alias = None
@@ -58,7 +63,9 @@ def test_get_alias(self):
5863
prefix_fields=True,
5964
field_prefix='my_field_prefix',
6065
)
61-
expected_query = 'SELECT querybuilder_tests_order.revenue AS "my_field_prefix__revenue" FROM querybuilder_tests_order'
66+
expected_query = (
67+
'SELECT querybuilder_tests_order.revenue AS "my_field_prefix__revenue" FROM querybuilder_tests_order'
68+
)
6269
self.assertEqual(expected_query, query.get_sql())
6370

6471
def lead_lag_difference_test(self):

‎querybuilder/tests/insert_tests.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ def test_insert_single_row(self):
4848

4949
query.insert(rows)
5050
sql = self.logger.get_log()[2]['sql']
51-
self.assertEqual(sql, "INSERT INTO querybuilder_tests_account (user_id, first_name, last_name) VALUES (1, 'Test', 'User')")
51+
self.assertEqual(
52+
sql,
53+
"INSERT INTO querybuilder_tests_account (user_id, first_name, last_name) VALUES (1, 'Test', 'User')"
54+
)
5255

5356
def test_insert_multiple_rows(self):
5457
G(User, id=1)

‎querybuilder/tests/json_tests.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ def test_one(self):
2929
self.assertEqual(
3030
query.get_sql(),
3131
(
32-
'SELECT querybuilder_tests_metricrecord.data->\'two\' AS "my_two_alias" FROM querybuilder_tests_metricrecord '
33-
'WHERE (querybuilder_tests_metricrecord.data->>\'two\' = %(A0)s)'
32+
'SELECT querybuilder_tests_metricrecord.data->\'two\' AS "my_two_alias" FROM '
33+
'querybuilder_tests_metricrecord WHERE (querybuilder_tests_metricrecord.data->>\'two\' = %(A0)s)'
3434
)
3535
)
3636
self.assertEqual(query.select(), [])
@@ -41,8 +41,8 @@ def test_one(self):
4141
self.assertEqual(
4242
query.get_sql(),
4343
(
44-
'SELECT querybuilder_tests_metricrecord.data->\'two\' AS "my_two_alias" FROM querybuilder_tests_metricrecord '
45-
'WHERE (querybuilder_tests_metricrecord.data->>\'two\' = %(A0)s)'
44+
'SELECT querybuilder_tests_metricrecord.data->\'two\' AS "my_two_alias" FROM '
45+
'querybuilder_tests_metricrecord WHERE (querybuilder_tests_metricrecord.data->>\'two\' = %(A0)s)'
4646
)
4747
)
4848
self.assertEqual(query.select(), [{'my_two_alias': 'two'}])
@@ -53,8 +53,8 @@ def test_one(self):
5353
self.assertEqual(
5454
query.get_sql(),
5555
(
56-
'SELECT querybuilder_tests_metricrecord.data->\'one\' AS "my_one_alias" FROM querybuilder_tests_metricrecord '
57-
'WHERE (querybuilder_tests_metricrecord.data->>\'one\' = %(A0)s)'
56+
'SELECT querybuilder_tests_metricrecord.data->\'one\' AS "my_one_alias" FROM '
57+
'querybuilder_tests_metricrecord WHERE (querybuilder_tests_metricrecord.data->>\'one\' = %(A0)s)'
5858
)
5959
)
6060
self.assertEqual(query.select(), [{'my_one_alias': 1}])
@@ -65,8 +65,8 @@ def test_one(self):
6565
self.assertEqual(
6666
query.get_sql(),
6767
(
68-
'SELECT querybuilder_tests_metricrecord.data->\'one\' AS "my_one_alias" FROM querybuilder_tests_metricrecord '
69-
'WHERE (querybuilder_tests_metricrecord.data->>\'one\' = %(A0)s)'
68+
'SELECT querybuilder_tests_metricrecord.data->\'one\' AS "my_one_alias" FROM '
69+
'querybuilder_tests_metricrecord WHERE (querybuilder_tests_metricrecord.data->>\'one\' = %(A0)s)'
7070
)
7171
)
7272
self.assertEqual(query.select(), [])

‎querybuilder/tests/query_tests.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,9 @@ def test_cast(self):
234234
)
235235

236236
query_str = query.get_sql()
237-
expected_query = 'SELECT CAST(COUNT(querybuilder_tests_account.id) AS FLOAT) AS "count" FROM querybuilder_tests_account'
237+
expected_query = (
238+
'SELECT CAST(COUNT(querybuilder_tests_account.id) AS FLOAT) AS "count" FROM querybuilder_tests_account'
239+
)
238240
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
239241

240242
received = query.select()[0]['count']

‎querybuilder/tests/select_tests.py

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@ def test_select_fields_from_model(self):
7878
]
7979
)
8080
query_str = query.get_sql()
81-
expected_query = 'SELECT querybuilder_tests_account.field_one, querybuilder_tests_account.field_two FROM querybuilder_tests_account'
81+
expected_query = (
82+
'SELECT querybuilder_tests_account.field_one, querybuilder_tests_account.field_two FROM '
83+
'querybuilder_tests_account'
84+
)
8285
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
8386

8487
def test_select_fields_from_model_alias(self):
@@ -92,7 +95,9 @@ def test_select_fields_from_model_alias(self):
9295
]
9396
)
9497
query_str = query.get_sql()
95-
expected_query = 'SELECT table_alias.field_one, table_alias.field_two FROM querybuilder_tests_account AS table_alias'
98+
expected_query = (
99+
'SELECT table_alias.field_one, table_alias.field_two FROM querybuilder_tests_account AS table_alias'
100+
)
96101
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
97102

98103
def test_select_fields_alias_from_string(self):
@@ -259,7 +264,9 @@ def test_inner(self):
259264
)
260265

261266
query_str = query.get_sql()
262-
expected_query = 'WITH T0 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account) SELECT T0.* FROM T0'
267+
expected_query = (
268+
'WITH T0 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account) SELECT T0.* FROM T0'
269+
)
263270
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
264271

265272
inner_query = Query().from_table(
@@ -268,7 +275,9 @@ def test_inner(self):
268275

269276
query = Query().with_query(inner_query, 's3').from_table('s3')
270277
query_str = query.get_sql()
271-
expected_query = 'WITH s3 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account) SELECT s3.* FROM s3'
278+
expected_query = (
279+
'WITH s3 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account) SELECT s3.* FROM s3'
280+
)
272281
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
273282

274283
def test_inner_alias(self):
@@ -280,7 +289,9 @@ def test_inner_alias(self):
280289
})
281290

282291
query_str = query.get_sql()
283-
expected_query = 'WITH Q0 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account) SELECT Q0.* FROM Q0'
292+
expected_query = (
293+
'WITH Q0 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account) SELECT Q0.* FROM Q0'
294+
)
284295
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
285296

286297
def test_inner_args(self):
@@ -296,7 +307,8 @@ def test_inner_args(self):
296307
query_str = query.get_sql()
297308
expected_query = (
298309
'WITH T0 AS '
299-
'(SELECT querybuilder_tests_account.* FROM querybuilder_tests_account WHERE (id > %(T0A0)s AND id < %(T0A1)s)) '
310+
'(SELECT querybuilder_tests_account.* FROM querybuilder_tests_account '
311+
'WHERE (id > %(T0A0)s AND id < %(T0A1)s)) '
300312
'SELECT T0.* FROM T0'
301313
)
302314
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
@@ -316,7 +328,8 @@ def test_inner_outer_args(self):
316328
query_str = query.get_sql()
317329
expected_query = (
318330
'WITH T0 AS '
319-
'(SELECT querybuilder_tests_account.* FROM querybuilder_tests_account WHERE (id > %(T0A0)s AND id < %(T0A1)s)) '
331+
'(SELECT querybuilder_tests_account.* FROM querybuilder_tests_account '
332+
'WHERE (id > %(T0A0)s AND id < %(T0A1)s)) '
320333
'SELECT T0.* FROM T0 WHERE ((NOT(id = %(A0)s)))'
321334
)
322335
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
@@ -345,7 +358,8 @@ def test_inner_outer_args_many(self):
345358
query_str = query.get_sql()
346359
expected_query = (
347360
'WITH T1 AS '
348-
'(SELECT querybuilder_tests_account.* FROM querybuilder_tests_account WHERE (id > %(T1A0)s AND id < %(T1A1)s)), '
361+
'(SELECT querybuilder_tests_account.* FROM querybuilder_tests_account '
362+
'WHERE (id > %(T1A0)s AND id < %(T1A1)s)), '
349363
'T0 AS ('
350364
'SELECT querybuilder_tests_account.* '
351365
'FROM querybuilder_tests_account '
@@ -392,10 +406,13 @@ def test_three_levels(self):
392406
)
393407
query_str = query.get_sql()
394408
expected_query = (
395-
'WITH T1T1 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account WHERE (id > %(T1T1A0)s AND id < %(T1T1A1)s)), '
396-
'T1T0 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account WHERE (id > %(T1T0A0)s AND id < %(T1T0A1)s)), '
409+
'WITH T1T1 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account '
410+
'WHERE (id > %(T1T1A0)s AND id < %(T1T1A1)s)), '
411+
'T1T0 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account '
412+
'WHERE (id > %(T1T0A0)s AND id < %(T1T0A1)s)), '
397413
'T1 AS (SELECT T1T0.*, T1T1.* FROM T1T0, T1T1 WHERE (id > %(T1A0)s AND id < %(T1A1)s)), '
398-
'T0 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account WHERE (id > %(T0A0)s AND id < %(T0A1)s)) '
414+
'T0 AS (SELECT querybuilder_tests_account.* FROM querybuilder_tests_account '
415+
'WHERE (id > %(T0A0)s AND id < %(T0A1)s)) '
399416
'SELECT T0.*, T1.* FROM T0, T1 WHERE ((NOT(id = %(A0)s)))'
400417
)
401418
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
@@ -535,7 +552,9 @@ def test_distinct_on_many_fields(self):
535552
).distinct_on('field1', 'field2', 'field3')
536553

537554
query_str = query.get_sql()
538-
expected_query = 'SELECT DISTINCT ON (field1, field2, field3) querybuilder_tests_account.* FROM querybuilder_tests_account'
555+
expected_query = (
556+
'SELECT DISTINCT ON (field1, field2, field3) querybuilder_tests_account.* FROM querybuilder_tests_account'
557+
)
539558
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
540559

541560
def test_cannot_mix_distincts(self):

‎querybuilder/tests/table_tests.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,7 @@ def test_get_from_name(self):
188188
"""
189189
inner_query = Query().from_table(Account)
190190
query = Query().from_table(inner_query)
191-
self.assertEqual('(SELECT querybuilder_tests_account.* FROM querybuilder_tests_account)', query.tables[0].get_from_name())
191+
self.assertEqual(
192+
'(SELECT querybuilder_tests_account.* FROM querybuilder_tests_account)',
193+
query.tables[0].get_from_name()
194+
)

‎querybuilder/tests/where_tests.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,9 @@ def test_where_in_csv(self):
184184
))
185185

186186
query_str = query.get_sql()
187-
expected_query = 'SELECT querybuilder_tests_account.* FROM querybuilder_tests_account WHERE (id IN (%(A0)s,%(A1)s,%(A2)s))'
187+
expected_query = (
188+
'SELECT querybuilder_tests_account.* FROM querybuilder_tests_account WHERE (id IN (%(A0)s,%(A1)s,%(A2)s))'
189+
)
188190
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
189191

190192
def test_where_in_list(self):
@@ -195,7 +197,9 @@ def test_where_in_list(self):
195197
))
196198

197199
query_str = query.get_sql()
198-
expected_query = 'SELECT querybuilder_tests_account.* FROM querybuilder_tests_account WHERE (id IN (%(A0)s,%(A1)s,%(A2)s))'
200+
expected_query = (
201+
'SELECT querybuilder_tests_account.* FROM querybuilder_tests_account WHERE (id IN (%(A0)s,%(A1)s,%(A2)s))'
202+
)
199203
self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
200204

201205
def test_where_contains(self):

0 commit comments

Comments
 (0)