You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by el...@apache.org on 2017/06/22 20:21:08 UTC

[15/17] incubator-trafficcontrol git commit: move patches from migration

move patches from migration


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c25547c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c25547c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c25547c7

Branch: refs/heads/master
Commit: c25547c720661b530ac6d9b13193368f495c425c
Parents: 8c1180e
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Fri Jun 9 17:36:22 2017 +0000
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Thu Jun 22 14:18:17 2017 -0600

----------------------------------------------------------------------
 traffic_ops/app/db/migrations/20170601183753_steering_target.sql | 3 +--
 traffic_ops/app/db/patches.sql                                   | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c25547c7/traffic_ops/app/db/migrations/20170601183753_steering_target.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migrations/20170601183753_steering_target.sql b/traffic_ops/app/db/migrations/20170601183753_steering_target.sql
index 7dfd199..8a93964 100644
--- a/traffic_ops/app/db/migrations/20170601183753_steering_target.sql
+++ b/traffic_ops/app/db/migrations/20170601183753_steering_target.sql
@@ -3,11 +3,10 @@
 -- SQL in section 'Up' is executed when this migration is applied
 ALTER TABLE steering_target RENAME COLUMN weight TO value;
 ALTER TABLE steering_target ADD COLUMN IF NOT EXISTS type bigint;
-ALTER TABLE steering_target ALTER COLUMN type SET NOT NULL;
 ALTER TABLE steering_target ADD CONSTRAINT steering_target_type_fkey
   FOREIGN KEY ("type")
   REFERENCES "type" (id);
-UPDATE steering_target SET "type" = (SELECT id FROM type WHERE name = 'STEERING_WEIGHT');
+
 
 -- +goose Down
 -- SQL section 'Down' is executed when this migration is rolled back

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c25547c7/traffic_ops/app/db/patches.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/patches.sql b/traffic_ops/app/db/patches.sql
index 4560f9c..660d2d8 100644
--- a/traffic_ops/app/db/patches.sql
+++ b/traffic_ops/app/db/patches.sql
@@ -15,3 +15,5 @@
 
 
 -- THIS FILE INCLUDES POST-MIGRATION DATA FIXES REQUIRED OF TRAFFIC OPS
+UPDATE steering_target SET "type" = (SELECT id FROM type WHERE name = 'STEERING_WEIGHT');
+ALTER TABLE steering_target ALTER COLUMN type SET NOT NULL;