Skip to content

Commit 7873e41

Browse files
rohit01010rohit01010
committed
Fix test failure: datetime_roundoff upgrade tests (babelfish-for-postgresql#4569)
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 dcd5458 commit 7873e41

9 files changed

+270
-270
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
@@ -575,37 +575,37 @@ Records with .007 precision#!#1
575575

576576

577577
-- BASIC UPGRADE TESTING
578-
select * from datetime_test where date_time1 = '2014-03-12 12:00:34.467'
578+
select date_time1, date_time2 from datetime_test where date_time1 = '2014-03-12 12:00:34.467'
579579
GO
580580
~~START~~
581-
int#!#datetime#!#datetime
582-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
581+
datetime#!#datetime
582+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
583583
~~END~~
584584

585585

586-
select * from datetime_test where date_time1 = '2014-03-12 12:00:34.466'
586+
select date_time1, date_time2 from datetime_test where date_time1 = '2014-03-12 12:00:34.466'
587587
GO
588588
~~START~~
589-
int#!#datetime#!#datetime
590-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
589+
datetime#!#datetime
590+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
591591
~~END~~
592592

593593

594-
select * from datetime_test where date_time1 <= '2014-03-12 12:00:34.467'
594+
select date_time1, date_time2 from datetime_test where date_time1 <= '2014-03-12 12:00:34.467'
595595
GO
596596
~~START~~
597-
int#!#datetime#!#datetime
598-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
599-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
597+
datetime#!#datetime
598+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
599+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
600600
~~END~~
601601

602602

603-
select * from datetime_test where date_time1 <= '2014-03-12 12:00:34.466'
603+
select date_time1, date_time2 from datetime_test where date_time1 <= '2014-03-12 12:00:34.466'
604604
GO
605605
~~START~~
606-
int#!#datetime#!#datetime
607-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
608-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
606+
datetime#!#datetime
607+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
608+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
609609
~~END~~
610610

611611

@@ -653,25 +653,25 @@ GO
653653
~~ROW COUNT: 1~~
654654

655655

656-
select * from datetime_test where date_time1 <= '2014-03-12 12:00:34.467'
656+
select date_time1, date_time2 from datetime_test where date_time1 <= '2014-03-12 12:00:34.467'
657657
GO
658658
~~START~~
659-
int#!#datetime#!#datetime
660-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
661-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
662-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
663-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
659+
datetime#!#datetime
660+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
661+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
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
664664
~~END~~
665665

666666

667-
select * from datetime_test where date_time1 <= '2014-03-12 12:00:34.466'
667+
select date_time1, date_time2 from datetime_test where date_time1 <= '2014-03-12 12:00:34.466'
668668
GO
669669
~~START~~
670-
int#!#datetime#!#datetime
671-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
672-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
673-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
674-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
670+
datetime#!#datetime
671+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
672+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
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
675675
~~END~~
676676

677677

@@ -683,68 +683,68 @@ GO
683683
~~ROW COUNT: 4~~
684684

685685

686-
SELECT * FROM datetime_test;
686+
select date_time1, date_time2 FROM datetime_test;
687687
GO
688688
~~START~~
689-
int#!#datetime#!#datetime
690-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
691-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
692-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
693-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
689+
datetime#!#datetime
690+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
691+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
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
694694
~~END~~
695695

696696

697-
SELECT * FROM datetime_test_new;
697+
select date_time1, date_time2 FROM datetime_test_new;
698698
GO
699699
~~START~~
700-
int#!#datetime#!#datetime
701-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
702-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
703-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
704-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
700+
datetime#!#datetime
701+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
702+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
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
705705
~~END~~
706706

707707

708-
select * from datetime_test_new where date_time1 = '2014-03-12 12:00:34.467'
708+
select date_time1, date_time2 from datetime_test_new where date_time1 = '2014-03-12 12:00:34.467'
709709
GO
710710
~~START~~
711-
int#!#datetime#!#datetime
712-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
713-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
714-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
711+
datetime#!#datetime
712+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
713+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
714+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
715715
~~END~~
716716

717717

718-
select * from datetime_test_new where date_time1 = '2014-03-12 12:00:34.466'
718+
select date_time1, date_time2 from datetime_test_new where date_time1 = '2014-03-12 12:00:34.466'
719719
GO
720720
~~START~~
721-
int#!#datetime#!#datetime
722-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
723-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
724-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
721+
datetime#!#datetime
722+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
723+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
724+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
725725
~~END~~
726726

727727

728728
-- psql
729-
SELECT * FROM master_dbo.datetime_test_new;
729+
select date_time1, date_time2 FROM master_dbo.datetime_test_new;
730730
GO
731731
~~START~~
732-
serial#!#"sys"."datetime"#!#"sys"."datetime"
733-
1#!#2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
734-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
735-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
736-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
732+
"sys"."datetime"#!#"sys"."datetime"
733+
2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
734+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
735+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
736+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
737737
~~END~~
738738

739739

740-
SELECT * FROM master_dbo.datetime_test;
740+
select date_time1, date_time2 FROM master_dbo.datetime_test;
741741
GO
742742
~~START~~
743-
serial#!#"sys"."datetime"#!#"sys"."datetime"
744-
1#!#2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
745-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
746-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
747-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
743+
"sys"."datetime"#!#"sys"."datetime"
744+
2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
745+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
746+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
747+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
748748
~~END~~
749749

750750

@@ -755,14 +755,14 @@ GO
755755

756756

757757
-- psql
758-
SELECT * FROM master_dbo.datetime_test;
758+
select date_time1, date_time2 FROM master_dbo.datetime_test;
759759
GO
760760
~~START~~
761-
serial#!#"sys"."datetime"#!#"sys"."datetime"
762-
1#!#2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
763-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
764-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
765-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
761+
"sys"."datetime"#!#"sys"."datetime"
762+
2014-03-12 12:00:34.466#!#2010-03-04 12:55:41.149
763+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
764+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
765+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
766766
~~END~~
767767

768768

@@ -774,14 +774,14 @@ GO
774774

775775

776776
-- psql
777-
SELECT * FROM master_dbo.datetime_test;
777+
select date_time1, date_time2 FROM master_dbo.datetime_test;
778778
GO
779779
~~START~~
780-
serial#!#"sys"."datetime"#!#"sys"."datetime"
781-
1#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
782-
2#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
783-
3#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
784-
4#!#2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
780+
"sys"."datetime"#!#"sys"."datetime"
781+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
782+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
783+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
784+
2014-03-12 12:00:34.467#!#2010-03-04 12:55:41.15
785785
~~END~~
786786

787787

‎test/JDBC/expected/datetime_roundoff-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)