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

driesvints · stevethomas · web-flow · commit f2b9d7c19b62 · 2020-08-27T09:00:16.000-05:00
* [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 &lt;steve@codinglabs.io&gt;
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);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,10 @@ public function whereKey($id)`
`193`	`193`	`return $this;`
`194`	`194`	`}`
`195`	`195`
	`196`	`+ if ($id !== null && $this->model->getKeyType() === 'string') {`
	`197`	`+ $id = (string) $id;`
	`198`	`+ }`
	`199`	`+`
`196`	`200`	`return $this->where($this->model->getQualifiedKeyName(), '=', $id);`
`197`	`201`	`}`
`198`	`202`
`@@ -210,6 +214,10 @@ public function whereKeyNot($id)`
`210`	`214`	`return $this;`
`211`	`215`	`}`
`212`	`216`
	`217`	`+ if ($id !== null && $this->model->getKeyType() === 'string') {`
	`218`	`+ $id = (string) $id;`
	`219`	`+ }`
	`220`	`+`
`213`	`221`	`return $this->where($this->model->getQualifiedKeyName(), '!=', $id);`
`214`	`222`	`}`
`215`	`223`