formatting

laravel · Apr 20, 2020 · d3bb329 · d3bb329
1 parent 79e420f
commit d3bb329
Showing 1 changed file with 37 additions and 31 deletions.
diff --git a/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php b/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php
@@ -14,6 +14,43 @@ class MySqlGrammar extends Grammar
      */
     protected $operators = ['sounds like'];
 
+    /**
+     * Add a "where null" clause to the query.
+     *
+     * @param  string|array  $columns
+     * @param  string  $boolean
+     * @param  bool  $not
+     * @return $this
+     */
+    protected function whereNull(Builder $query, $where)
+    {
+        if ($this->isJsonSelector($where['column'])) {
+            [$field, $path] = $this->wrapJsonFieldAndPath($where['column']);
+
+            return '(json_extract('.$field.$path.') is null OR json_type(json_extract('.$field.$path.')) = \'NULL\')';
+        }
+
+        return parent::whereNull($query, $where);
+    }
+
+    /**
+     * Add a "where not null" clause to the query.
+     *
+     * @param  string|array  $columns
+     * @param  string  $boolean
+     * @return $this
+     */
+    protected function whereNotNull(Builder $query, $where)
+    {
+        if ($this->isJsonSelector($where['column'])) {
+            [$field, $path] = $this->wrapJsonFieldAndPath($where['column']);
+
+            return '(json_extract('.$field.$path.') is not null AND json_type(json_extract('.$field.$path.')) != \'NULL\')';
+        }
+
+        return parent::whereNotNull($query, $where);
+    }
+
     /**
      * Compile an insert ignore statement into SQL.
      *
@@ -244,35 +281,4 @@ protected function wrapJsonBooleanSelector($value)
 
         return 'json_extract('.$field.$path.')';
     }
-
-    protected function whereNull(Builder $query, $where)
-    {
-        if ($this->isJsonSelector($where['column'])) {
-            // In MySQL json_extract() returns different values
-            // * key not exist => SQL NULL
-            // * value is null => JSON NULL
-            //
-            // These values are not equal so we should use both checks
-            // "is null" and "json_type".
-            //
-            // https://bugs.mysql.com/bug.php?id=85755
-
-            [$field, $path] = $this->wrapJsonFieldAndPath($where['column']);
-
-            return '(json_extract('.$field.$path.') is null OR json_type(json_extract('.$field.$path.')) = \'NULL\')';
-        }
-
-        return parent::whereNull($query, $where);
-    }
-
-    protected function whereNotNull(Builder $query, $where)
-    {
-        if ($this->isJsonSelector($where['column'])) {
-            [$field, $path] = $this->wrapJsonFieldAndPath($where['column']);
-
-            return '(json_extract('.$field.$path.') is not null AND json_type(json_extract('.$field.$path.')) != \'NULL\')';
-        }
-
-        return parent::whereNotNull($query, $where);
-    }
 }