fix conflicts

src/Illuminate/Cache/ArrayStore.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Cache;
 
 use Illuminate\Contracts\Cache\LockProvider;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\InteractsWithTime;
 
 class ArrayStore extends TaggableStore implements LockProvider
@@ -57,7 +58,7 @@ public function get($key)
 
         $expiresAt = $item['expiresAt'] ?? 0;
 
-        if ($expiresAt !== 0 && (now()->getPreciseTimestamp(3) / 1000) >= $expiresAt) {
+        if ($expiresAt !== 0 && (Carbon::now()->getPreciseTimestamp(3) / 1000) >= $expiresAt) {
             $this->forget($key);
 
             return;
@@ -188,7 +189,7 @@ protected function calculateExpiration($seconds)
      */
     protected function toTimestamp($seconds)
     {
-        return $seconds > 0 ? (now()->getPreciseTimestamp(3) / 1000) + $seconds : 0;
+        return $seconds > 0 ? (Carbon::now()->getPreciseTimestamp(3) / 1000) + $seconds : 0;
     }
 
     /**

src/Illuminate/Database/Connection.php

@@ -655,6 +655,27 @@ public function pretend(Closure $callback)
         });
     }
 
+    /**
+     * Execute the given callback without "pretending".
+     *
+     * @param  \Closure  $callback
+     * @return mixed
+     */
+    public function withoutPretending(Closure $callback)
+    {
+        if (! $this->pretending) {
+            return $callback();
+        }
+
+        $this->pretending = false;
+
+        $result = $callback();
+
+        $this->pretending = true;
+
+        return $result;
+    }
+
     /**
      * Execute the given callback in "dry run" mode.
      *
@@ -829,6 +850,10 @@ public function logQuery($query, $bindings, $time = null)
 
         $this->event(new QueryExecuted($query, $bindings, $time, $this));
 
+        $query = $this->pretending === true
+            ? $this->queryGrammar?->substituteBindingsIntoRawSql($query, $bindings) ?? $query
+            : $query;
+
         if ($this->loggingQueries) {
             $this->queryLog[] = compact('query', 'bindings', 'time');
         }

src/Illuminate/Database/Query/Processors/MySqlProcessor.php

@@ -7,6 +7,8 @@ class MySqlProcessor extends Processor
     /**
      * Process the results of a column listing query.
      *
+     * @deprecated Will be removed in a future Laravel version.
+     *
      * @param  array  $results
      * @return array
      */
@@ -16,4 +18,28 @@ public function processColumnListing($results)
             return ((object) $result)->column_name;
         }, $results);
     }
+
+    /**
+     * Process the results of a columns query.
+     *
+     * @param  array  $results
+     * @return array
+     */
+    public function processColumns($results)
+    {
+        return array_map(function ($result) {
+            $result = (object) $result;
+
+            return [
+                'name' => $result->name,
+                'type_name' => $result->type_name,
+                'type' => $result->type,
+                'collation' => $result->collation,
+                'nullable' => $result->nullable === 'YES',
+                'default' => $result->default,
+                'auto_increment' => $result->extra === 'auto_increment',
+                'comment' => $result->comment,
+            ];
+        }, $results);
+    }
 }

src/Illuminate/Database/Query/Processors/PostgresProcessor.php

@@ -33,6 +33,8 @@ public function processInsertGetId(Builder $query, $sql, $values, $sequence = nu
     /**
      * Process the results of a column listing query.
      *
+     * @deprecated Will be removed in a future Laravel version.
+     *
      * @param  array  $results
      * @return array
      */
@@ -42,4 +44,30 @@ public function processColumnListing($results)
             return ((object) $result)->column_name;
         }, $results);
     }
+
+    /**
+     * Process the results of a columns query.
+     *
+     * @param  array  $results
+     * @return array
+     */
+    public function processColumns($results)
+    {
+        return array_map(function ($result) {
+            $result = (object) $result;
+
+            $autoincrement = $result->default !== null && str_starts_with($result->default, 'nextval(');
+
+            return [
+                'name' => $result->name,
+                'type_name' => $result->type_name,
+                'type' => $result->type,
+                'collation' => $result->collation,
+                'nullable' => (bool) $result->nullable,
+                'default' => $autoincrement ? null : $result->default,
+                'auto_increment' => $autoincrement,
+                'comment' => $result->comment,
+            ];
+        }, $results);
+    }
 }

