fixup! feat: use database default datetime precision

Author: calebdw

src/Illuminate/Database/Schema/Blueprint.php

@@ -15,6 +15,16 @@ class Blueprint
 {
     use Macroable;
 
+    /**
+     * The database connection instance.
+     */
+    protected Connection $connection;
+
+    /**
+     * The schema grammar instance.
+     */
+    protected Grammar $grammar;
+
     /**
      * The table the blueprint describes.
      *
@@ -86,8 +96,10 @@ class Blueprint
      * @param  string  $prefix
      * @return void
      */
-    public function __construct($table, ?Closure $callback = null, $prefix = '')
+    public function __construct(Connection $connection, $table, ?Closure $callback = null, $prefix = '')
     {
+        $this->connection = $connection;
+        $this->grammar = $connection->getSchemaGrammar();
         $this->table = $table;
         $this->prefix = $prefix;
 
@@ -99,35 +111,30 @@ public function __construct($table, ?Closure $callback = null, $prefix = '')
     /**
      * Execute the blueprint against the database.
      *
-     * @param  \Illuminate\Database\Connection  $connection
-     * @param  \Illuminate\Database\Schema\Grammars\Grammar  $grammar
      * @return void
      */
-    public function build(Connection $connection, Grammar $grammar)
+    public function build()
     {
-        foreach ($this->toSql($connection, $grammar) as $statement) {
-            $connection->statement($statement);
+        foreach ($this->toSql() as $statement) {
+            $this->connection->statement($statement);
         }
     }
 
     /**
      * Get the raw SQL statements for the blueprint.
      *
-     * @param  \Illuminate\Database\Connection  $connection
-     * @param  \Illuminate\Database\Schema\Grammars\Grammar  $grammar
      * @return array
      */
-    public function toSql(Connection $connection, Grammar $grammar)
+    public function toSql()
     {
-        $this->normalizeDatetimePrecision($connection, $grammar);
-        $this->addImpliedCommands($connection, $grammar);
+        $this->addImpliedCommands();
 
         $statements = [];
 
         // Each type of command has a corresponding compiler function on the schema
         // grammar which is used to build the necessary SQL statements to build
         // the blueprint element, so we'll just call that compilers function.
-        $this->ensureCommandsAreValid($connection);
+        $this->ensureCommandsAreValid();
 
         foreach ($this->commands as $command) {
             if ($command->shouldBeSkipped) {
@@ -136,8 +143,8 @@ public function toSql(Connection $connection, Grammar $grammar)
 
             $method = 'compile'.ucfirst($command->name);
 
-            if (method_exists($grammar, $method) || $grammar::hasMacro($method)) {
-                if (! is_null($sql = $grammar->$method($this, $command, $connection))) {
+            if (method_exists($this->grammar, $method) || $this->grammar::hasMacro($method)) {
+                if (! is_null($sql = $this->grammar->$method($this, $command, $this->connection))) {
                     $statements = array_merge($statements, (array) $sql);
                 }
             }
@@ -149,12 +156,11 @@ public function toSql(Connection $connection, Grammar $grammar)
     /**
      * Ensure the commands on the blueprint are valid for the connection type.
      *
-     * @param  \Illuminate\Database\Connection  $connection
      * @return void
      *
      * @throws \BadMethodCallException
      */
-    protected function ensureCommandsAreValid(Connection $connection)
+    protected function ensureCommandsAreValid()
     {
         //
     }
@@ -175,11 +181,9 @@ protected function commandsNamed(array $names)
     /**
      * Add the commands that are implied by the blueprint's state.
      *
-     * @param  \Illuminate\Database\Connection  $connection
-     * @param  \Illuminate\Database\Schema\Grammars\Grammar  $grammar
      * @return void
      */
-    protected function addImpliedCommands(Connection $connection, Grammar $grammar)
+    protected function addImpliedCommands()
     {
         if (count($this->getAddedColumns()) > 0 && ! $this->creating()) {
             array_unshift($this->commands, $this->createCommand('add'));
@@ -189,26 +193,24 @@ protected function addImpliedCommands(Connection $connection, Grammar $grammar)
             array_unshift($this->commands, $this->createCommand('change'));
         }
 
-        $this->addFluentIndexes($connection, $grammar);
+        $this->addFluentIndexes();
 
-        $this->addFluentCommands($connection, $grammar);
+        $this->addFluentCommands();
     }
 
     /**
      * Add the index commands fluently specified on columns.
      *
-     * @param  \Illuminate\Database\Connection  $connection
-     * @param  \Illuminate\Database\Schema\Grammars\Grammar  $grammar
      * @return void
      */
-    protected function addFluentIndexes(Connection $connection, Grammar $grammar)
+    protected function addFluentIndexes()
     {
         foreach ($this->columns as $column) {
             foreach (['primary', 'unique', 'index', 'fulltext', 'fullText', 'spatialIndex'] as $index) {
                 // If the column is supposed to be changed to an auto increment column and
                 // the specified index is primary, there is no need to add a command on
                 // MySQL, as it will be handled during the column definition instead.
-                if ($index === 'primary' && $column->autoIncrement && $column->change && $grammar instanceof MySqlGrammar) {
+                if ($index === 'primary' && $column->autoIncrement && $column->change && $this->grammar instanceof MySqlGrammar) {
                     continue 2;
                 }
 
@@ -248,35 +250,17 @@ protected function addFluentIndexes(Connection $connection, Grammar $grammar)
     /**
      * Add the fluent commands specified on any columns.
      *
-     * @param  \Illuminate\Database\Connection  $connection
-     * @param  \Illuminate\Database\Schema\Grammars\Grammar  $grammar
      * @return void
      */
-    public function addFluentCommands(Connection $connection, Grammar $grammar)
+    public function addFluentCommands()
     {
         foreach ($this->columns as $column) {
-            foreach ($grammar->getFluentCommands() as $commandName) {
+            foreach ($this->grammar->getFluentCommands() as $commandName) {
                 $this->addCommand($commandName, compact('column'));
             }
         }
     }
 
-    /**
-     * Normalizes any `null` datetime precision to the grammar's default.
-     */
-    protected function normalizeDatetimePrecision(Connection $connection, Grammar $grammar): void
-    {
-        $types = ['dateTime', 'dateTimeTz', 'time', 'timeTz', 'timestamp', 'timestampTz'];
-
-        foreach ($this->columns as $column) {
-            if (! in_array($column->type, $types, strict: true)) {
-                continue;
-            }
-
-            $column->precision ??= $grammar->getDatetimePrecision();
-        }
-    }
-
     /**
      * Determine if the blueprint has a create command.
      *
@@ -1122,6 +1106,8 @@ public function date($column)
      */
     public function dateTime($column, $precision = null)
     {
+        $precision ??= $this->defaultDatetimePrecision();
+
         return $this->addColumn('dateTime', $column, compact('precision'));
     }
 
@@ -1134,6 +1120,8 @@ public function dateTime($column, $precision = null)
      */
     public function dateTimeTz($column, $precision = null)
     {
+        $precision ??= $this->defaultDatetimePrecision();
+
         return $this->addColumn('dateTimeTz', $column, compact('precision'));
     }
 
@@ -1146,6 +1134,8 @@ public function dateTimeTz($column, $precision = null)
      */
     public function time($column, $precision = null)
     {
+        $precision ??= $this->defaultDatetimePrecision();
+
         return $this->addColumn('time', $column, compact('precision'));
     }
 
@@ -1158,6 +1148,8 @@ public function time($column, $precision = null)
      */
     public function timeTz($column, $precision = null)
     {
+        $precision ??= $this->defaultDatetimePrecision();
+
         return $this->addColumn('timeTz', $column, compact('precision'));
     }
 
@@ -1170,6 +1162,8 @@ public function timeTz($column, $precision = null)
      */
     public function timestamp($column, $precision = null)
     {
+        $precision ??= $this->defaultDatetimePrecision();
+
         return $this->addColumn('timestamp', $column, compact('precision'));
     }
 
@@ -1182,6 +1176,8 @@ public function timestamp($column, $precision = null)
      */
     public function timestampTz($column, $precision = null)
     {
+        $precision ??= $this->defaultDatetimePrecision();
+
         return $this->addColumn('timestampTz', $column, compact('precision'));
     }
 
@@ -1780,4 +1776,12 @@ public function getChangedColumns()
             return (bool) $column->change;
         });
     }
+
+    /**
+     * Get the default datetime precision.
+     */
+    protected function defaultDatetimePrecision(): ?int
+    {
+        return $this->grammar->getDatetimePrecision();
+    }
 }

src/Illuminate/Database/Schema/Builder.php

@@ -561,7 +561,7 @@ public function withoutForeignKeyConstraints(Closure $callback)
      */
     protected function build(Blueprint $blueprint)
     {
-        $blueprint->build($this->connection, $this->grammar);
+        $blueprint->build();
     }
 
     /**
@@ -573,15 +573,15 @@ protected function build(Blueprint $blueprint)
      */
     protected function createBlueprint($table, ?Closure $callback = null)
     {
-        $prefix = $this->connection->getConfig('prefix_indexes')
-                    ? $this->connection->getConfig('prefix')
-                    : '';
+        $connection = $this->connection;
+
+        $prefix = $connection->getConfig('prefix_indexes') ? $connection->getConfig('prefix') : '';
 
         if (isset($this->resolver)) {
-            return call_user_func($this->resolver, $table, $callback, $prefix);
+            return call_user_func($this->resolver, $connection, $table, $callback, $prefix);
         }
 
-        return Container::getInstance()->make(Blueprint::class, compact('table', 'callback', 'prefix'));
+        return Container::getInstance()->make(Blueprint::class, compact('connection', 'table', 'callback', 'prefix'));
     }
 
     /**