PHPORM-33 Add tests on Query\Builder methods

Author: GromNaN

src/Query/Builder.php

@@ -1378,4 +1378,28 @@ public function havingBetween($column, iterable $values, $boolean = 'and', $not
     {
         throw new \BadMethodCallException('This method is not supported by MongoDB');
     }
+
+    /** @internal This method is not supported by MongoDB. */
+    public function whereIntegerInRaw($column, $values, $boolean = 'and', $not = false)
+    {
+        throw new \BadMethodCallException('This method is not supported by MongoDB');
+    }
+
+    /** @internal This method is not supported by MongoDB. */
+    public function orWhereIntegerInRaw($column, $values)
+    {
+        throw new \BadMethodCallException('This method is not supported by MongoDB');
+    }
+
+    /** @internal This method is not supported by MongoDB. */
+    public function whereIntegerNotInRaw($column, $values, $boolean = 'and')
+    {
+        throw new \BadMethodCallException('This method is not supported by MongoDB');
+    }
+
+    /** @internal This method is not supported by MongoDB. */
+    public function orWhereIntegerNotInRaw($column, $values, $boolean = 'and')
+    {
+        throw new \BadMethodCallException('This method is not supported by MongoDB');
+    }
 }

tests/Query/BuilderTest.php

@@ -45,7 +45,32 @@ public static function provideQueryBuilderToMql(): iterable
          */
         $date = new DateTimeImmutable('2016-07-12 15:30:00');
 
-        yield 'find' => [
+        /** @see DatabaseQueryBuilderTest::testBasicSelectWithGetColumns */
+        yield 'find all' => [
+            ['find' => [[], []]],
+            fn (Builder $builder) => $builder->select('*'),
+        ];
+
+        yield 'find default null' => [
+            ['find' => [['foo' => null], []]],
+            fn (Builder $builder) => $builder->where('foo'),
+        ];
+
+        yield 'find all with select' => [
+            ['find' => [[], ['projection' => ['foo' => 1, 'bar' => 1]]]],
+            fn (Builder $builder) => $builder->select('foo', 'bar'),
+        ];
+
+        /** @see DatabaseQueryBuilderTest::testAddingSelects */
+        yield 'addSelect' => [
+            ['find' => [[], ['projection' => ['foo' => 1, 'bar' => 1, 'baz' => 1, 'boom' => 1]]]],
+            fn (Builder $builder) => $builder->select('foo')
+                ->addSelect('bar')
+                ->addSelect(['baz', 'boom'])
+                ->addSelect('bar'),
+        ];
+
+        yield 'find equals' => [
             ['find' => [['foo' => 'bar'], []]],
             fn (Builder $builder) => $builder->where('foo', 'bar'),
         ];
@@ -66,11 +91,59 @@ public static function provideQueryBuilderToMql(): iterable
             fn (Builder $builder) => $builder->where('foo', '>', $date),
         ];
 
