Fix #133: Allow some special chars in table name (#134)

yiisoft · Sep 23, 2024 · cce28a9 · cce28a9
1 parent cf2f56d
commit cce28a9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Generator/ActiveRecord/Command.php b/src/Generator/ActiveRecord/Command.php
@@ -24,7 +24,7 @@ public function __construct(
         private readonly string $namespace = 'App\\Model',
         #[Required]
         #[Regex(
-            pattern: '/^[a-z_][a-z0-9_]*$/i',
+            pattern: '/^[\w-]+\.?[\w-]*$/i',
             message: 'Invalid table name'
         )]
         #[TableExistsRule]

diff --git a/src/Validator/TableExistsHandler.php b/src/Validator/TableExistsHandler.php
@@ -28,7 +28,12 @@ public function validate(mixed $value, object $rule, ValidationContext $context)
 
         $result = new Result();
 
-        $tableSchema = $this->connection->getTableSchema($value);
+        try {
+            $tableSchema = $this->connection->getTableSchema($value);
+        } catch (\Yiisoft\Db\Exception\Exception $e) {
+            $result->addError($e->getMessage());
+            return $result;
+        }
 
         if ($tableSchema === null) {
             $result->addError(sprintf('Table "%s" does not exist.', $value));