Fixed WhereNull and WhereNotNull for raw expressions

Author: AdalbertMemSQL

src/Query/Grammar.php

@@ -26,7 +26,7 @@ public function compileOptions(array $options): string
             if (! empty($optionString)) {
                 $optionString .= ',';
             }
-            $optionString .= $key.'='.$value;
+            $optionString .= $key . '=' . $value;
         }
 
         return "OPTION ({$optionString})";
@@ -124,21 +124,23 @@ public function prepareBindingsForUpdate(array $bindings, array $values)
 
     protected function whereNull(Builder $query, $where)
     {
-        if ($this->isJsonSelector($where['column'])) {
+        $columnValue = (string) $this->getValue($where['column']);
+        if ($this->isJsonSelector($columnValue)) {
             [$field, $path] = $this->wrapJsonFieldAndPath($where['column']);
 
-            return '(JSON_EXTRACT_JSON('.$field.$path.') IS NULL OR JSON_GET_TYPE(JSON_EXTRACT_JSON('.$field.$path.')) = \'NULL\')';
+            return '(JSON_EXTRACT_JSON(' . $field . $path . ') IS NULL OR JSON_GET_TYPE(JSON_EXTRACT_JSON(' . $field . $path . ')) = \'NULL\')';
         }
 
         return parent::whereNull($query, $where);
     }
 
     protected function whereNotNull(Builder $query, $where)
     {
-        if ($this->isJsonSelector($where['column'])) {
+        $columnValue = (string) $this->getValue($where['column']);
+        if ($this->isJsonSelector($columnValue)) {
             [$field, $path] = $this->wrapJsonFieldAndPath($where['column']);
 
-            return '(JSON_EXTRACT_JSON('.$field.$path.') IS NOT NULL AND JSON_GET_TYPE(JSON_EXTRACT_JSON('.$field.$path.')) != \'NULL\')';
+            return '(JSON_EXTRACT_JSON(' . $field . $path . ') IS NOT NULL AND JSON_GET_TYPE(JSON_EXTRACT_JSON(' . $field . $path . ')) != \'NULL\')';
         }
 
         return parent::whereNotNull($query, $where);
@@ -190,7 +192,7 @@ protected function wrapJsonFieldAndPath($column)
             return "'$part'";
         }, $parts);
 
-        $path = count($parts) ? ', '.implode(', ', $parts) : '';
+        $path = count($parts) ? ', ' . implode(', ', $parts) : '';
 
         return [$field, $path];
     }
@@ -203,7 +205,7 @@ protected function wrapJsonFieldAndPath($column)
      */
     protected function wrapUnion($sql)
     {
-        return 'SELECT * FROM ('.$sql.')';
+        return 'SELECT * FROM (' . $sql . ')';
     }
 
     /**
@@ -231,7 +233,7 @@ protected function compileUnion(array $union)
     {
         $conjunction = $union['all'] ? ' union all ' : ' union ';
 
-        return $conjunction.'('.$union['query']->toSql().')';
+        return $conjunction . '(' . $union['query']->toSql() . ')';
     }
 
     /**
@@ -250,18 +252,18 @@ public function compileSelect(Builder $query)
         }
 
         if (! empty($query->unionOrders) || isset($query->unionLimit) || isset($query->unionOffset)) {
-            $sql = 'SELECT * FROM ('.$sql.') ';
+            $sql = 'SELECT * FROM (' . $sql . ') ';
 
             if (! empty($query->unionOrders)) {
-                $sql .= ' '.$this->compileOrders($query, $query->unionOrders);
+                $sql .= ' ' . $this->compileOrders($query, $query->unionOrders);
             }
 
             if (isset($query->unionLimit)) {
-                $sql .= ' '.$this->compileLimit($query, $query->unionLimit);
+                $sql .= ' ' . $this->compileLimit($query, $query->unionLimit);
             }
 
             if (isset($query->unionOffset)) {
-                $sql .= ' '.$this->compileUnionOffset($query, $query->unionOffset);
+                $sql .= ' ' . $this->compileUnionOffset($query, $query->unionOffset);
             }
         }
 
@@ -295,10 +297,10 @@ private function compileOffsetWithLimit($offset, $limit): string
         // Add a huge LIMIT clause
         if (! isset($limit)) {
             // 9223372036854775807 - max 64-bit integer
-            return ' LIMIT 9223372036854775807 OFFSET '.(int) $offset;
+            return ' LIMIT 9223372036854775807 OFFSET ' . (int) $offset;
         }
 
-        return ' OFFSET '.(int) $offset;
+        return ' OFFSET ' . (int) $offset;
     }
 
     /**

tests/Hybrid/Json/JsonWhereTest.php

@@ -128,6 +128,33 @@ public function where_null()
         $this->assertEquals($id3, $query->get()[1]->id);
     }
 
+    /** @test */
+    public function where_null_raw()
+    {
+        $query = DB::table('test')->whereNull(DB::raw('(SELECT NULL)'))->orderBy('id');
+
+        $this->assertEquals(
+            "select * from `test` where (SELECT NULL) is null order by `id` asc",
+            $query->toSql()
+        );
+
+        if (! $this->runHybridIntegrations()) {
+            return;
+        }
+
+        [$id1, $id2, $id3, $id4] = $this->insertJsonData([
+            ['value1' => ['value2' => 'string']],
+            ['value1' => null],
+            [null],
+            ['value1' => ['value2' => 1]],
+        ]);
+
+        $this->assertEquals($id1, $query->get()[0]->id);
+        $this->assertEquals($id2, $query->get()[1]->id);
+        $this->assertEquals($id3, $query->get()[2]->id);
+        $this->assertEquals($id4, $query->get()[3]->id);
+    }
+
     /** @test */
     public function where_not_null()
     {
@@ -153,4 +180,31 @@ public function where_not_null()
         $this->assertEquals($id1, $query->get()[0]->id);
         $this->assertEquals($id4, $query->get()[1]->id);
     }
+
+    /** @test */
+    public function where_not_null_raw()
+    {
+        $query = DB::table('test')->whereNotNull(DB::raw('(SELECT 1)'))->orderBy('id');
+
+        $this->assertEquals(
+            "select * from `test` where (SELECT 1) is not null order by `id` asc",
+            $query->toSql()
+        );
+
+        if (! $this->runHybridIntegrations()) {
+            return;
+        }
+
+        [$id1, $id2, $id3, $id4] = $this->insertJsonData([
+            ['value1' => ['value2' => 'string']],
+            ['value1' => null],
+            [null],
+            ['value1' => ['value2' => 1]],
+        ]);
+
+        $this->assertEquals($id1, $query->get()[0]->id);
+        $this->assertEquals($id2, $query->get()[1]->id);
+        $this->assertEquals($id3, $query->get()[2]->id);
+        $this->assertEquals($id4, $query->get()[3]->id);
+    }
 }