Skip to content

Commit de91d30

Browse files
rohit01010rohit01010
authored
[TEST ONLY] Fix test failure: datetime_roundoff upgrade tests
Currently datetime_roundoff tests may fail in Major version upgrade tests due to different output of identity column, since tests in datetime_roundoff test files are to test datetime_roundoff, avoided printing identity column values to fix test failures. Signed-off-by: Rohit Bhagat rohitbgt@amazon.com
1 parent 1547789 commit de91d30

13 files changed

+370
-370
lines changed

‎test/JDBC/expected/datetime_roundoff-before-16_10-or-17_6-vu-prepare.out‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,19 +236,19 @@ GO
236236

237237

238238

239-
select * from datetime_test where date_time1 = '2014-03-12 12:00:34.467'
239+
select date_time1, date_time2 from datetime_test where date_time1 = '2014-03-12 12:00:34.467'
240240
GO
241241
~~START~~
242-
int#!#datetime#!#datetime
243-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
242+
datetime#!#datetime
243+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
244244
~~END~~
245245

246246

247-
select * from datetime_test where date_time1 = '2014-03-12 12:00:34.466'
247+
select date_time1, date_time2 from datetime_test where date_time1 = '2014-03-12 12:00:34.466'
248248
GO
249249
~~START~~
250-
int#!#datetime#!#datetime
251-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
250+
datetime#!#datetime
251+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
252252
~~END~~
253253

254254

‎test/JDBC/expected/datetime_roundoff-before-16_10-or-17_6-vu-verify.out‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -577,37 +577,37 @@ Records with .007 precision#!#0
577577

578578

579579
-- BASIC UPGRADE TESTING
580-
select * from datetime_test where date_time1 = '2014-03-12 12:00:34.467'
580+
select date_time1, date_time2 from datetime_test where date_time1 = '2014-03-12 12:00:34.467'
581581
GO
582582
~~START~~
583-
int#!#datetime#!#datetime
584-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
583+
datetime#!#datetime
584+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
585585
~~END~~
586586

587587

588-
select * from datetime_test where date_time1 = '2014-03-12 12:00:34.466'
588+
select date_time1, date_time2 from datetime_test where date_time1 = '2014-03-12 12:00:34.466'
589589
GO
590590
~~START~~
591-
int#!#datetime#!#datetime
592-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
591+
datetime#!#datetime
592+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
593593
~~END~~
594594

595595

596-
select * from datetime_test where date_time1 <= '2014-03-12 12:00:34.467'
596+
select date_time1, date_time2 from datetime_test where date_time1 <= '2014-03-12 12:00:34.467'
597597
GO
598598
~~START~~
599-
int#!#datetime#!#datetime
600-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
601-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
599+
datetime#!#datetime
600+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
601+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
602602
~~END~~
603603

604604

605-
select * from datetime_test where date_time1 <= '2014-03-12 12:00:34.466'
605+
select date_time1, date_time2 from datetime_test where date_time1 <= '2014-03-12 12:00:34.466'
606606
GO
607607
~~START~~
608-
int#!#datetime#!#datetime
609-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
610-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
608+
datetime#!#datetime
609+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
610+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
611611
~~END~~
612612

613613

@@ -655,25 +655,25 @@ GO
655655
~~ROW COUNT: 1~~
656656

657657

658-
select * from datetime_test where date_time1 <= '2014-03-12 12:00:34.467'
658+
select date_time1, date_time2 from datetime_test where date_time1 <= '2014-03-12 12:00:34.467'
659659
GO
660660
~~START~~
661-
int#!#datetime#!#datetime
662-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
663-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
664-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
665-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
661+
datetime#!#datetime
662+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
663+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
664+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
665+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
666666
~~END~~
667667

668668

669-
select * from datetime_test where date_time1 <= '2014-03-12 12:00:34.466'
669+
select date_time1, date_time2 from datetime_test where date_time1 <= '2014-03-12 12:00:34.466'
670670
GO
671671
~~START~~
672-
int#!#datetime#!#datetime
673-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
674-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
675-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
676-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
672+
datetime#!#datetime
673+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
674+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
675+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
676+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
677677
~~END~~
678678

679679

@@ -685,68 +685,68 @@ GO
685685
~~ROW COUNT: 4~~
686686

687687

688-
SELECT * FROM datetime_test;
688+
select date_time1, date_time2 FROM datetime_test;
689689
GO
690690
~~START~~
691-
int#!#datetime#!#datetime
692-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
693-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
694-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
695-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
691+
datetime#!#datetime
692+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
693+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
694+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
695+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
696696
~~END~~
697697

698698