-        yield 'find in array' => [
+        /** @see DatabaseQueryBuilderTest::testBasicWhereIns */
+        yield 'whereIn' => [
             ['find' => [['foo' => ['$in' => ['bar', 'baz']]], []]],
             fn (Builder $builder) => $builder->whereIn('foo', ['bar', 'baz']),
         ];
 
+        yield 'whereIn associative array' => [
+            ['find' => [['id' => ['$in' => [45582, 2, 3]]], []]],
+            fn (Builder $builder) => $builder->whereIn('id', ['issue' => 45582, 'id' => 2, 3]),
+        ];
+
+        $array = [['issue' => 45582], ['id' => 2], [3]];
+        yield 'whereIn nested array' => [
+            ['find' => [['id' => ['$in' => $array]], []]],
+            fn (Builder $builder) => $builder->whereIn('id', $array),
+        ];
+
+        yield 'orWhereIn' => [
+            ['find' => [
+                ['$or' => [
+                    ['id' => 1],
+                    ['id' => ['$in' => [1, 2, 3]]],
+                ]],
+                [], // options
+            ]],
+            fn (Builder $builder) => $builder->where('id', '=', 1)
+                ->orWhereIn('id', [1, 2, 3]),
+        ];
+
+        /** @see DatabaseQueryBuilderTest::testBasicWhereNotIns */
+        yield 'whereNotIn' => [
+            ['find' => [['id' => ['$nin' => [1, 2, 3]]], []]],
+            fn (Builder $builder) => $builder->whereNotIn('id', [1, 2, 3]),
+        ];
+
+        yield 'orWhereNotIn' => [
+            ['find' => [
+                ['$or' => [
+                    ['id' => 1],
+                    ['id' => ['$nin' => [1, 2, 3]]],
+                ]],
+                [], // options
+            ]],
+            fn (Builder $builder) => $builder->where('id', '=', 1)
+                ->orWhereNotIn('id', [1, 2, 3]),
+        ];
+
+        /** @see DatabaseQueryBuilderTest::testEmptyWhereIns */
+        yield 'whereIn empty array' => [
+            ['find' => [['id' => ['$in' => []]], []]],
+            fn (Builder $builder) => $builder->whereIn('id', []),
+        ];
+
         yield 'find limit offset select' => [
             ['find' => [[], ['limit' => 10, 'skip' => 5, 'projection' => ['foo' => 1, 'bar' => 1]]]],
             fn (Builder $builder) => $builder->limit(10)->offset(5)->select('foo', 'bar'),
@@ -452,11 +525,25 @@ function (Builder $builder) {
                 ->orWhereNotBetween('id', collect([3, 4])),
         ];
 
+        /** @see DatabaseQueryBuilderTest::testBasicSelectDistinct */
         yield 'distinct' => [
             ['distinct' => ['foo', [], []]],
             fn (Builder $builder) => $builder->distinct('foo'),
         ];
 
+        yield 'select distinct' => [
+            ['distinct' => ['foo', [], []]],
+            fn (Builder $builder) => $builder->select('foo', 'bar')
+                ->distinct(),
+        ];
+
+        /** @see DatabaseQueryBuilderTest::testBasicSelectDistinctOnColumns */
+        yield 'select distinct on' => [
+            ['distinct' => ['foo', [], []]],
+            fn (Builder $builder) => $builder->distinct('foo')
+                ->select('foo', 'bar'),
+        ];
+
         yield 'groupBy' => [
             ['aggregate' => [
                 [['$group' => ['_id' => ['foo' => '$foo'], 'foo' => ['$last' => '$foo']]]],
@@ -562,6 +649,18 @@ public static function getEloquentMethodsNotSupported()
         yield 'having' => [fn (Builder $builder) => $builder->having('baz', '=', 1)];
         yield 'havingBetween' => [fn (Builder $builder) => $builder->havingBetween('last_login_date', ['2018-11-16', '2018-12-16'])];
         yield 'orHavingRaw' => [fn (Builder $builder) => $builder->orHavingRaw('user_foo < user_bar')];
+
+        /** @see DatabaseQueryBuilderTest::testWhereIntegerInRaw */
+        yield 'whereIntegerInRaw' => [fn (Builder $builder) => $builder->whereIntegerInRaw('id', ['1a', 2])];
+
+        /** @see DatabaseQueryBuilderTest::testOrWhereIntegerInRaw */
+        yield 'orWhereIntegerInRaw' => [fn (Builder $builder) => $builder->orWhereIntegerInRaw('id', ['1a', 2])];
+
+        /** @see DatabaseQueryBuilderTest::testWhereIntegerNotInRaw */
+        yield 'whereIntegerNotInRaw' => [fn (Builder $builder) => $builder->whereIntegerNotInRaw('id', ['1a', 2])];
+
+        /** @see DatabaseQueryBuilderTest::testOrWhereIntegerNotInRaw */
+        yield 'orWhereIntegerNotInRaw' => [fn (Builder $builder) => $builder->orWhereIntegerNotInRaw('id', ['1a', 2])];
     }
 
     private static function getBuilder(): Builder