Fix table name pattern

panlatent · Feb 26, 2019 · 4ecc564 · 4ecc564
1 parent 5aaa1ae
commit 4ecc564
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/gii/generators/model/Generator.php b/src/gii/generators/model/Generator.php
@@ -49,6 +49,9 @@ public function getName()
         return 'Odoo Model Generator';
     }
 
+    /**
+     * @inheritdoc
+     */
     public function rules()
     {
         return [
@@ -59,7 +62,7 @@ public function rules()
             [['db', 'ns', 'tableName', 'baseClass', 'queryNs', 'queryBaseClass'], 'required'],
             [['db', 'modelClass', 'queryClass'], 'match', 'pattern' => '/^\w+$/', 'message' => 'Only word characters are allowed.'],
             [['ns', 'baseClass', 'queryNs', 'queryBaseClass'], 'match', 'pattern' => '/^[\w\\\\]+$/', 'message' => 'Only word characters and backslashes are allowed.'],
-            [['tableName'], 'match', 'pattern' => '/^([\w ]+\.)?([\w\* ]+)$/', 'message' => 'Only word characters, and optionally spaces, an asterisk and/or a dot are allowed.'],
+            [['tableName'], 'match', 'pattern' => '/^([\w ]+\.)?([\w\*\. ]+)$/', 'message' => 'Only word characters, and optionally spaces, an asterisk and/or a dot are allowed.'],
             [['db'], 'validateDb'],
             [['ns', 'queryNs'], 'validateNamespace'],
             [['tableName'], 'validateTableName'],
@@ -128,6 +131,9 @@ protected function generateClassName($tableName, $useSchemaName = null)
         return $this->classNames[$tableName] = Inflector::id2camel($tableName, '.');
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function generateRelations()
     {
         if ($this->generateRelations === self::RELATIONS_NONE) {