@@ -680,36 +680,36 @@ void testFullJoin() {
680
680
SelectStatementProvider selectStatement = select (orderLine .orderId , orderLine .quantity , orderLine .itemId .as ("ol_itemid" ), itemMaster .itemId .as ("im_itemid" ), itemMaster .description )
681
681
.from (itemMaster , "im" )
682
682
.fullJoin (orderLine , "ol" ).on (itemMaster .itemId , equalTo (orderLine .itemId ))
683
- .orderBy (sortColumn ("im_itemid" ))
683
+ .orderBy (orderLine . orderId , sortColumn ("im_itemid" ))
684
684
.build ()
685
685
.render (RenderingStrategies .MYBATIS3 );
686
686
687
687
String expectedStatement = "select ol.order_id, ol.quantity, ol.item_id as ol_itemid, im.item_id as im_itemid, im.description"
688
688
+ " from ItemMaster im full join OrderLine ol on im.item_id = ol.item_id"
689
- + " order by im_itemid" ;
689
+ + " order by order_id, im_itemid" ;
690
690
assertThat (selectStatement .getSelectStatement ()).isEqualTo (expectedStatement );
691
691
692
692
List <Map <String , Object >> rows = mapper .selectManyMappedRows (selectStatement );
693
693
694
694
assertThat (rows ).hasSize (6 );
695
695
Map <String , Object > row = rows .get (0 );
696
- assertThat (row ).containsEntry ("ORDER_ID" , 2 );
697
- assertThat (row ).containsEntry ("QUANTITY" , 6 );
698
- assertThat (row ).containsEntry ("OL_ITEMID" , 66 );
699
- assertThat (row ).doesNotContainKey ("DESCRIPTION" );
700
- assertThat (row ).doesNotContainKey ("IM_ITEMID" );
696
+ assertThat (row ).doesNotContainKey ("ORDER_ID" );
697
+ assertThat (row ).doesNotContainKey ("QUANTITY" );
698
+ assertThat (row ).containsEntry ("DESCRIPTION" , "Catcher Glove" );
699
+ assertThat (row ).containsEntry ("IM_ITEMID" , 55 );
701
700
702
- row = rows .get (3 );
701
+ row = rows .get (2 );
703
702
assertThat (row ).containsEntry ("ORDER_ID" , 1 );
704
703
assertThat (row ).containsEntry ("QUANTITY" , 1 );
705
704
assertThat (row ).containsEntry ("DESCRIPTION" , "First Base Glove" );
706
705
assertThat (row ).containsEntry ("IM_ITEMID" , 33 );
707
706
708
- row = rows .get (5 );
709
- assertThat (row ).doesNotContainKey ("ORDER_ID" );
710
- assertThat (row ).doesNotContainKey ("QUANTITY" );
711
- assertThat (row ).containsEntry ("DESCRIPTION" , "Catcher Glove" );
712
- assertThat (row ).containsEntry ("IM_ITEMID" , 55 );
707
+ row = rows .get (3 );
708
+ assertThat (row ).containsEntry ("ORDER_ID" , 2 );
709
+ assertThat (row ).containsEntry ("QUANTITY" , 6 );
710
+ assertThat (row ).containsEntry ("OL_ITEMID" , 66 );
711
+ assertThat (row ).doesNotContainKey ("DESCRIPTION" );
712
+ assertThat (row ).doesNotContainKey ("IM_ITEMID" );
713
713
}
714
714
}
715
715
0 commit comments