Fix odoo schema float type

panlatent · Mar 9, 2019 · fe85302 · fe85302
1 parent b81006a
commit fe85302
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 2 deletions.
diff --git a/src/Schema.php b/src/Schema.php
@@ -93,11 +93,12 @@ public function getTableSchema(string $tableName = null)
     }
 
     /**
+     * @param mixed|null $tableName
      * @return array
      */
-    public function findUniqueIndexes()
+    public function findUniqueIndexes($tableName): array
     {
-        return [['id']];
+        return $tableName ? [['id']] : [['id']];
     }
 
     /**

diff --git a/src/gii/generators/model/Generator.php b/src/gii/generators/model/Generator.php
@@ -10,6 +10,7 @@
 use panlatent\odoo\ActiveRecord;
 use panlatent\odoo\Connection;
 use Yii;
+use yii\db\Schema;
 use yii\helpers\Inflector;
 
 /**
@@ -181,4 +182,69 @@ protected function generateRelations()
 
         return $relations;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function generateRules($table)
+    {
+        if ($this->generateRelations !== self::RELATIONS_NONE) {
+            return parent::generateRules($table);
+        }
+
+        $types = [];
+        $lengths = [];
+
+        foreach ($table->columns as $column) {
+            if ($column->autoIncrement) {
+                continue;
+            }
+            if (!$column->allowNull && $column->defaultValue === null) {
+                $types['required'][] = $column->name;
+            }
+            switch ($column->type) {
+                case Schema::TYPE_SMALLINT:
+                case Schema::TYPE_INTEGER:
+                case Schema::TYPE_BIGINT:
+                case Schema::TYPE_TINYINT:
+                    $types['integer'][] = $column->name;
+                    break;
+                case Schema::TYPE_BOOLEAN:
+                    $types['boolean'][] = $column->name;
+                    break;
+                case Schema::TYPE_FLOAT:
+                case Schema::TYPE_DOUBLE:
+                case Schema::TYPE_DECIMAL:
+                case Schema::TYPE_MONEY:
+                    $types['number'][] = $column->name;
+                    break;
+                case Schema::TYPE_DATE:
+                case Schema::TYPE_TIME:
+                case Schema::TYPE_DATETIME:
+                case Schema::TYPE_TIMESTAMP:
+                case Schema::TYPE_JSON:
+                    $types['safe'][] = $column->name;
+                    break;
+                default: // strings
+                    if ($column->size > 0) {
+                        $lengths[$column->size][] = $column->name;
+                    } else {
+                        $types['string'][] = $column->name;
+                    }
+            }
+        }
+        $rules = [];
+        $driverName = $this->getDbDriverName();
+        foreach ($types as $type => $columns) {
+            if ($driverName === 'pgsql' && $type === 'integer') {
+                $rules[] = "[['" . implode("', '", $columns) . "'], 'default', 'value' => null]";
+            }
+            $rules[] = "[['" . implode("', '", $columns) . "'], '$type']";
+        }
+        foreach ($lengths as $length => $columns) {
+            $rules[] = "[['" . implode("', '", $columns) . "'], 'string', 'max' => $length]";
+        }
+
+        return $rules;
+    }
 }
diff --git a/src/helpers/FieldHelper.php b/src/helpers/FieldHelper.php
@@ -38,6 +38,7 @@ public static function type2ColumnType(string $type): string
             case 'date':
             case 'time':
             case 'datetime':
+            case 'float':
             case 'binary':
                 return $type;
         }
@@ -69,6 +70,7 @@ public static function type2PhpType(string $type): string
             case 'many2many':
                 return 'array';
             case 'boolean':
+            case 'float':
             case 'integer':
                 return $type;
         }