Merge pull request #268 from rhertogh/support_for_modelGenerateJuncti…

…onRelationMode

Support for modelGenerateJunctionRelationMode

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+### 0.12.0
+
+ - Added support for `modelGenerateJunctionRelationMode`
+ - Upgraded `yiisoft/yii2-gii` to version 2.2.0
+
 ### 0.11.0
 
  - *no changes*

composer.json

@@ -19,7 +19,7 @@
         "dmstr/yii2-db": "*",
         "friendsofphp/php-cs-fixer": "1.* || 2.*",
         "yiisoft/yii2": "~2.0.13",
-        "yiisoft/yii2-gii": "~2.0.6 || ~2.1.0"
+        "yiisoft/yii2-gii": "~2.2.0"
     },
     "require-dev": {
         "codeception/codeception": "^2.2",

docs/25-cli-commands.md

@@ -96,6 +96,11 @@ OPTIONS
   database contains too many tables, you may want to uncheck this option to
   accelerate the code generation process.
 
+--modelGenerateJunctionRelationMode: string (defaults to 'table')
+  This indicates whether junction relations are generated with `viaTable()` 
+  or `via()` relations, use 'table' or 'model' respectively.
+  Make sure you also generate the junction models when using the 'model' option.
+
 --help, -h: boolean, 0 or 1
   whether to display help information about current command.
 

src/commands/BatchController.php

@@ -139,6 +139,11 @@ class BatchController extends Controller
      */
     public $modelGenerateRelations = ModelGenerator::RELATIONS_ALL;
 
+    /**
+     * @var
+     */
+    public $modelGenerateJunctionRelationMode = ModelGenerator::JUNCTION_RELATION_VIA_TABLE;
+
     /**
      * @var bool whether the strings will be generated using `Yii::t()` or normal strings
      */
@@ -317,6 +322,7 @@ public function options($id)
                 'modelBaseClassSuffix',
                 'modelRemoveDuplicateRelations',
                 'modelGenerateRelations',
+                'modelGenerateJunctionRelationMode',
                 'modelGenerateQuery',
                 'modelQueryNamespace',
                 'modelQueryBaseClass',
@@ -431,6 +437,7 @@ public function actionModels()
                 'baseTraits' => $this->modelBaseTraits,
                 'removeDuplicateRelations' => $this->modelRemoveDuplicateRelations,
                 'generateRelations' => $this->modelGenerateRelations,
+                'generateJunctionRelationMode' => $this->modelGenerateJunctionRelationMode,
                 'tableNameMap' => $this->tableNameMap,
                 'generateQuery' => $this->modelGenerateQuery,
                 'queryNs' => $this->modelQueryNamespace,

src/generators/model/Generator.php

@@ -173,6 +173,7 @@ public function formAttributes()
             'baseClass',
             'db',
             'generateRelations',
+            'generateJunctionRelationMode',
             //'generateRelationsFromCurrentSchema',
             'generateLabelsFromComments',
             'generateHintsFromComments',

src/generators/model/form.php

@@ -29,6 +29,10 @@
     Generator::RELATIONS_ALL => Yii::t('giiant', 'All relations'),
     Generator::RELATIONS_ALL_INVERSE => Yii::t('giiant', 'All relations with inverse'),
 ]);
+echo $form->field($generator, 'generateJunctionRelationMode')->dropDownList([
+    Generator::JUNCTION_RELATION_VIA_TABLE => Yii::t('giiant', 'Via Table'),
+    Generator::JUNCTION_RELATION_VIA_MODEL => Yii::t('giiant', 'Via Model'),
+]);
 //echo $form->field($generator, 'generateRelationsFromCurrentSchema')->checkbox();
 echo $form->field($generator, 'generateLabelsFromComments')->checkbox();
 echo $form->field($generator, 'generateHintsFromComments')->checkbox();