From a554f242a8478e635a2ab04d08257cc866c7bbc5 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 19 Mar 2017 11:21:03 -0400
Subject: [PATCH] Fix typo in migration script that deleted regex from
 non-required vars

---
 CHANGELOG.md                                                    | 1 +
 .../2017_03_11_215455_ChangeServiceVariablesValidationRules.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2776cd14d..1acc62828 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 ### Fixed
 * `[pre.6]` — Addresses misconfigured console queue that was still sending data way to quickly thus causing the console to explode on some devices when large amounts of data were sent.
 * `[pre.6]` — Fixes bug in allocation parsing for a node that prevented adding new allocations.
+* `[pre.6]` — Fixes typo in migrations that wouldn't save custom regex for non-required variables.
 
 ## v0.6.0-pre.6 (Courageous Carniadactylus)
 ### Fixed
diff --git a/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php b/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php
index 225a1edc0..617c349fa 100644
--- a/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php
+++ b/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php
@@ -20,7 +20,7 @@ class ChangeServiceVariablesValidationRules extends Migration
 
         DB::transaction(function () {
             foreach (ServiceVariable::all() as $variable) {
-                $variable->rules = ($variable->required) ? 'required|regex:' . $variable->rules : 'regex:' . $variable->regex;
+                $variable->rules = ($variable->required) ? 'required|regex:' . $variable->rules : 'regex:' . $variable->rules;
                 $variable->save();
             }
         });