From 8adf44b8a8bdb4549984ec75029bf4c23e01a9d1 Mon Sep 17 00:00:00 2001
From: Nikita Krochak <krochak@in4security.com>
Date: Mon, 24 Apr 2023 14:54:44 +1000
Subject: [PATCH] Fix Laravel 10 non-string database expressions

---
 src/Bosnadev/Database/Schema/Grammars/PostgresGrammar.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Bosnadev/Database/Schema/Grammars/PostgresGrammar.php b/src/Bosnadev/Database/Schema/Grammars/PostgresGrammar.php
index fb13fcc..0bb9525 100644
--- a/src/Bosnadev/Database/Schema/Grammars/PostgresGrammar.php
+++ b/src/Bosnadev/Database/Schema/Grammars/PostgresGrammar.php
@@ -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;
@@ -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);
     }
@@ -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);
     }