Update QueryDataTableTest.php

Author: Arkhas

tests/Unit/QueryDataTableTest.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
+use Yajra\DataTables\Tests\Models\Post;
 use Yajra\DataTables\Tests\Models\User;
 use Yajra\DataTables\Tests\TestCase;
 
@@ -111,10 +112,27 @@ public function test_simple_queries_with_complexe_select_are_not_wrapped()
         );
 
         $this->assertQueryWrapped(false, $dataTable->prepareCountQuery());
-        $this->assertQueryIsFromSub(false, $dataTable->prepareCountQuery());
         $this->assertEquals(20, $dataTable->count());
     }
 
+    public function test_simple_queries_with_complexe_where_are_not_wrapped()
+    {
+        /** @var \Yajra\DataTables\QueryDataTable $dataTable */
+        $dataTable = app('datatables')->of(
+            DB::table('users')
+                ->select('users.*')
+                ->where(
+                    DB::table('posts')
+                        ->whereColumn('posts.user_id', 'users.id')
+                        ->orderBy('created_at')
+                        ->select('title'), 'User-1 Post-1'
+                )
+        );
+
+        $this->assertQueryWrapped(false, $dataTable->prepareCountQuery());
+        $this->assertEquals(1, $dataTable->prepareCountQuery()->first()->row_count);
+    }
+
     public function test_simple_queries_are_not_wrapped_and_countable()
     {
         /** @var \Yajra\DataTables\QueryDataTable $dataTable */
@@ -160,16 +178,4 @@ public function assertQueryHasNoSelect($expected, $query)
 
         $this->assertSame($expected, Str::startsWith($sql, 'select count(*) from (select 1 as dt_row_count from'), "'{$sql}' has select");
     }
-
-    /**
-     * @param  $expected  bool
-     * @param  $query  \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
-     * @return void
-     */
-    public function assertQueryIsFromSub($expected, $query)
-    {
-        $sql = $query->select(DB::raw('count(*)'))->toSql();
-
-        $this->assertSame($expected, Str::startsWith($sql, 'select count(*) from (select'), "'{$sql}' is from sub query");
-    }
 }