@@ -226,9 +226,9 @@ public function scopeBetweenOnly(Builder $query, array $participants)
226
226
227
227
return $ query ->whereHas ('participants ' , function (Builder $ builder ) use ($ participants , $ participantTable ) {
228
228
return $ builder ->whereIn ('user_id ' , $ participants )
229
- ->groupBy ($ participantTable. '.thread_id ' )
230
- ->select ($ participantTable. '.thread_id ' )
231
- ->havingRaw ('COUNT( ' . $ participantTable. '.thread_id)=? ' , [count ($ participants )]);
229
+ ->groupBy ($ participantTable . '.thread_id ' )
230
+ ->select ($ participantTable . '.thread_id ' )
231
+ ->havingRaw ('COUNT( ' . $ participantTable . '.thread_id)=? ' , [count ($ participants )]);
232
232
});
233
233
}
234
234
@@ -407,20 +407,20 @@ protected function createSelectString($columns)
407
407
$ usersTable = Models::table ('users ' );
408
408
409
409
switch ($ dbDriver ) {
410
- case 'pgsql ' :
411
- case 'sqlite ' :
412
- $ columnString = implode (" || ' ' || " . $ tablePrefix . $ usersTable . '. ' , $ columns );
413
- $ selectString = '( ' . $ tablePrefix . $ usersTable . '. ' . $ columnString . ') as name ' ;
414
-
415
- break ;
416
- case 'sqlsrv ' :
417
- $ columnString = implode (" + ' ' + " . $ tablePrefix . $ usersTable . '. ' , $ columns );
418
- $ selectString = '( ' . $ tablePrefix . $ usersTable . '. ' . $ columnString . ') as name ' ;
419
-
420
- break ;
421
- default :
422
- $ columnString = implode (", ' ', " . $ tablePrefix . $ usersTable . '. ' , $ columns );
423
- $ selectString = 'concat( ' . $ tablePrefix . $ usersTable . '. ' . $ columnString . ') as name ' ;
410
+ case 'pgsql ' :
411
+ case 'sqlite ' :
412
+ $ columnString = implode (" || ' ' || " . $ tablePrefix . $ usersTable . '. ' , $ columns );
413
+ $ selectString = '( ' . $ tablePrefix . $ usersTable . '. ' . $ columnString . ') as name ' ;
414
+
415
+ break ;
416
+ case 'sqlsrv ' :
417
+ $ columnString = implode (" + ' ' + " . $ tablePrefix . $ usersTable . '. ' , $ columns );
418
+ $ selectString = '( ' . $ tablePrefix . $ usersTable . '. ' . $ columnString . ') as name ' ;
419
+
420
+ break ;
421
+ default :
422
+ $ columnString = implode (", ' ', " . $ tablePrefix . $ usersTable . '. ' , $ columns );
423
+ $ selectString = 'concat( ' . $ tablePrefix . $ usersTable . '. ' . $ columnString . ') as name ' ;
424
424
}
425
425
426
426
return $ selectString ;
0 commit comments