Skip to content

Commit a0e81f8

Browse files
committed
refactor: decouple UUID column guessing and UUID value preparation for reuse in additional scopes
1 parent 17702a2 commit a0e81f8

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

src/GeneratesUuid.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,8 @@ public function resolveUuidVersion(): string
122122
*/
123123
public function scopeWhereUuid($query, $uuid, $uuidColumn = null): Builder
124124
{
125-
$uuidColumn = ! is_null($uuidColumn) && in_array($uuidColumn, $this->uuidColumns())
126-
? $uuidColumn
127-
: $this->uuidColumns()[0];
128-
129-
$uuid = $this->normaliseUuids($uuid);
130-
131-
if ($this->isClassCastable($uuidColumn)) {
132-
$uuid = $this->bytesFromUuid($uuid);
133-
}
125+
$uuidColumn = $this->guessUuidColumn($uuidColumn);
126+
$uuid = $this->prepareUuid($uuid, $uuidColumn);
134127

135128
return $query->whereIn(
136129
$this->qualifyColumn($uuidColumn),

0 commit comments

Comments
 (0)