699-
SELECT * FROM datetime_test_new;
699+
select date_time1, date_time2 FROM datetime_test_new;
700700
GO
701701
~~START~~
702-
int#!#datetime#!#datetime
703-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
704-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
705-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
706-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
702+
datetime#!#datetime
703+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
704+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
705+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
706+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
707707
~~END~~
708708

709709

710-
select * from datetime_test_new where date_time1 = '2014-03-12 12:00:34.467'
710+
select date_time1, date_time2 from datetime_test_new where date_time1 = '2014-03-12 12:00:34.467'
711711
GO
712712
~~START~~
713-
int#!#datetime#!#datetime
714-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
715-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
716-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
713+
datetime#!#datetime
714+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
715+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
716+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
717717
~~END~~
718718

719719

720-
select * from datetime_test_new where date_time1 = '2014-03-12 12:00:34.466'
720+
select date_time1, date_time2 from datetime_test_new where date_time1 = '2014-03-12 12:00:34.466'
721721
GO
722722
~~START~~
723-
int#!#datetime#!#datetime
724-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
725-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
726-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
723+
datetime#!#datetime
724+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
725+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
726+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
727727
~~END~~
728728

729729

730730
-- psql
731-
SELECT * FROM master_dbo.datetime_test_new;
731+
select date_time1, date_time2 FROM master_dbo.datetime_test_new;
732732
GO
733733
~~START~~
734-
serial#!#"sys"."datetime"#!#"sys"."datetime"
735-
1#!#2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
736-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
737-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
738-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
734+
"sys"."datetime"#!#"sys"."datetime"
735+
2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
736+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
737+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
738+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
739739
~~END~~
740740

741741

742-
SELECT * FROM master_dbo.datetime_test;
742+
select date_time1, date_time2 FROM master_dbo.datetime_test;
743743
GO
744744
~~START~~
745-
serial#!#"sys"."datetime"#!#"sys"."datetime"
746-
1#!#2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
747-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
748-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
749-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
745+
"sys"."datetime"#!#"sys"."datetime"
746+
2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
747+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
748+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
749+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
750750
~~END~~
751751

752752

@@ -757,14 +757,14 @@ GO
757757

758758

759759
-- psql
760-
SELECT * FROM master_dbo.datetime_test;
760+
select date_time1, date_time2 FROM master_dbo.datetime_test;
761761
GO
762762
~~START~~
763-
serial#!#"sys"."datetime"#!#"sys"."datetime"
764-
1#!#2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
765-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
766-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
767-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
763+
"sys"."datetime"#!#"sys"."datetime"
764+
2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
765+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
766+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
767+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
768768
~~END~~
769769

770770

@@ -776,14 +776,14 @@ GO
776776

777777

778778
-- psql
779-
SELECT * FROM master_dbo.datetime_test;
779+
select date_time1, date_time2 FROM master_dbo.datetime_test;
780780
GO
781781
~~START~~
782-
serial#!#"sys"."datetime"#!#"sys"."datetime"
783-
1#!#2014-03-12 12:00:00#!#2010-03-04 12:55:00
784-
2#!#2014-03-12 12:00:00#!#2010-03-04 12:55:00
785-
3#!#2014-03-12 12:00:00#!#2010-03-04 12:55:00
786-
4#!#2014-03-12 12:00:00#!#2010-03-04 12:55:00
782+
"sys"."datetime"#!#"sys"."datetime"
783+
2014-03-12 12:00:00#!#2010-03-04 12:55:00
784+
2014-03-12 12:00:00#!#2010-03-04 12:55:00
785+
2014-03-12 12:00:00#!#2010-03-04 12:55:00
786+
2014-03-12 12:00:00#!#2010-03-04 12:55:00
787787
~~END~~
788788

789789

‎test/JDBC/expected/datetime_roundoff-before-17_8-or-16_12-vu-prepare.out‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,21 +236,21 @@ GO
236236

237237

238238

239-
select * from datetime_test where date_time1 = '2014-03-12 12:00:34.467'
239+
select date_time1, date_time2 from datetime_test where date_time1 = '2014-03-12 12:00:34.467'
240240
GO
241241
~~START~~
242-
int#!#datetime#!#datetime
243-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
244-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
242+
datetime#!#datetime
243+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
244+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
245245
~~END~~
246246

247247

248-
select * from datetime_test where date_time1 = '2014-03-12 12:00:34.466'
248+
select date_time1, date_time2 from datetime_test where date_time1 = '2014-03-12 12:00:34.466'
249249
GO
250250
~~START~~
251-
int#!#datetime#!#datetime
252-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
253-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
251+
datetime#!#datetime
252+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
253+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
254254
~~END~~
255255

256256

0 commit comments

Comments
 (0)