Skip to content

Commit 0fa547b

Browse files
john-bodleyhashhar
authored andcommitted
Specify tzinfo during datetime/time creation in tests
1 parent 051669f commit 0fa547b

File tree

1 file changed

+73
-73
lines changed

1 file changed

+73
-73
lines changed

tests/integration/test_types_integration.py

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -302,114 +302,114 @@ def test_time_with_timezone(trino_connection, tz_str: str):
302302
# min supported time(3)
303303
.add_field(
304304
sql=f"TIME '00:00:00 {tz_str}'",
305-
python=time(0, 0, 0).replace(tzinfo=tz))
305+
python=time(0, 0, 0, tzinfo=tz))
306306
.add_field(
307307
sql=f"TIME '12:34:56.123 {tz_str}'",
308-
python=time(12, 34, 56, 123000).replace(tzinfo=tz))
308+
python=time(12, 34, 56, 123000, tzinfo=tz))
309309
# max supported time(3)
310310
.add_field(
311311
sql=f"TIME '23:59:59.999 {tz_str}'",
312-
python=time(23, 59, 59, 999000).replace(tzinfo=tz))
312+
python=time(23, 59, 59, 999000, tzinfo=tz))
313313
# min value for each precision
314314
.add_field(
315315
sql=f"TIME '00:00:00 {tz_str}'",
316-
python=time(0, 0, 0).replace(tzinfo=tz))
316+
python=time(0, 0, 0, tzinfo=tz))
317317
.add_field(
318318
sql=f"TIME '00:00:00.1 {tz_str}'",
319-
python=time(0, 0, 0, 100000).replace(tzinfo=tz))
319+
python=time(0, 0, 0, 100000, tzinfo=tz))
320320
.add_field(
321321
sql=f"TIME '00:00:00.01 {tz_str}'",
322-
python=time(0, 0, 0, 10000).replace(tzinfo=tz))
322+
python=time(0, 0, 0, 10000, tzinfo=tz))
323323
.add_field(
324324
sql=f"TIME '00:00:00.001 {tz_str}'",
325-
python=time(0, 0, 0, 1000).replace(tzinfo=tz))
325+
python=time(0, 0, 0, 1000, tzinfo=tz))
326326
.add_field(
327327
sql=f"TIME '00:00:00.0001 {tz_str}'",
328-
python=time(0, 0, 0, 100).replace(tzinfo=tz))
328+
python=time(0, 0, 0, 100, tzinfo=tz))
329329
.add_field(
330330
sql=f"TIME '00:00:00.00001 {tz_str}'",
331-
python=time(0, 0, 0, 10).replace(tzinfo=tz))
331+
python=time(0, 0, 0, 10, tzinfo=tz))
332332
.add_field(
333333
sql=f"TIME '00:00:00.000001 {tz_str}'",
334-
python=time(0, 0, 0, 1).replace(tzinfo=tz))
334+
python=time(0, 0, 0, 1, tzinfo=tz))
335335
# max value for each precision
336336
.add_field(
337337
sql=f"TIME '23:59:59 {tz_str}'",
338-
python=time(23, 59, 59).replace(tzinfo=tz))
338+
python=time(23, 59, 59, tzinfo=tz))
339339
.add_field(
340340
sql=f"TIME '23:59:59.9 {tz_str}'",
341-
python=time(23, 59, 59, 900000).replace(tzinfo=tz))
341+
python=time(23, 59, 59, 900000, tzinfo=tz))
342342
.add_field(
343343
sql=f"TIME '23:59:59.99 {tz_str}'",
344-
python=time(23, 59, 59, 990000).replace(tzinfo=tz))
344+
python=time(23, 59, 59, 990000, tzinfo=tz))
345345
.add_field(
346346
sql=f"TIME '23:59:59.999 {tz_str}'",
347-
python=time(23, 59, 59, 999000).replace(tzinfo=tz))
347+
python=time(23, 59, 59, 999000, tzinfo=tz))
348348
.add_field(
349349
sql=f"TIME '23:59:59.9999 {tz_str}'",
350-
python=time(23, 59, 59, 999900).replace(tzinfo=tz))
350+
python=time(23, 59, 59, 999900, tzinfo=tz))
351351
.add_field(
352352
sql=f"TIME '23:59:59.99999 {tz_str}'",
353-
python=time(23, 59, 59, 999990).replace(tzinfo=tz))
353+
python=time(23, 59, 59, 999990, tzinfo=tz))
354354
.add_field(
355355
sql=f"TIME '23:59:59.999999 {tz_str}'",
356-
python=time(23, 59, 59, 999999).replace(tzinfo=tz))
356+
python=time(23, 59, 59, 999999, tzinfo=tz))
357357
# round down
358358
.add_field(
359359
sql=f"TIME '12:34:56.1234561 {tz_str}'",
360-
python=time(12, 34, 56, 123456).replace(tzinfo=tz))
360+
python=time(12, 34, 56, 123456, tzinfo=tz))
361361
# round down, min value
362362
.add_field(
363363
sql=f"TIME '00:00:00.000000000001 {tz_str}'",
364-
python=time(0, 0, 0, 0).replace(tzinfo=tz))
364+
python=time(0, 0, 0, 0, tzinfo=tz))
365365
.add_field(
366366
sql=f"TIME '00:00:00.0000001 {tz_str}'",
367-
python=time(0, 0, 0, 0).replace(tzinfo=tz))
367+
python=time(0, 0, 0, 0, tzinfo=tz))
368368
# round down, max value
369369
.add_field(
370370
sql=f"TIME '00:00:00.0000004 {tz_str}'",
371-
python=time(0, 0, 0, 0).replace(tzinfo=tz))
371+
python=time(0, 0, 0, 0, tzinfo=tz))
372372
.add_field(
373373
sql=f"TIME '00:00:00.00000049 {tz_str}'",
374-
python=time(0, 0, 0, 0).replace(tzinfo=tz))
374+
python=time(0, 0, 0, 0, tzinfo=tz))
375375
.add_field(
376376
sql=f"TIME '00:00:00.0000005 {tz_str}'",
377-
python=time(0, 0, 0, 0).replace(tzinfo=tz))
377+
python=time(0, 0, 0, 0, tzinfo=tz))
378378
.add_field(
379379
sql=f"TIME '23:59:59.9999994 {tz_str}'",
380-
python=time(23, 59, 59, 999999).replace(tzinfo=tz))
380+
python=time(23, 59, 59, 999999, tzinfo=tz))
381381
.add_field(
382382
sql=f"TIME '23:59:59.9999994999 {tz_str}'",
383-
python=time(23, 59, 59, 999999).replace(tzinfo=tz))
383+
python=time(23, 59, 59, 999999, tzinfo=tz))
384384
# round up
385385
.add_field(
386386
sql=f"TIME '12:34:56.123456789 {tz_str}'",
387-
python=time(12, 34, 56, 123457).replace(tzinfo=tz))
387+
python=time(12, 34, 56, 123457, tzinfo=tz))
388388
# round up, min value
389389
.add_field(
390390
sql=f"TIME '00:00:00.000000500001 {tz_str}'",
391-
python=time(0, 0, 0, 1).replace(tzinfo=tz))
391+
python=time(0, 0, 0, 1, tzinfo=tz))
392392
# round up, max value
393393
.add_field(
394394
sql=f"TIME '00:00:00.0000009 {tz_str}'",
395-
python=time(0, 0, 0, 1).replace(tzinfo=tz))
395+
python=time(0, 0, 0, 1, tzinfo=tz))
396396
.add_field(
397397
sql=f"TIME '00:00:00.00000099999 {tz_str}'",
398-
python=time(0, 0, 0, 1).replace(tzinfo=tz))
398+
python=time(0, 0, 0, 1, tzinfo=tz))
399399
# round up to next day, min value
400400
.add_field(
401401
sql=f"TIME '23:59:59.9999995 {tz_str}'",
402-
python=time(0, 0, 0).replace(tzinfo=tz))
402+
python=time(0, 0, 0, tzinfo=tz))
403403
.add_field(
404404
sql=f"TIME '23:59:59.999999500001 {tz_str}'",
405-
python=time(0, 0, 0).replace(tzinfo=tz))
405+
python=time(0, 0, 0, tzinfo=tz))
406406
# round up to next day, max value
407407
.add_field(
408408
sql=f"TIME '23:59:59.9999999 {tz_str}'",
409-
python=time(0, 0, 0).replace(tzinfo=tz))
409+
python=time(0, 0, 0, tzinfo=tz))
410410
.add_field(
411411
sql=f"TIME '23:59:59.999999999 {tz_str}'",
412-
python=time(0, 0, 0).replace(tzinfo=tz))
412+
python=time(0, 0, 0, tzinfo=tz))
413413
).execute()
414414

