Optimized the argument table like database.table for gen:model which can be used to generate another database models. (#7044)

Co-authored-by: hexiangyu <hexiangyu@addcn.com>

Author: devin515

src/Commands/ModelCommand.php

@@ -152,19 +152,21 @@ protected function isIgnoreTable(string $table, ModelOption $option): bool
         return $table === $this->config->get('databases.migrations', 'migrations');
     }
 
-    protected function createModel(string $table, ModelOption $option)
+    protected function createModel(string $table, ModelOption $option): void
     {
         $builder = $this->getSchemaBuilder($option->getPool());
         $table = Str::replaceFirst($option->getPrefix(), '', $table);
-        $columns = $this->formatColumns($builder->getColumnTypeListing($table));
+        $pureTable = Str::after($table, '.');
+        $databaseName = Str::contains($table, '.') ? Str::before($table, '.') : null;
+        $columns = $this->formatColumns($builder->getColumnTypeListing($pureTable, $databaseName));
         if (empty($columns)) {
             $this->output?->error(
                 sprintf('Query columns empty, maybe is table `%s` does not exist.You can check it in database.', $table)
             );
         }
 
         $project = new Project();
-        $class = $option->getTableMapping()[$table] ?? Str::studly(Str::singular($table));
+        $class = $option->getTableMapping()[$table] ?? Str::studly(Str::singular($pureTable));
         $class = $project->namespace($option->getPath()) . $class;
         $path = BASE_PATH . '/' . $project->path($class);
 

src/Schema/MySqlBuilder.php

@@ -85,17 +85,14 @@ public function getColumns(): array
 
     /**
      * Get the column type listing for a given table.
-     *
-     * @param string $table
-     * @return array
      */
-    public function getColumnTypeListing($table)
+    public function getColumnTypeListing(string $table, ?string $database = null): array
     {
         $table = $this->connection->getTablePrefix() . $table;
 
         $results = $this->connection->select(
             $this->grammar->compileColumnListing(),
-            [$this->connection->getDatabaseName(), $table]
+            [$database ?? $this->connection->getDatabaseName(), $table]
         );
 
         /** @var MySqlProcessor $processor */