fix swoft-cloud/swoft#277

huangzhhui · Jun 13, 2018 · 60f9e56 · 60f9e56
1 parent 2d1c652
commit 60f9e56
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/db/src/Executor.php b/src/db/src/Executor.php
@@ -17,6 +17,7 @@
 use Swoft\Db\Exception\MysqlException;
 use Swoft\Db\Validator\ValidatorInterface;
 use Swoft\Exception\ValidatorException;
+use Swoft\Helper\StringHelper;
 
 /**
  * Executor
@@ -36,7 +37,13 @@ public static function save($entity): ResultInterface
 
         $fields = $fields ?? [];
         $query  = Query::table($table)->selectInstance($instance);
-
+        // Set Primary Id to Entity
+        $query->addDecorator(function ($primaryId) use ($entity, $className) {
+            list(, , $idColumn) = self::getTable($className);
+            $setter = 'set' . StringHelper::camel($idColumn, false);
+            method_exists($entity, $setter) && $entity->$setter($primaryId);
+            return $primaryId;
+        });
         return $query->insert($fields);
     }
 

diff --git a/src/framework/src/Helper/StringHelper.php b/src/framework/src/Helper/StringHelper.php
@@ -54,15 +54,16 @@ public static function ascii($value)
      * Convert a value to camel case.
      *
      * @param  string $value
+     * @param bool $lcfirst
      * @return string
      */
-    public static function camel($value)
+    public static function camel($value, $lcfirst = true)
     {
         if (isset(static::$camelCache[$value])) {
             return static::$camelCache[$value];
         }
 
-        return static::$camelCache[$value] = lcfirst(static::studly($value));
+        return static::$camelCache[$value] = ($lcfirst ? lcfirst(static::studly($value)) : static::studly($value));
     }
 
     /**