You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/02/13 16:57:00 UTC

[2/3] incubator-trafficcontrol git commit: pgloader needs to create_tables before copying from mysql

pgloader needs to create_tables before copying from mysql


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

Branch: refs/heads/master
Commit: 53e819eb9df2a77f414e812bbb27c04fa96df726
Parents: 90439ac
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Feb 10 14:54:44 2017 -0700
Committer: Dewayne Richardson <de...@apache.org>
Committed: Mon Feb 13 09:57:06 2017 -0700

----------------------------------------------------------------------
 traffic_ops/app/db/pg-migration/Dockerfile-pgloader | 1 +
 traffic_ops/app/db/pg-migration/runpgloader.sh      | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/53e819eb/traffic_ops/app/db/pg-migration/Dockerfile-pgloader
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/Dockerfile-pgloader b/traffic_ops/app/db/pg-migration/Dockerfile-pgloader
index 01bc9a4..fec7f97 100644
--- a/traffic_ops/app/db/pg-migration/Dockerfile-pgloader
+++ b/traffic_ops/app/db/pg-migration/Dockerfile-pgloader
@@ -15,4 +15,5 @@ FROM dimitri/pgloader:latest
 MAINTAINER Dan Kirkwood <da...@apache.org>
 
 ADD pg-migration/runpgloader.sh .
+ADD create_tables.sql .
 CMD ./runpgloader.sh

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/53e819eb/traffic_ops/app/db/pg-migration/runpgloader.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/runpgloader.sh b/traffic_ops/app/db/pg-migration/runpgloader.sh
index ac0acd4..f6a7d7d 100755
--- a/traffic_ops/app/db/pg-migration/runpgloader.sh
+++ b/traffic_ops/app/db/pg-migration/runpgloader.sh
@@ -14,6 +14,7 @@
 #
 
 pgloader -v \
+	--before create_tables.sql \
 	--cast 'type tinyint to smallint drop typemod' \
 	--cast 'type varchar to text drop typemod' \
 	--cast 'type double to numeric drop typemod' \