Skip to content

Commit 8ece369

Browse files
ruxandraburticaruxandraburtica
committed
Fixed tests. tylertreat#104 
1 parent cf6be16 commit 8ece369

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

‎bigquery/tests/test_query_builder.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ def test_full_query(self):
399399
" WHERE (start_time <= INTEGER('1371566954')) AND "
400400
"(start_time >= INTEGER('1371556954')) GROUP BY "
401401
"timestamp, status HAVING (status == INTEGER('1')) "
402-
"ORDER BY timestamp desc")
402+
"ORDER BY timestamp desc ")
403403
expected_select = (expected_query[len('SELECT '):]
404404
.split('FROM')[0].strip().split(', '))
405405
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -427,7 +427,7 @@ def test_empty_conditions(self):
427427
expected_query = ("SELECT status as status, start_time as timestamp, "
428428
"resource as url FROM "
429429
"[dataset.2013_06_appspot_1] ORDER BY "
430-
"timestamp desc")
430+
"timestamp desc ")
431431
expected_select = (expected_query[len('SELECT '):]
432432
.split('FROM')[0].strip().split(', '))
433433
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -464,7 +464,7 @@ def test_incorrect_conditions(self):
464464
expected_query = ("SELECT status as status, start_time as timestamp, "
465465
"resource as url FROM "
466466
"[dataset.2013_06_appspot_1] ORDER BY "
467-
"timestamp desc")
467+
"timestamp desc ")
468468
expected_select = (expected_query[len('SELECT '):]
469469
.split('FROM')[0].strip().split(', '))
470470
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -516,7 +516,7 @@ def test_multiple_condition_values(self):
516516
"INTEGER('1371556954')) AND "
517517
"((resource CONTAINS STRING('foo') AND resource "
518518
"CONTAINS STRING('baz')) AND (NOT resource CONTAINS "
519-
"STRING('bar'))) ORDER BY timestamp desc")
519+
"STRING('bar'))) ORDER BY timestamp desc ")
520520
expected_select = (expected_query[len('SELECT '):]
521521
.split('FROM')[0].strip().split(', '))
522522
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -550,7 +550,7 @@ def test_negated_condition_value(self):
550550
expected_query = ("SELECT status as status, start_time as timestamp, "
551551
"resource as url FROM "
552552
"[dataset.2013_06_appspot_1] WHERE (NOT resource "
553-
"CONTAINS STRING('foo')) ORDER BY timestamp desc")
553+
"CONTAINS STRING('foo')) ORDER BY timestamp desc ")
554554
expected_select = (expected_query[len('SELECT '):]
555555
.split('FROM')[0].strip().split(', '))
556556
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -593,7 +593,7 @@ def test_multiple_negated_condition_values(self):
593593
"[dataset.2013_06_appspot_1] WHERE (NOT resource "
594594
"CONTAINS STRING('foo') AND NOT resource CONTAINS "
595595
"STRING('baz') AND NOT resource CONTAINS "
596-
"STRING('bar')) ORDER BY timestamp desc")
596+
"STRING('bar')) ORDER BY timestamp desc ")
597597
expected_select = (expected_query[len('SELECT '):]
598598
.split('FROM')[0].strip().split(', '))
599599
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -631,7 +631,7 @@ def test_empty_order(self):
631631
"resource as url FROM "
632632
"[dataset.2013_06_appspot_1] WHERE (start_time "
633633
"<= INTEGER('1371566954')) AND (start_time >= "
634-
"INTEGER('1371556954')) ")
634+
"INTEGER('1371556954')) ")
635635
expected_select = (expected_query[len('SELECT '):]
636636
.split('FROM')[0].strip().split(', '))
637637
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -669,7 +669,7 @@ def test_incorrect_order(self):
669669
"resource as url FROM "
670670
"[dataset.2013_06_appspot_1] WHERE (start_time "
671671
"<= INTEGER('1371566954')) AND (start_time >= "
672-
"INTEGER('1371556954')) ")
672+
"INTEGER('1371556954')) ")
673673
expected_select = (expected_query[len('SELECT '):]
674674
.split('FROM')[0].strip().split(', '))
675675
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -702,7 +702,7 @@ def test_empty_select(self):
702702
expected_query = ("SELECT * FROM [dataset.2013_06_appspot_1] "
703703
"WHERE (start_time <= INTEGER('1371566954')) AND "
704704
"(start_time >= INTEGER('1371556954')) ORDER BY "
705-
"timestamp desc")
705+
"timestamp desc ")
706706
self.assertEqual(result, expected_query)
707707

708708
def test_no_alias(self):
@@ -777,7 +777,7 @@ def test_formatting(self):
777777
"resource as url FROM "
778778
"[dataset.2013_06_appspot_1] WHERE (start_time "
779779
"<= INTEGER('1371566954')) AND (start_time >= "
780-
"INTEGER('1371556954')) ORDER BY timestamp desc")
780+
"INTEGER('1371556954')) ORDER BY timestamp desc ")
781781
expected_select = (expected_query[len('SELECT '):]
782782
.split('FROM')[0].strip().split(', '))
783783
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -830,7 +830,7 @@ def test_formatting_duplicate_columns(self):
830830
"[dataset.2013_06_appspot_1] WHERE "
831831
"(start_time <= INTEGER('1371566954')) AND "
832832
"(start_time >= INTEGER('1371556954')) ORDER BY "
833-
"timestamp desc")
833+
"timestamp desc ")
834834
expected_select = (expected_query[len('SELECT '):]
835835
.split('FROM')[0].strip().split(', '))
836836
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -874,7 +874,7 @@ def test_sec_to_micro_formatting(self):
874874
"timestamp, resource as url FROM "
875875
"[dataset.2013_06_appspot_1] WHERE (start_time "
876876
"<= INTEGER('1371566954')) AND (start_time >= "
877-
"INTEGER('1371556954')) ORDER BY timestamp desc")
877+
"INTEGER('1371556954')) ORDER BY timestamp desc ")
878878
expected_select = (expected_query[len('SELECT '):]
879879
.split('FROM')[0].strip().split(', '))
880880
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -930,7 +930,7 @@ def test_empty_groupings(self):
930930
expected_query = ("SELECT status as status, start_time as timestamp, "
931931
"resource as url FROM "
932932
"[dataset.2013_06_appspot_1] ORDER BY "
933-
"timestamp desc")
933+
"timestamp desc ")
934934
expected_select = (expected_query[len('SELECT '):]
935935
.split('FROM')[0].strip().split(', '))
936936
expected_from = expected_query[len('SELECT '):].split('FROM')[1]
@@ -971,7 +971,7 @@ def test_multi_tables(self):
971971
"[dataset.2013_07_appspot_1] WHERE (start_time "
972972
"<= INTEGER('1371566954')) AND (start_time >= "
973973
"INTEGER('1371556954')) GROUP BY timestamp, status "
974-
"ORDER BY timestamp desc")
974+
"ORDER BY timestamp desc ")
975975
expected_select = (expected_query[len('SELECT '):]
976976
.split('FROM')[0].strip().split(', '))
977977
expected_from = expected_query[len('SELECT '):].split('FROM')[1]

0 commit comments

Comments
 (0)