[6.x] Port whereKey fix and bugfix for null type (#34031)

* [7.x] Cast primary key to string when $keyType is string (#33930) * Cast primary key to string when $keyType is string * fix test * fix remaining tests * Fix bug with whereKey null Co-authored-by: Steve Thomas <[email protected]>
illuminate · Aug 27, 2020 · f2b9d7c · f2b9d7c
1 parent 0c54827
commit f2b9d7c
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Eloquent/Builder.php b/Eloquent/Builder.php
@@ -193,6 +193,10 @@ public function whereKey($id)
             return $this;
         }
 
+        if ($id !== null && $this->model->getKeyType() === 'string') {
+            $id = (string) $id;
+        }
+
         return $this->where($this->model->getQualifiedKeyName(), '=', $id);
     }
 
@@ -210,6 +214,10 @@ public function whereKeyNot($id)
             return $this;
         }
 
+        if ($id !== null && $this->model->getKeyType() === 'string') {
+            $id = (string) $id;
+        }
+
         return $this->where($this->model->getQualifiedKeyName(), '!=', $id);
     }