diff --git a/Database/Base/BaseActiveRecord.php b/Database/Base/BaseActiveRecord.php
index 4cc9aaee..a206c987 100644
--- a/Database/Base/BaseActiveRecord.php
+++ b/Database/Base/BaseActiveRecord.php
@@ -1060,7 +1060,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
     {
         return static::getDb()->getSchema()
             ->getColumns()
-            ->table(static::getTable());
+            ->table('`' . static::getDbName() . '`.' . static::getTable());
     }
 
     /**
diff --git a/Database/Connection.php b/Database/Connection.php
index df870360..647c01ee 100644
--- a/Database/Connection.php
+++ b/Database/Connection.php
@@ -265,15 +265,17 @@ class Connection extends Component
      */
     public function createCommand($sql = null, $dbname = '', array $attributes = []): Command
     {
-        $substr = strtoupper(substr($sql, 0, 6));
-        $sql = match ($substr) {
-            'SELECT', 'SHOW F', 'DELETE' => preg_replace('/FROM\s+(\w+)\s+/', 'FROM `' . $dbname . '`.$1 ', $sql),
-            'UPDATE' => preg_replace('/UPDATE\s+(\w+)\s+SET/', 'UPDATE `' . $dbname . '`.$1 SET', $sql),
-            'INSERT' => preg_replace('/INSERT INTO\s+(\w+)/', 'INSERT INTO `' . $dbname . '`.$1', $sql),
-            'TRUNCA' => preg_replace('/TRUNCATE\s+(\w+)\s+/', 'TRUNCATE `' . $dbname . '`.$1', $sql),
-            default => throw new Exception('database error')
-        };
-        $sql = preg_replace('/INNER JOIN\s+(\w+)\s/', 'INNER JOIN `' . $dbname . '`.$1 ', $sql);
+        if (!empty($dbname)) {
+            $substr = strtoupper(substr($sql, 0, 6));
+            $sql = match ($substr) {
+                'SELECT', 'SHOW F', 'DELETE' => preg_replace('/FROM\s+(\w+)\s+/', 'FROM `' . $dbname . '`.$1 ', $sql),
+                'UPDATE' => preg_replace('/UPDATE\s+(\w+)\s+SET/', 'UPDATE `' . $dbname . '`.$1 SET', $sql),
+                'INSERT' => preg_replace('/INSERT INTO\s+(\w+)/', 'INSERT INTO `' . $dbname . '`.$1', $sql),
+                'TRUNCA' => preg_replace('/TRUNCATE\s+(\w+)\s+/', 'TRUNCATE `' . $dbname . '`.$1', $sql),
+                default => throw new Exception('database error')
+            };
+            $sql = preg_replace('/INNER JOIN\s+(\w+)\s/', 'INNER JOIN `' . $dbname . '`.$1 ', $sql);
+        }
         $command = new Command(['db' => $this, 'sql' => $sql]);
         return $command->bindValues($attributes);
     }