src/Illuminate/Database/Query/Processors/Processor.php

@@ -39,11 +39,24 @@ public function processInsertGetId(Builder $query, $sql, $values, $sequence = nu
     /**
      * Process the results of a column listing query.
      *
+     * @deprecated Will be removed in a future Laravel version.
+     *
      * @param  array  $results
      * @return array
      */
     public function processColumnListing($results)
     {
         return $results;
     }
+
+    /**
+     * Process the results of a columns query.
+     *
+     * @param  array  $results
+     * @return array
+     */
+    public function processColumns($results)
+    {
+        return $results;
+    }
 }

src/Illuminate/Database/Query/Processors/SQLiteProcessor.php

@@ -7,6 +7,8 @@ class SQLiteProcessor extends Processor
     /**
      * Process the results of a column listing query.
      *
+     * @deprecated Will be removed in a future Laravel version.
+     *
      * @param  array  $results
      * @return array
      */
@@ -16,4 +18,32 @@ public function processColumnListing($results)
             return ((object) $result)->name;
         }, $results);
     }
+
+    /**
+     * Process the results of a columns query.
+     *
+     * @param  array  $results
+     * @return array
+     */
+    public function processColumns($results)
+    {
+        $hasPrimaryKey = array_sum(array_column($results, 'primary')) === 1;
+
+        return array_map(function ($result) use ($hasPrimaryKey) {
+            $result = (object) $result;
+
+            $type = strtolower($result->type);
+
+            return [
+                'name' => $result->name,
+                'type_name' => strtok($type, '('),
+                'type' => $type,
+                'collation' => null,
+                'nullable' => (bool) $result->nullable,
+                'default' => $result->default,
+                'auto_increment' => $hasPrimaryKey && $result->primary && $type === 'integer',
+                'comment' => null,
+            ];
+        }, $results);
+    }
 }

src/Illuminate/Database/Query/Processors/SqlServerProcessor.php

@@ -58,6 +58,8 @@ protected function processInsertGetIdForOdbc(Connection $connection)
     /**
      * Process the results of a column listing query.
      *
+     * @deprecated Will be removed in a future Laravel version.
+     *
      * @param  array  $results
      * @return array
      */
@@ -67,4 +69,35 @@ public function processColumnListing($results)
             return ((object) $result)->name;
         }, $results);
     }
+
+    /**
+     * Process the results of a columns query.
+     *
+     * @param  array  $results
+     * @return array
+     */
+    public function processColumns($results)
+    {
+        return array_map(function ($result) {
+            $result = (object) $result;
+
+            $type = match ($typeName = $result->type_name) {
+                'binary', 'varbinary', 'char', 'varchar', 'nchar', 'nvarchar' => $result->length == -1 ? $typeName.'(max)' : $typeName."($result->length)",
+                'decimal', 'numeric' => $typeName."($result->precision,$result->places)",
+                'float', 'datetime2', 'datetimeoffset', 'time' => $typeName."($result->precision)",
+                default => $typeName,
+            };
+
+            return [
+                'name' => $result->name,
+                'type_name' => $result->type_name,
+                'type' => $type,
+                'collation' => $result->collation,
+                'nullable' => (bool) $result->nullable,
+                'default' => $result->default,
+                'auto_increment' => (bool) $result->autoincrement,
+                'comment' => $result->comment,
+            ];
+        }, $results);
+    }
 }

src/Illuminate/Database/Schema/Builder.php

