fix: whereDate and whereTime crash when $column is an Expression#60314
Merged
taylorotwell merged 1 commit intoMay 29, 2026
Merged
Conversation
The `->whereDate` and `->whereTime` functions are typed to accept `Expression` or string as first parameter (`$column`). Since Laravel 12, both underlying functions in `PostgresGrammar` checks whether the `$column` is a JSON selector using the `isJsonSelector($value)` function defined in the base grammar. This function uses `str_contains` and causes a runtime exception if it receives something other than string. Currently, the function is called with the origin value of the `$column` parameter which in some cases may be `Expression`. This changes the parameter from the `isJsonSelector` to the wrapped column instead of the original one. It also adds tests which check, that using `Expression` or `Stringable` in `whereDate` and `whereTime` produces proper SQL.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
As discussed in #60305 a new version without breaking the
Stringablecase.The
->whereDateand->whereTimefunctions are typed to acceptExpressionor string as first parameter ($column). Since Laravel 12, both underlying functions inPostgresGrammarchecks whether the$columnis a JSON selector using theisJsonSelector($value)function defined in the base grammar. This function usesstr_containsand causes a runtime exception if it receives something other than string. Currently, the function is called with the origin value of the$columnparameter which in some cases may beExpression.This changes the parameter from the
isJsonSelectorto the wrapped column instead of the original one. It also adds tests which check, that usingExpressionorStringableinwhereDateandwhereTimeproduces proper SQL.