415415

@@ -572,133 +572,133 @@ def test_timestamp_with_timezone(trino_connection, tz_str):
572572
# min supported timestamp(3) with time zone
573573
.add_field(
574574
sql=f"TIMESTAMP '2001-08-22 00:00:00 {tz_str}'",
575-
python=datetime(2001, 8, 22, 0, 0, 0).replace(tzinfo=tz))
575+
python=datetime(2001, 8, 22, 0, 0, 0, tzinfo=tz))
576576
.add_field(
577577
sql=f"TIMESTAMP '2001-08-22 12:34:56.123 {tz_str}'",
578-
python=datetime(2001, 8, 22, 12, 34, 56, 123000).replace(tzinfo=tz))
578+
python=datetime(2001, 8, 22, 12, 34, 56, 123000, tzinfo=tz))
579579
# max supported timestamp(3) with time zone
580580
.add_field(
581581
sql=f"TIMESTAMP '2001-08-22 23:59:59.999 {tz_str}'",
582-
python=datetime(2001, 8, 22, 23, 59, 59, 999000).replace(tzinfo=tz))
582+
python=datetime(2001, 8, 22, 23, 59, 59, 999000, tzinfo=tz))
583583
# min value for each precision
584584
.add_field(
585585
sql=f"TIMESTAMP '2001-08-22 00:00:00 {tz_str}'",
586-
python=datetime(2001, 8, 22, 0, 0, 0).replace(tzinfo=tz))
586+
python=datetime(2001, 8, 22, 0, 0, 0, tzinfo=tz))
587587
.add_field(
588588
sql=f"TIMESTAMP '2001-08-22 00:00:00.1 {tz_str}'",
589-
python=datetime(2001, 8, 22, 0, 0, 0, 100000).replace(tzinfo=tz))
589+
python=datetime(2001, 8, 22, 0, 0, 0, 100000, tzinfo=tz))
590590
.add_field(
591591
sql=f"TIMESTAMP '2001-08-22 00:00:00.01 {tz_str}'",
592-
python=datetime(2001, 8, 22, 0, 0, 0, 10000).replace(tzinfo=tz))
592+
python=datetime(2001, 8, 22, 0, 0, 0, 10000, tzinfo=tz))
593593
.add_field(
594594
sql=f"TIMESTAMP '2001-08-22 00:00:00.001 {tz_str}'",
595-
python=datetime(2001, 8, 22, 0, 0, 0, 1000).replace(tzinfo=tz))
595+
python=datetime(2001, 8, 22, 0, 0, 0, 1000, tzinfo=tz))
596596
.add_field(
597597
sql=f"TIMESTAMP '2001-08-22 00:00:00.0001 {tz_str}'",
598-
python=datetime(2001, 8, 22, 0, 0, 0, 100).replace(tzinfo=tz))
598+
python=datetime(2001, 8, 22, 0, 0, 0, 100, tzinfo=tz))
599599
.add_field(
600600
sql=f"TIMESTAMP '2001-08-22 00:00:00.00001 {tz_str}'",
601-
python=datetime(2001, 8, 22, 0, 0, 0, 10).replace(tzinfo=tz))
601+
python=datetime(2001, 8, 22, 0, 0, 0, 10, tzinfo=tz))
602602
.add_field(
603603
sql=f"TIMESTAMP '2001-08-22 00:00:00.000001 {tz_str}'",
604-
python=datetime(2001, 8, 22, 0, 0, 0, 1).replace(tzinfo=tz))
604+
python=datetime(2001, 8, 22, 0, 0, 0, 1, tzinfo=tz))
605605
# max value for each precision
606606
.add_field(
607607
sql=f"TIMESTAMP '2001-08-22 23:59:59 {tz_str}'",
608-
python=datetime(2001, 8, 22, 23, 59, 59).replace(tzinfo=tz))
608+
python=datetime(2001, 8, 22, 23, 59, 59, tzinfo=tz))
609609
.add_field(
610610
sql=f"TIMESTAMP '2001-08-22 23:59:59.9 {tz_str}'",
611-
python=datetime(2001, 8, 22, 23, 59, 59, 900000).replace(tzinfo=tz))
611+
python=datetime(2001, 8, 22, 23, 59, 59, 900000, tzinfo=tz))
612612
.add_field(
613613
sql=f"TIMESTAMP '2001-08-22 23:59:59.99 {tz_str}'",
614-
python=datetime(2001, 8, 22, 23, 59, 59, 990000).replace(tzinfo=tz))
614+
python=datetime(2001, 8, 22, 23, 59, 59, 990000, tzinfo=tz))
615615
.add_field(
616616
sql=f"TIMESTAMP '2001-08-22 23:59:59.999 {tz_str}'",
617-
python=datetime(2001, 8, 22, 23, 59, 59, 999000).replace(tzinfo=tz))
617+
python=datetime(2001, 8, 22, 23, 59, 59, 999000, tzinfo=tz))
618618
.add_field(
619619
sql=f"TIMESTAMP '2001-08-22 23:59:59.9999 {tz_str}'",
620-
python=datetime(2001, 8, 22, 23, 59, 59, 999900).replace(tzinfo=tz))
620+
python=datetime(2001, 8, 22, 23, 59, 59, 999900, tzinfo=tz))
621621
.add_field(
622622
sql=f"TIMESTAMP '2001-08-22 23:59:59.99999 {tz_str}'",
623-
python=datetime(2001, 8, 22, 23, 59, 59, 999990).replace(tzinfo=tz))
623+
python=datetime(2001, 8, 22, 23, 59, 59, 999990, tzinfo=tz))
624624
.add_field(
625625
sql=f"TIMESTAMP '2001-08-22 23:59:59.999999 {tz_str}'",
626-
python=datetime(2001, 8, 22, 23, 59, 59, 999999).replace(tzinfo=tz))
626+
python=datetime(2001, 8, 22, 23, 59, 59, 999999, tzinfo=tz))
627627
# round down
628628
.add_field(
629629
sql=f"TIMESTAMP '2001-08-22 12:34:56.1234561 {tz_str}'",
630-
python=datetime(2001, 8, 22, 12, 34, 56, 123456).replace(tzinfo=tz))
630+
python=datetime(2001, 8, 22, 12, 34, 56, 123456, tzinfo=tz))
631631
# round down, min value
632632
.add_field(
633633
sql=f"TIMESTAMP '2001-08-22 00:00:00.000000000001 {tz_str}'",
634-
python=datetime(2001, 8, 22, 0, 0, 0, 0).replace(tzinfo=tz))
634+
python=datetime(2001, 8, 22, 0, 0, 0, 0, tzinfo=tz))
635635
.add_field(
636636
sql=f"TIMESTAMP '2001-08-22 00:00:00.0000001 {tz_str}'",
637-
python=datetime(2001, 8, 22, 0, 0, 0, 0).replace(tzinfo=tz))
637+
python=datetime(2001, 8, 22, 0, 0, 0, 0, tzinfo=tz))
638638
# round down, max value
639639
.add_field(
640640
sql=f"TIMESTAMP '2001-08-22 00:00:00.0000004 {tz_str}'",
641-
python=datetime(2001, 8, 22, 0, 0, 0, 0).replace(tzinfo=tz))
641+
python=datetime(2001, 8, 22, 0, 0, 0, 0, tzinfo=tz))
642642
.add_field(
643643
sql=f"TIMESTAMP '2001-08-22 00:00:00.00000049 {tz_str}'",
644-
python=datetime(2001, 8, 22, 0, 0, 0, 0).replace(tzinfo=tz))
644+
python=datetime(2001, 8, 22, 0, 0, 0, 0, tzinfo=tz))
645645
.add_field(
646646
sql=f"TIMESTAMP '2001-08-22 00:00:00.0000005 {tz_str}'",
647-
python=datetime(2001, 8, 22, 0, 0, 0, 0).replace(tzinfo=tz))
647+
python=datetime(2001, 8, 22, 0, 0, 0, 0, tzinfo=tz))
648648
.add_field(
649649
sql=f"TIMESTAMP '2001-08-22 00:00:00.00000050 {tz_str}'",
650-
python=datetime(2001, 8, 22, 0, 0, 0, 0).replace(tzinfo=tz))
650+
python=datetime(2001, 8, 22, 0, 0, 0, 0, tzinfo=tz))
651651
.add_field(
652652
sql=f"TIMESTAMP '2001-08-22 23:59:59.9999994 {tz_str}'",
653-
python=datetime(2001, 8, 22, 23, 59, 59, 999999).replace(tzinfo=tz))
653+
python=datetime(2001, 8, 22, 23, 59, 59, 999999, tzinfo=tz))
654654
.add_field(
655655
sql=f"TIMESTAMP '2001-08-22 23:59:59.9999994999 {tz_str}'",
656-
python=datetime(2001, 8, 22, 23, 59, 59, 999999).replace(tzinfo=tz))
656+
python=datetime(2001, 8, 22, 23, 59, 59, 999999, tzinfo=tz))
657657
# round up
658658
.add_field(
659659
sql=f"TIMESTAMP '2001-08-22 12:34:56.123456789 {tz_str}'",
660-
python=datetime(2001, 8, 22, 12, 34, 56, 123457).replace(tzinfo=tz))
660+
python=datetime(2001, 8, 22, 12, 34, 56, 123457, tzinfo=tz))
661661
# round up, min value
662662
.add_field(
663663
sql=f"TIMESTAMP '2001-08-22 00:00:00.000000500001 {tz_str}'",
664-
python=datetime(2001, 8, 22, 0, 0, 0, 1).replace(tzinfo=tz))
664+
python=datetime(2001, 8, 22, 0, 0, 0, 1, tzinfo=tz))
665665
# round up, max value
666666
.add_field(
667667
sql=f"TIMESTAMP '2001-08-22 00:00:00.0000009 {tz_str}'",
668-
python=datetime(2001, 8, 22, 0, 0, 0, 1).replace(tzinfo=tz))
668+
python=datetime(2001, 8, 22, 0, 0, 0, 1, tzinfo=tz))
669669
.add_field(
670670
sql=f"TIMESTAMP '2001-08-22 00:00:00.00000099999 {tz_str}'",
671-
python=datetime(2001, 8, 22, 0, 0, 0, 1).replace(tzinfo=tz))
671+
python=datetime(2001, 8, 22, 0, 0, 0, 1, tzinfo=tz))
672672
# round up to next day, min value
673673
.add_field(
674674
sql=f"TIMESTAMP '2001-08-22 23:59:59.9999995 {tz_str}'",
675-
python=datetime(2001, 8, 23, 0, 0, 0, 0).replace(tzinfo=tz))
675+
python=datetime(2001, 8, 23, 0, 0, 0, 0, tzinfo=tz))
676676
.add_field(
677677
sql=f"TIMESTAMP '2001-08-22 23:59:59.999999500001 {tz_str}'",
678-
python=datetime(2001, 8, 23, 0, 0, 0, 0).replace(tzinfo=tz))
678+
python=datetime(2001, 8, 23, 0, 0, 0, 0, tzinfo=tz))
679679
# round up to next day, max value
680680
.add_field(
681681
sql=f"TIMESTAMP '2001-08-22 23:59:59.9999999 {tz_str}'",
682-
python=datetime(2001, 8, 23, 0, 0, 0, 0).replace(tzinfo=tz))
682+
python=datetime(2001, 8, 23, 0, 0, 0, 0, tzinfo=tz))
683683
.add_field(
684684
sql=f"TIMESTAMP '2001-08-22 23:59:59.999999999 {tz_str}'",
685-
python=datetime(2001, 8, 23, 0, 0, 0, 0).replace(tzinfo=tz))
685+
python=datetime(2001, 8, 23, 0, 0, 0, 0, tzinfo=tz))
686686
# ce
687687
.add_field(
688688
sql=f"TIMESTAMP '0001-01-01 01:23:45.123 {tz_str}'",
689-
python=datetime(1, 1, 1, 1, 23, 45, 123000).replace(tzinfo=tz))
689+
python=datetime(1, 1, 1, 1, 23, 45, 123000, tzinfo=tz))
690690
# Julian calendar
691691
.add_field(
692692
sql=f"TIMESTAMP '1582-10-04 01:23:45.123 {tz_str}'",
693-
python=datetime(1582, 10, 4, 1, 23, 45, 123000).replace(tzinfo=tz))
693+
python=datetime(1582, 10, 4, 1, 23, 45, 123000, tzinfo=tz))
694694
# during switch
695695
.add_field(
696696
sql=f"TIMESTAMP '1582-10-05 01:23:45.123 {tz_str}'",
697-
python=datetime(1582, 10, 5, 1, 23, 45, 123000).replace(tzinfo=tz))
697+
python=datetime(1582, 10, 5, 1, 23, 45, 123000, tzinfo=tz))
698698
# Gregorian calendar
699699
.add_field(
700700
sql=f"TIMESTAMP '1582-10-14 01:23:45.123 {tz_str}'",
701-
python=datetime(1582, 10, 14, 1, 23, 45, 123000).replace(tzinfo=tz))
701+
python=datetime(1582, 10, 14, 1, 23, 45, 123000, tzinfo=tz))
702702
).execute()
703703

704704

@@ -710,11 +710,11 @@ def test_timestamp_with_timezone_dst(trino_connection):
710710
.add_field(
711711
sql=f"TIMESTAMP '2022-03-27 01:59:59.999999999 {tz_str}'",
712712
# 2:00:00 (STD) becomes 3:00:00 (DST))
713-
python=datetime(2022, 3, 27, 2, 0, 0).replace(tzinfo=tz))
713+
python=datetime(2022, 3, 27, 2, 0, 0, tzinfo=tz))
714714
.add_field(
715715
sql=f"TIMESTAMP '2022-10-30 02:59:59.999999999 {tz_str}'",
716716
# 3:00:00 (DST) becomes 2:00:00 (STD))
717-
python=datetime(2022, 10, 30, 3, 0, 0).replace(tzinfo=tz))
717+
python=datetime(2022, 10, 30, 3, 0, 0, tzinfo=tz))
718718
).execute()
719719

720720

0 commit comments

Comments
 (0)