1919
2020
2121@pytest .mark .parametrize ("to_type" , ["int8" , "int16" , "float32" , "float" , "!float64" ])
22- def test_cast_double_col (alltypes , to_type , snapshot ):
22+ def test_cast_double_col (alltypes , to_type , assert_sql ):
2323 expr = alltypes .double_col .cast (to_type )
24- result = expr .compile ()
25- snapshot .assert_match (result , "out.sql" )
24+ assert_sql (expr )
2625
2726
2827@pytest .mark .parametrize (
@@ -37,9 +36,9 @@ def test_cast_double_col(alltypes, to_type, snapshot):
3736 "!struct<a: string, b: int64>" ,
3837 ],
3938)
40- def test_cast_string_col (alltypes , to_type , snapshot ):
39+ def test_cast_string_col (alltypes , to_type , assert_sql ):
4140 expr = alltypes .string_col .cast (to_type )
42- snapshot . assert_match (expr . compile (), "out.sql" )
41+ assert_sql (expr )
4342
4443
4544@pytest .mark .parametrize (
@@ -60,35 +59,35 @@ def test_cast_string_col(alltypes, to_type, snapshot):
6059 "month" ,
6160 ],
6261)
63- def test_noop_cast (alltypes , column , snapshot ):
62+ def test_noop_cast (alltypes , column , assert_sql ):
6463 col = alltypes [column ]
6564 result = col .cast (col .type ())
6665 assert result .equals (col )
67- snapshot . assert_match (result . compile (), "out.sql" )
66+ assert_sql (result )
6867
6968
70- def test_timestamp_cast (alltypes , snapshot ):
69+ def test_timestamp_cast (alltypes , assert_sql ):
7170 target = dt .Timestamp (nullable = False )
7271 result1 = alltypes .timestamp_col .cast (target )
7372 result2 = alltypes .int_col .cast (target )
7473
7574 assert isinstance (result1 , ir .TimestampColumn )
7675 assert isinstance (result2 , ir .TimestampColumn )
7776
78- snapshot . assert_match (result1 . compile () , "out1.sql" )
79- snapshot . assert_match (result2 . compile () , "out2.sql" )
77+ assert_sql (result1 , "out1.sql" )
78+ assert_sql (result2 , "out2.sql" )
8079
8180
82- def test_timestamp_now (con , snapshot ):
81+ def test_timestamp_now (con , assert_sql ):
8382 expr = ibis .now ()
84- snapshot . assert_match ( con . compile ( expr ), "out.sql" )
83+ assert_sql ( expr )
8584
8685
8786@pytest .mark .parametrize ("unit" , ["y" , "m" , "d" , "w" , "h" , "minute" ])
88- def test_timestamp_truncate (con , unit , snapshot ):
87+ def test_timestamp_truncate (con , unit , assert_sql ):
8988 stamp = ibis .timestamp ("2009-05-17 12:34:56" )
9089 expr = stamp .truncate (unit )
91- snapshot . assert_match ( con . compile ( expr ), "out.sql" )
90+ assert_sql ( expr )
9291
9392
9493@pytest .mark .parametrize (("value" , "expected" ), [(0 , None ), (5.5 , 5.5 )])
@@ -185,13 +184,13 @@ def test_string_substring(con, op, expected):
185184 assert con .execute (op (value )) == expected
186185
187186
188- def test_string_column_substring (con , alltypes , snapshot ):
187+ def test_string_column_substring (con , alltypes , assert_sql ):
189188 expr = alltypes .string_col .substr (2 )
190- snapshot . assert_match (expr . compile () , "out1.sql" )
189+ assert_sql (expr , "out1.sql" )
191190 assert len (con .execute (expr ))
192191
193192 expr = alltypes .string_col .substr (0 , 3 )
194- snapshot . assert_match (expr . compile () , "out2.sql" )
193+ assert_sql (expr , "out2.sql" )
195194 assert len (con .execute (expr ))
196195
197196
@@ -243,12 +242,12 @@ def test_find_in_set(con, value, expected):
243242 assert con .execute (expr ) == expected
244243
245244
246- def test_string_column_find_in_set (con , alltypes , snapshot ):
245+ def test_string_column_find_in_set (con , alltypes , assert_sql ):
247246 s = alltypes .string_col
248247 vals = list ("abc" )
249248
250249 expr = s .find_in_set (vals )
251- snapshot . assert_match (expr . compile (), "out.sql" )
250+ assert_sql (expr )
252251 assert len (con .execute (expr ))
253252
254253
@@ -271,25 +270,25 @@ def test_string_find_like(con, expr, expected):
271270 assert con .execute (expr ) == expected
272271
273272
274- def test_string_column_like (con , alltypes , snapshot ):
273+ def test_string_column_like (con , alltypes , assert_sql ):
275274 expr = alltypes .string_col .like ("foo%" )
276- snapshot . assert_match (expr . compile () , "out1.sql" )
275+ assert_sql (expr , "out1.sql" )
277276 assert len (con .execute (expr ))
278277
279278 expr = alltypes .string_col .like (["foo%" , "%bar" ])
280- snapshot . assert_match (expr . compile () , "out2.sql" )
279+ assert_sql (expr , "out2.sql" )
281280 assert len (con .execute (expr ))
282281
283282
284- def test_string_column_find (con , alltypes , snapshot ):
283+ def test_string_column_find (con , alltypes , assert_sql ):
285284 s = alltypes .string_col
286285
287286 expr = s .find ("a" )
288- snapshot . assert_match (expr . compile () , "out1.sql" )
287+ assert_sql (expr , "out1.sql" )
289288 assert len (con .execute (expr ))
290289
291290 expr = s .find (s )
292- snapshot . assert_match (expr . compile () , "out2.sql" )
291+ assert_sql (expr , "out2.sql" )
293292 assert len (con .execute (expr ))
294293
295294
@@ -309,9 +308,9 @@ def test_string_column_find(con, alltypes, snapshot):
309308 param (methodcaller ("sign" ), id = "sign" ),
310309 ],
311310)
312- def test_translate_math_functions (con , alltypes , call , snapshot ):
311+ def test_translate_math_functions (con , alltypes , call , assert_sql ):
313312 expr = call (alltypes .double_col )
314- snapshot . assert_match (expr . compile () , "out.sql" )
313+ assert_sql (expr , "out.sql" )
315314 assert len (con .execute (expr ))
316315
317316
@@ -352,21 +351,21 @@ def test_math_functions(con, expr, expected):
352351 assert con .execute (expr ) == expected
353352
354353
355- def test_greatest_least (con , alltypes , snapshot ):
354+ def test_greatest_least (con , alltypes , assert_sql ):
356355 expr = ibis .greatest (alltypes .int_col , 10 )
357- snapshot . assert_match (expr . compile () , "out1.sql" )
356+ assert_sql (expr , "out1.sql" )
358357 assert len (con .execute (expr ))
359358
360359 expr = ibis .greatest (alltypes .int_col , alltypes .bigint_col )
361- snapshot . assert_match (expr . compile () , "out2.sql" )
360+ assert_sql (expr , "out2.sql" )
362361 assert len (con .execute (expr ))
363362
364363 expr = ibis .least (alltypes .int_col , 10 )
365- snapshot . assert_match (expr . compile () , "out3.sql" )
364+ assert_sql (expr , "out3.sql" )
366365 assert len (con .execute (expr ))
367366
368367 expr = ibis .least (alltypes .int_col , alltypes .bigint_col )
369- snapshot . assert_match (expr . compile () , "out4.sql" )
368+ assert_sql (expr , "out4.sql" )
370369 assert len (con .execute (expr ))
371370
372371
@@ -397,15 +396,15 @@ def test_regexp_extract(con, expr, expected):
397396 assert con .execute (expr ) == expected
398397
399398
400- def test_column_regexp_extract (con , alltypes , snapshot ):
399+ def test_column_regexp_extract (con , alltypes , assert_sql ):
401400 expr = alltypes .string_col .re_extract (r"[\d]+" , 3 )
402- snapshot . assert_match (expr . compile () , "out.sql" )
401+ assert_sql (expr , "out.sql" )
403402 assert len (con .execute (expr ))
404403
405404
406- def test_column_regexp_replace (con , alltypes , snapshot ):
405+ def test_column_regexp_replace (con , alltypes , assert_sql ):
407406 expr = alltypes .string_col .re_replace (r"[\d]+" , "aaa" )
408- snapshot . assert_match (expr . compile () , "out.sql" )
407+ assert_sql (expr , "out.sql" )
409408 assert len (con .execute (expr ))
410409
411410
@@ -437,10 +436,10 @@ def test_literal_none_to_nullable_column(alltypes):
437436 tm .assert_series_equal (result , expected )
438437
439438
440- def test_timestamp_from_integer (con , alltypes , snapshot ):
439+ def test_timestamp_from_integer (con , alltypes , assert_sql ):
441440 # timestamp_col has datetime type
442441 expr = alltypes .int_col .to_timestamp ()
443- snapshot . assert_match (expr . compile () , "out.sql" )
442+ assert_sql (expr , "out.sql" )
444443 assert len (con .execute (expr ))
445444
446445
@@ -460,15 +459,15 @@ def test_count_distinct_with_filter(alltypes):
460459 param ("," , 0 , id = "comma_zero" ),
461460 ],
462461)
463- def test_group_concat (alltypes , sep , where_case , snapshot ):
462+ def test_group_concat (alltypes , sep , where_case , assert_sql ):
464463 where = None if where_case is None else alltypes .bool_col == where_case
465464 expr = alltypes .string_col .group_concat (sep , where )
466- snapshot . assert_match (expr . compile () , "out.sql" )
465+ assert_sql (expr , "out.sql" )
467466
468467
469- def test_hash (alltypes , snapshot ):
468+ def test_hash (alltypes , assert_sql ):
470469 expr = alltypes .string_col .hash ()
471- snapshot . assert_match (expr . compile (), "out.sql" )
470+ assert_sql (expr )
472471
473472
474473def test_udf_in_array_map (alltypes ):
0 commit comments