Merge pull request #2974 from Laravel-Backpack/fix-2790-and-2836

tabacitu · web-flow · commit e5e0e764ec85 · 2020-07-07T14:16:27.000+03:00
[4.1][Bug fix] enum field could not be added using fluent syntax
diff --git a/src/app/Library/CrudPanel/Traits/AutoSet.php b/src/app/Library/CrudPanel/Traits/AutoSet.php
@@ -13,7 +13,6 @@ trait AutoSet
     public function setFromDb()
     {
         if (! $this->driverIsMongoDb()) {
-            $this->setDoctrineTypesMapping();
             $this->getDbColumnTypes();
         }
 
@@ -53,6 +52,8 @@ public function setFromDb()
      */
     public function getDbColumnTypes()
     {
+        $this->setDoctrineTypesMapping();
+
         $dbColumnTypes = [];
 
         foreach ($this->getDbTableColumns() as $key => $column) {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ trait AutoSet`
`13`	`13`	`public function setFromDb()`
`14`	`14`	`{`
`15`	`15`	`if (! $this->driverIsMongoDb()) {`
`16`		`- $this->setDoctrineTypesMapping();`
`17`	`16`	`$this->getDbColumnTypes();`
`18`	`17`	`}`
`19`	`18`
`@@ -53,6 +52,8 @@ public function setFromDb()`
`53`	`52`	`*/`
`54`	`53`	`public function getDbColumnTypes()`
`55`	`54`	`{`
	`55`	`+ $this->setDoctrineTypesMapping();`
	`56`	`+`
`56`	`57`	`$dbColumnTypes = [];`
`57`	`58`
`58`	`59`	`foreach ($this->getDbTableColumns() as $key => $column) {`