Skip to content

Fix Laravel 10 non-string database expressions #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
InfluxOW wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Laravel 10 non-string database expressions #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Bosnadev/Database/Schema/Grammars/PostgresGrammar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Bosnadev\Database\Schema\Grammars;

use Illuminate\Contracts\Database\Query\Expression;
use Illuminate\Support\Fluent;
use Illuminate\Database\Schema\Blueprint as BaseBlueprint;
use Bosnadev\Database\Schema\Blueprint;
Expand Down Expand Up @@ -284,7 +285,7 @@ protected function typeTsvector(Fluent $column)
*/
protected function getDefaultValue($value)
{
if($this->isUuid($value)) return strval($value);
if($this->isUuid($value)) return $value instanceof Expression ? $this->getValue($value) : strval($value);

return parent::getDefaultValue($value);
}
Expand All @@ -297,6 +298,10 @@ protected function getDefaultValue($value)
*/
protected function isUuid($value)
{
if ($value instanceof Expression) {
$value = $this->getValue($value);
}

return preg_match('/^uuid_generate_v/', $value);
}

Expand Down