From 7b47af171d6e78a5b7422c9104e186e4215adfd0 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Fri, 21 Feb 2014 12:00:54 +0100 Subject: [PATCH] Use getDates() for type check Fixes #63 --- .../LaravelIdeHelper/ModelsCommand.php | 61 ++++++++++--------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/src/Barryvdh/LaravelIdeHelper/ModelsCommand.php b/src/Barryvdh/LaravelIdeHelper/ModelsCommand.php index 6f55634..d07bc56 100644 --- a/src/Barryvdh/LaravelIdeHelper/ModelsCommand.php +++ b/src/Barryvdh/LaravelIdeHelper/ModelsCommand.php @@ -203,36 +203,39 @@ class ModelsCommand extends Command { if($columns){ foreach ($columns as $column) { $name = $column->getName(); - $type = $column->getType()->getName(); - - switch($type){ - case 'string': - case 'text': - case 'date': - case 'time': - case 'guid': - $type = 'string'; - break; - case 'integer': - case 'bigint': - case 'smallint': - $type = 'integer'; - break; - case 'decimal': - case 'float': - $type = 'float'; - break; - case 'boolean': - $type = 'boolean'; - break; - case 'datetimetz': //String or DateTime, depending on $dates - case 'datetime': - $type = '\Carbon\Carbon'; - break; - default: - $type = 'mixed'; - break; + if(in_array($name, $model->getDates())){ + $type = '\Carbon\Carbon'; + }else{ + $type = $column->getType()->getName(); + switch($type){ + case 'string': + case 'text': + case 'date': + case 'time': + case 'guid': + case 'datetimetz': + case 'datetime': + $type = 'string'; + break; + case 'integer': + case 'bigint': + case 'smallint': + $type = 'integer'; + break; + case 'decimal': + case 'float': + $type = 'float'; + break; + case 'boolean': + $type = 'boolean'; + break; + default: + $type = 'mixed'; + break; + } } + + $this->setProperty($name, $type, true, true); $this->setMethod(Str::camel("where_".$name), '\\'.get_class($model), array('$value')); }