Fixed the json_type is not a function error. (#45)

Replaced usage of `json_type` with `json_get_type`.
Extended tests to send the query to the database.

closes #43

Author: AdalbertMemSQL

src/Query/Grammar.php

@@ -52,17 +52,24 @@ public function prepareBindingsForUpdate(array $bindings, array $values)
 
     protected function whereNull(Builder $query, $where)
     {
-        return $this->modifyNullJsonExtract(parent::whereNull($query, $where));
+        if ($this->isJsonSelector($where['column'])) {
+            [$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 parent::whereNull($query, $where);
     }
 
     protected function whereNotNull(Builder $query, $where)
     {
-        return $this->modifyNullJsonExtract(parent::whereNotNull($query, $where));
-    }
+        if ($this->isJsonSelector($where['column'])) {
+            [$field, $path] = $this->wrapJsonFieldAndPath($where['column']);
 
-    protected function modifyNullJsonExtract($statement)
-    {
-        return str_replace('json_extract(', 'JSON_EXTRACT_JSON(', $statement);
+            return '(JSON_EXTRACT_JSON('.$field.$path.') IS NOT NULL AND JSON_GET_TYPE(JSON_EXTRACT_JSON('.$field.$path.')) != \'NULL\')';
+        }
+
+        return parent::whereNotNull($query, $where);
     }
 
     protected function wrapJsonSelector($value)

tests/Hybrid/Json/JsonWhereTest.php

@@ -109,20 +109,48 @@ public function where_null()
 
         $this->assertEquals(
             // @TODO check docs
-            "select * from `test` where (JSON_EXTRACT_JSON(data, 'value1') is null OR json_type(JSON_EXTRACT_JSON(data, 'value1')) = 'NULL')",
+            "select * from `test` where (JSON_EXTRACT_JSON(data, 'value1') IS NULL OR JSON_GET_TYPE(JSON_EXTRACT_JSON(data, 'value1')) = 'NULL')",
             $query->toSql()
         );
+
+        if (! $this->runHybridIntegrations()) {
+            return;
+        }
+
+        [, $id2, $id3,] = $this->insertJsonData([
+            ['value1' => ['value2' => 'string']],
+            ['value1' => null],
+            [null],
+            ['value1' => ['value2' => 1]],
+        ]);
+
+        $this->assertEquals($id2, $query->get()[0]->id);
+        $this->assertEquals($id3, $query->get()[1]->id);
     }
 
     /** @test */
     public function where_not_null()
     {
-        $query = DB::table('test')->whereNotNull('data->value1');
+        $query = DB::table('test')->whereNotNull('data->value1')->orderBy('id');
 
         $this->assertEquals(
             // @TODO check docs
-            "select * from `test` where (JSON_EXTRACT_JSON(data, 'value1') is not null AND json_type(JSON_EXTRACT_JSON(data, 'value1')) != 'NULL')",
+            "select * from `test` where (JSON_EXTRACT_JSON(data, 'value1') IS NOT NULL AND JSON_GET_TYPE(JSON_EXTRACT_JSON(data, 'value1')) != 'NULL') order by `id` asc",
             $query->toSql()
         );
+
+        if (! $this->runHybridIntegrations()) {
+            return;
+        }
+
+        [$id1, , , $id4] = $this->insertJsonData([
+            ['value1' => ['value2' => 'string']],
+            ['value1' => null],
+            [null],
+            ['value1' => ['value2' => 1]],
+        ]);
+
+        $this->assertEquals($id1, $query->get()[0]->id);
+        $this->assertEquals($id4, $query->get()[1]->id);
     }
 }