Merge pull request #26 from westphalen/feature/manual-ids

UUID is only generated when not set manually.
alsofronie · Mar 12, 2017 · 6de2df0 · 6de2df0
2 parents 39d0026 + 60b7d34
commit 6de2df0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/src/Uuid32ModelTrait.php b/src/Uuid32ModelTrait.php
@@ -29,13 +29,15 @@ public function getIncrementing()
     public static function bootUuid32ModelTrait()
     {
         static::creating(function ($model) {
-
-            // This is necessary because on \Illuminate\Database\Eloquent\Model::performInsert
-            // will not check for $this->getIncrementing() but directly for $this->incrementing
-            $model->incrementing = false;
-            $uuidVersion = (!empty($model->uuidVersion) ? $model->uuidVersion : 4);   // defaults to 4
-            $uuid = Uuid::generate($uuidVersion);
-            $model->attributes[$model->getKeyName()] = str_replace('-', '', $uuid->string);
+            // Only generate UUID if it wasn't set by already.
+            if (!isset($model->attributes[$model->getKeyName()])) {
+                // This is necessary because on \Illuminate\Database\Eloquent\Model::performInsert
+                // will not check for $this->getIncrementing() but directly for $this->incrementing
+                $model->incrementing = false;
+                $uuidVersion = (!empty($model->uuidVersion) ? $model->uuidVersion : 4);   // defaults to 4
+                $uuid = Uuid::generate($uuidVersion);
+                $model->attributes[$model->getKeyName()] = str_replace('-', '', $uuid->string);
+            }
         }, 0);
     }
 }
diff --git a/src/UuidBinaryModelTrait.php b/src/UuidBinaryModelTrait.php
@@ -28,12 +28,15 @@ public function getIncrementing()
     public static function bootUuidBinaryModelTrait()
     {
         static::creating(function ($model) {
-            // This is necessary because on \Illuminate\Database\Eloquent\Model::performInsert
-            // will not check for $this->getIncrementing() but directly for $this->incrementing
-            $model->incrementing = false;
-            $uuidVersion = (!empty($model->uuidVersion) ? $model->uuidVersion : 4);   // defaults to 4
-            $uuid = Uuid::generate($uuidVersion);
-            $model->attributes[$model->getKeyName()] = (property_exists($model, 'uuidOptimization') && $model::$uuidOptimization ? $model::toOptimized($uuid->string) : $uuid->bytes);
+            // Only generate UUID if it wasn't set by already.
+            if (!isset($model->attributes[$model->getKeyName()])) {
+                // This is necessary because on \Illuminate\Database\Eloquent\Model::performInsert
+                // will not check for $this->getIncrementing() but directly for $this->incrementing
+                $model->incrementing = false;
+                $uuidVersion = (!empty($model->uuidVersion) ? $model->uuidVersion : 4);   // defaults to 4
+                $uuid = Uuid::generate($uuidVersion);
+                $model->attributes[$model->getKeyName()] = (property_exists($model, 'uuidOptimization') && $model::$uuidOptimization ? $model::toOptimized($uuid->string) : $uuid->bytes);
+            }
         }, 0);
     }
 

diff --git a/src/UuidModelTrait.php b/src/UuidModelTrait.php
@@ -28,13 +28,15 @@ public function getIncrementing()
     public static function bootUuidModelTrait()
     {
         static::creating(function ($model) {
-
-            // This is necessary because on \Illuminate\Database\Eloquent\Model::performInsert
-            // will not check for $this->getIncrementing() but directly for $this->incrementing
-            $model->incrementing = false;
-            $uuidVersion = (!empty($model->uuidVersion) ? $model->uuidVersion : 4);   // defaults to 4
-            $uuid = Uuid::generate($uuidVersion);
-            $model->attributes[$model->getKeyName()] = $uuid->string;
+            // Only generate UUID if it wasn't set by already.
+            if (!isset($model->attributes[$model->getKeyName()])) {
+                // This is necessary because on \Illuminate\Database\Eloquent\Model::performInsert
+                // will not check for $this->getIncrementing() but directly for $this->incrementing
+                $model->incrementing = false;
+                $uuidVersion = (!empty($model->uuidVersion) ? $model->uuidVersion : 4);   // defaults to 4
+                $uuid = Uuid::generate($uuidVersion);
+                $model->attributes[$model->getKeyName()] = $uuid->string;
+            }
         }, 0);
     }
 }