Fixes a bug

Author: MikeAlhayek

src/Commands/Bases/ResourceFileCommandBase.php

@@ -7,6 +7,7 @@
 use CrestApps\CodeGenerator\Support\FieldTransformer;
 use CrestApps\CodeGenerator\Support\Helpers;
 use CrestApps\CodeGenerator\Traits\CommonCommand;
+use Exception;
 use Illuminate\Console\Command;
 
 class ResourceFileCommandBase extends Command

src/DatabaseParsers/MysqlParser.php

@@ -251,7 +251,7 @@ protected function getTransfredFields(array $columns)
             $properties['labels'] = $this->getLabel($column->COLUMN_NAME);
             $properties['is-nullable'] = ($column->IS_NULLABLE == 'YES');
             $properties['data-value'] = $column->COLUMN_DEFAULT;
-            $properties['data-type'] = $this->getDataType($column->DATA_TYPE);
+            $properties['data-type'] = $this->getDataType($column->DATA_TYPE, $column->COLUMN_TYPE);
             $properties['data-type-params'] = $this->getPrecision($column->CHARACTER_MAXIMUM_LENGTH, $column->DATA_TYPE, $column->COLUMN_TYPE);
             $properties['is-primary'] = ($column->COLUMN_KEY == 'PRIMARY KEY');
             $properties['is-index'] = ($column->COLUMN_KEY == 'MUL');
@@ -313,13 +313,18 @@ protected function getPrecision($length, $dataType, $columnType)
      * Gets the data type for a giving field.
      *
      * @param string $type
+     * @param string $columnType
      *
      * @return $this
      */
-    protected function getDataType($type)
+    protected function getDataType($type, $columnType)
     {
         $map = Config::dataTypeMap();
 
+        if ($columnType == 'tinyint(1)') {
+            return 'boolean';
+        }
+
         if (!array_key_exists($type, $map)) {
             throw new Exception("The type " . $type . " is not mapped in the 'eloquent_type_to_method' key in the config file.");
         }
@@ -361,7 +366,7 @@ protected function getForeignConstraint($name)
      */
     protected function getHtmlOptions($dataType, $columnType)
     {
-        if ($dataType == 'tinyint(1)') {
+        if ($columnType == 'tinyint(1)') {
             return $this->getBooleanOptions();
         }
 

src/Support/Helpers.php

@@ -68,8 +68,13 @@ public static function prettifyJson(array $object)
     public static function convertNameToLabel($name)
     {
         $title = ucwords(str_replace('_', ' ', $name));
+        $idString = ' Id';
 
-        return rtrim($title, ' Id');
+        if (ends_with($title, $idString)) {
+            return rtrim($title, $idString);
+        }
+
+        return $title;
     }
 
     /**