@@ -42,7 +42,7 @@ function ($r1, $r2) {
42
42
return $ r1 ('other ' )->eq ($ r2 ('id ' ));
43
43
}
44
44
)
45
- ->orderBy (array (r \row ( "left " )->getField ("id " ), r \row ( "right " )->getField ("id " )))
45
+ ->orderBy (array (function ( $ x ) { return $ x ( "left " )->getField ("id " ); }, function ( $ x ) { return $ x ( "right " )->getField ("id " ); } ))
46
46
->run ($ this ->conn );
47
47
48
48
$ this ->assertEquals ($ excpected , $ this ->orderArrayByLeftAndRightId ($ res ));
@@ -68,7 +68,7 @@ function ($r1, $r2) {
68
68
return $ r1 ('other ' )->eq ($ r2 ('id ' ));
69
69
}
70
70
)
71
- ->orderBy (array (r \row ( "left " )->getField ("id " ), r \row ( "right " )->getField ("id " )))
71
+ ->orderBy (array (function ( $ x ) { return $ x ( "left " )->getField ("id " ); }, function ( $ x ) { return $ x ( "right " )->getField ("id " ); } ))
72
72
->run ($ this ->conn );
73
73
74
74
$ this ->assertEquals ($ excpected , $ this ->orderArrayByLeftAndRightId ($ res ));
@@ -98,7 +98,7 @@ function ($r1, $r2) {
98
98
return $ r1 ('other ' )->eq ($ r2 ('id ' ));
99
99
}
100
100
)
101
- ->orderBy (array (r \row ( "left " )->getField ("id " ), r \row ( "right " )->getField ("id " )))
101
+ ->orderBy (array (function ( $ x ) { return $ x ( "left " )->getField ("id " ); }, function ( $ x ) { return $ x ( "right " )->getField ("id " ); } ))
102
102
->run ($ this ->conn );
103
103
104
104
$ this ->assertEquals ($ excpected , $ this ->orderArrayByLeftAndRightId ($ res ));
@@ -125,7 +125,7 @@ function ($r1, $r2) {
125
125
return $ r1 ('other ' )->eq ($ r2 ('id ' ));
126
126
}
127
127
)
128
- ->orderBy (array (r \row ( "left " )->getField ("id " ), r \row ( "right " )->getField ("id " )))
128
+ ->orderBy (array (function ( $ x ) { return $ x ( "left " )->getField ("id " ); }, function ( $ x ) { return $ x ( "right " )->getField ("id " ); } ))
129
129
->run ($ this ->conn );
130
130
131
131
$ this ->assertEquals ($ excpected , $ this ->orderArrayByLeftAndRightId ($ res ));
@@ -150,7 +150,7 @@ public function testEqJoinOther()
150
150
151
151
$ res = $ this ->db ()->table ('t1 ' )
152
152
->eqJoin ('other ' , $ this ->db ()->table ('t2 ' ))
153
- ->orderBy (array (r \row ( "left " )->getField ("id " ), r \row ( "right " )->getField ("id " )))
153
+ ->orderBy (array (function ( $ x ) { return $ x ( "left " )->getField ("id " ); }, function ( $ x ) { return $ x ( "right " )->getField ("id " ); } ))
154
154
->run ($ this ->conn );
155
155
156
156
$ this ->assertEquals ($ excpected , $ this ->orderArrayByLeftAndRightId ($ res ));
@@ -171,7 +171,7 @@ public function testEqJoinId()
171
171
172
172
$ res = $ this ->db ()->table ('t1 ' )
173
173
->eqJoin ('id ' , $ this ->db ()->table ('t2 ' ), array ('index ' => 'other ' ))
174
- ->orderBy (array (r \row ( "left " )->getField ("id " ), r \row ( "right " )->getField ("id " )))
174
+ ->orderBy (array (function ( $ x ) { return $ x ( "left " )->getField ("id " ); }, function ( $ x ) { return $ x ( "right " )->getField ("id " ); } ))
175
175
->run ($ this ->conn );
176
176
177
177
$ this ->assertEquals ($ excpected , $ this ->orderArrayByLeftAndRightId ($ res ));
@@ -198,7 +198,7 @@ public function testEqJoinFunc()
198
198
->eqJoin (function ($ x ) {
199
199
return $ x ('other ' );
200
200
}, $ this ->db ()->table ('t2 ' ))
201
- ->orderBy (array (r \row ( "left " )->getField ("id " ), r \row ( "right " )->getField ("id " )))
201
+ ->orderBy (array (function ( $ x ) { return $ x ( "left " )->getField ("id " ); }, function ( $ x ) { return $ x ( "right " )->getField ("id " ); } ))
202
202
->run ($ this ->conn );
203
203
204
204
$ this ->assertEquals ($ excpected , $ this ->orderArrayByLeftAndRightId ($ res ));
0 commit comments