@@ -134,7 +134,7 @@ public function testIn()
134134 $ this ->assertEquals (4 , count ($ users ));
135135
136136 $ users = User::whereNotNull ('age ' )
137- ->whereNotIn ('age ' , array (33 , 35 ))->get ();
137+ ->whereNotIn ('age ' , array (33 , 35 ))->get ();
138138 $ this ->assertEquals (3 , count ($ users ));
139139 }
140140
@@ -214,31 +214,56 @@ public function testCount()
214214 public function testSubquery ()
215215 {
216216 $ users = User::where ('title ' , 'admin ' )->orWhere (function ($ query )
217- {
218- $ query ->where ('name ' , 'Tommy Toe ' )
219- ->orWhere ('name ' , 'Error ' );
220- })
221- ->get ();
222-
223- $ this ->assertEquals (5 , count ($ users ));
224-
225- $ users = User::where ('title ' , 'user ' )->where (function ($ query )
226- {
227- $ query ->where ('age ' , 35 )
228- ->orWhere ('name ' , 'like ' , '%harry% ' );
229- })
230- ->get ();
231-
232- $ this ->assertEquals (2 , count ($ users ));
233-
234- $ users = User::where ('age ' , 35 )->orWhere (function ($ query )
235- {
236- $ query ->where ('title ' , 'admin ' )
237- ->orWhere ('name ' , 'Error ' );
238- })
239- ->get ();
240-
241- $ this ->assertEquals (5 , count ($ users ));
217+ {
218+ $ query ->where ('name ' , 'Tommy Toe ' )
219+ ->orWhere ('name ' , 'Error ' );
220+ })
221+ ->get ();
222+
223+ $ this ->assertEquals (5 , count ($ users ));
224+
225+ $ users = User::where ('title ' , 'user ' )->where (function ($ query )
226+ {
227+ $ query ->where ('age ' , 35 )
228+ ->orWhere ('name ' , 'like ' , '%harry% ' );
229+ })
230+ ->get ();
231+
232+ $ this ->assertEquals (2 , count ($ users ));
233+
234+ $ users = User::where ('age ' , 35 )->orWhere (function ($ query )
235+ {
236+ $ query ->where ('title ' , 'admin ' )
237+ ->orWhere ('name ' , 'Error ' );
238+ })
239+ ->get ();
240+
241+ $ this ->assertEquals (5 , count ($ users ));
242+
243+ $ users = User::whereNull ('deleted_at ' )
244+ ->where ('title ' , 'admin ' )
245+ ->where (function ($ query )
246+ {
247+ $ query ->where ('age ' , '> ' , 15 )
248+ ->orWhere ('name ' , 'Harry Hoe ' );
249+ })
250+ ->get ();
251+
252+ $ this ->assertEquals (3 , $ users ->count ());
253+
254+ $ users = User::whereNull ('deleted_at ' )
255+ ->where (function ($ query )
256+ {
257+ $ query ->where ('name ' , 'Harry Hoe ' )
258+ ->orWhere (function ($ query )
259+ {
260+ $ query ->where ('age ' , '> ' , 15 )
261+ ->where ('title ' , '<> ' , 'admin ' );
262+ });
263+ })
264+ ->get ();
265+
266+ $ this ->assertEquals (5 , $ users ->count ());
242267 }
243268
244269 public function testWhereRaw ()
0 commit comments