@@ -233,15 +233,28 @@ public function whenTableDoesntHaveColumn(string $table, string $column, Closure
      *
      * @param  string  $table
      * @param  string  $column
+     * @param  bool  $fullDefinition
      * @return string
      */
-    public function getColumnType($table, $column)
+    public function getColumnType($table, $column, $fullDefinition = false)
     {
         $table = $this->connection->getTablePrefix().$table;
 
-        $type = $this->connection->getDoctrineColumn($table, $column)->getType();
+        if (! $this->connection->usingNativeSchemaOperations()) {
+            $type = $this->connection->getDoctrineColumn($table, $column)->getType();
 
-        return $type::lookupName($type);
+            return $type::lookupName($type);
+        }
+
+        $columns = $this->getColumns($table);
+
+        foreach ($columns as $value) {
+            if (strtolower($value['name']) === $column) {
+                return $fullDefinition ? $value['type'] : $value['type_name'];
+            }
+        }
+
+        throw new InvalidArgumentException("There is no column with name '$column' on table '$table'.");
     }
 
     /**
@@ -252,11 +265,22 @@ public function getColumnType($table, $column)
      */
     public function getColumnListing($table)
     {
-        $results = $this->connection->selectFromWriteConnection($this->grammar->compileColumnListing(
-            $this->connection->getTablePrefix().$table
-        ));
+        return array_column($this->getColumns($table), 'name');
+    }
+
+    /**
+     * Get the columns for a given table.
+     *
+     * @param  string  $table
+     * @return array
+     */
+    public function getColumns($table)
+    {
+        $table = $this->connection->getTablePrefix().$table;
 
-        return $this->connection->getPostProcessor()->processColumnListing($results);
+        return $this->connection->getPostProcessor()->processColumns(
+            $this->connection->selectFromWriteConnection($this->grammar->compileColumns($table))
+        );
     }
 
     /**

src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php

@@ -78,13 +78,35 @@ public function compileTableExists()
     /**
      * Compile the query to determine the list of columns.
      *
+     * @deprecated Will be removed in a future Laravel version.
+     *
      * @return string
      */
     public function compileColumnListing()
     {
         return 'select column_name as `column_name` from information_schema.columns where table_schema = ? and table_name = ?';
     }
 
+    /**
+     * Compile the query to determine the columns.
+     *
+     * @param  string  $database
+     * @param  string  $table
+     * @return string
+     */
+    public function compileColumns($database, $table)
+    {
+        return sprintf(
+            'select column_name as `name`, data_type as `type_name`, column_type as `type`, '
+            .'collation_name as `collation`, is_nullable as `nullable`, '
+            .'column_default as `default`, column_comment AS `comment`, extra as `extra` '
+            .'from information_schema.columns where table_schema = %s and table_name = %s '
+            .'order by ordinal_position asc',
+            $this->quoteString($database),
+            $this->quoteString($table)
+        );
+    }
+
     /**
      * Compile a create table command.
      *

src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php

@@ -81,13 +81,39 @@ public function compileTableExists()
     /**
      * Compile the query to determine the list of columns.
      *
+     * @deprecated Will be removed in a future Laravel version.
+     *
      * @return string
      */
     public function compileColumnListing()
     {
         return 'select column_name from information_schema.columns where table_catalog = ? and table_schema = ? and table_name = ?';
     }
 
+    /**
+     * Compile the query to determine the columns.
+     *
+     * @param  string  $database
+     * @param  string  $schema
+     * @param  string  $table
+     * @return string
+     */
+    public function compileColumns($database, $schema, $table)
+    {
+        return sprintf(
+            'select quote_ident(a.attname) as name, t.typname as type_name, format_type(a.atttypid, a.atttypmod) as type, '
+            .'(select tc.collcollate from pg_catalog.pg_collation tc where tc.oid = a.attcollation) as collation, '
+            .'not a.attnotnull as nullable, '
+            .'(select pg_get_expr(adbin, adrelid) from pg_attrdef where c.oid = pg_attrdef.adrelid and pg_attrdef.adnum = a.attnum) as default, '
+            .'(select pg_description.description from pg_description where pg_description.objoid = c.oid and a.attnum = pg_description.objsubid) as comment '
+            .'from pg_attribute a, pg_class c, pg_type t, pg_namespace n '
+            .'where c.relname = %s and n.nspname = %s and a.attnum > 0 and a.attrelid = c.oid and a.atttypid = t.oid and n.oid = c.relnamespace '
+            .'order by a.attnum',
+            $this->quoteString($table),
+            $this->quoteString($schema)
+        );
+    }
+
     /**
      * Compile a create table command.
      *