#2810

diff --git a/src/app/Console/Commands/CubistCommand.php b/src/app/Console/Commands/CubistCommand.php
index 455b40c3c36670e7786c7b4312ab6432c9569d0e..8a507bdaa4c2cc5ea55588b23174799e029e3186 100644 (file)
--- a/src/app/Console/Commands/CubistCommand.php
+++ b/src/app/Console/Commands/CubistCommand.php
@@ -77,6 +77,7 @@ class CubistCommand extends Command
                         }
                     }
                 } catch (\Exception $e) {
+                    $this->line($e->getMessage());
                 }
             }
         }

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index c9b43943abf83a5c1e10729ba0b081cd09b9463f..67ab9a40a2c1914174d4c991d46b198970c40b67 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -174,7 +174,7 @@ class CubistMagicAbstractModel extends Model
     {
         /** @var Field $field */
         $field = Field::getInstance($attributes);
-        if (null !== $field->getRelationship()) {
+        if (is_callable([$field, 'getRelationship']) && null !== $field->getRelationship()) {
             $this->_addRelationship($field);
         }
 
@@ -390,7 +390,7 @@ class CubistMagicAbstractModel extends Model
         $foreignEntity = self::_toModel($field->getAttribute('model'));
 
         if ($field->getRelationship() == 'belongsToMany') {
-            return 'rel_btm_' . $foreignEntity->table . '_' . $this->table;
+            return $this->getTable() . '_' . $field->getAttribute('name') . '_rel_btm';
         }
     }