You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/15 18:02:35 UTC

[1/2] incubator-trafficcontrol git commit: psql migration needs to work when no data is loaded. i.e. during --env=test where data is loaded by fixtures after

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/psql-rebase 022e3452e -> fcc673f12


psql migration needs to work when no data is loaded. i.e. during --env=test where data is loaded by fixtures after


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

Branch: refs/heads/psql-rebase
Commit: 8be8688c6c45b230e3d29db4fbea9beac23da702
Parents: 022e345
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Nov 15 10:39:32 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Nov 15 11:01:48 2016 -0700

----------------------------------------------------------------------
 .../20160910092026_fix_column_types.sql         | 70 ++++++--------------
 1 file changed, 22 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8be8688c/traffic_ops/app/db/migrations/20160910092026_fix_column_types.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migrations/20160910092026_fix_column_types.sql b/traffic_ops/app/db/migrations/20160910092026_fix_column_types.sql
index dd84a7a..933dd85 100644
--- a/traffic_ops/app/db/migrations/20160910092026_fix_column_types.sql
+++ b/traffic_ops/app/db/migrations/20160910092026_fix_column_types.sql
@@ -8,9 +8,8 @@ ALTER TABLE cachegroup ALTER COLUMN longitude TYPE numeric;
 ALTER TABLE cdn
   ALTER COLUMN dnssec_enabled DROP DEFAULT,
 	ALTER COLUMN dnssec_enabled TYPE boolean
-		USING CASE WHEN dnssec_enabled = 0 THEN FALSE
-			WHEN dnssec_enabled = 1 THEN TRUE
-			ELSE NULL
+		USING CASE WHEN dnssec_enabled = 1 THEN TRUE
+			ELSE FALSE
 			END,
   ALTER COLUMN dnssec_enabled SET DEFAULT FALSE;
 
@@ -20,99 +19,80 @@ ALTER TABLE deliveryservice ALTER COLUMN miss_long                    TYPE numer
 ALTER TABLE deliveryservice
   ALTER COLUMN active DROP DEFAULT,
 	ALTER COLUMN active TYPE boolean
-		USING CASE WHEN active = 0 THEN FALSE
-			WHEN active = 1 THEN TRUE
-			ELSE NULL
+		USING CASE WHEN active = 1 THEN TRUE
+			ELSE FALSE
 			END,
   ALTER COLUMN active SET DEFAULT FALSE;
 
 ALTER TABLE deliveryservice
   ALTER COLUMN signed DROP DEFAULT,
 	ALTER COLUMN signed TYPE boolean
-		USING CASE WHEN signed = 0 THEN FALSE
-			WHEN signed = 1 THEN TRUE
-			ELSE NULL
+		USING CASE WHEN signed = 1 THEN TRUE
+			ELSE FALSE
 			END,
   ALTER COLUMN signed SET DEFAULT FALSE;
 
 ALTER TABLE deliveryservice
   ALTER COLUMN ipv6_routing_enabled DROP DEFAULT,
 	ALTER COLUMN ipv6_routing_enabled TYPE boolean
-		USING CASE WHEN ipv6_routing_enabled = 0 THEN FALSE
-			WHEN ipv6_routing_enabled = 1 THEN TRUE
-			ELSE NULL
+		USING CASE WHEN ipv6_routing_enabled = 1 THEN TRUE
+			ELSE FALSE
 			END,
   ALTER COLUMN ipv6_routing_enabled SET DEFAULT FALSE;
 
 ALTER TABLE deliveryservice
   ALTER COLUMN multi_site_origin DROP DEFAULT,
 	ALTER COLUMN multi_site_origin TYPE boolean
-		USING CASE WHEN multi_site_origin = 0 THEN FALSE
-			WHEN multi_site_origin = 1 THEN TRUE
-			ELSE NULL
+		USING CASE WHEN multi_site_origin = 1 THEN TRUE
+			ELSE FALSE
 			END,
   ALTER COLUMN multi_site_origin SET DEFAULT FALSE;
 
 ALTER TABLE deliveryservice
   ALTER COLUMN regional_geo_blocking DROP DEFAULT,
 	ALTER COLUMN regional_geo_blocking TYPE boolean
-		USING CASE WHEN regional_geo_blocking = 0 THEN FALSE
-			WHEN regional_geo_blocking = 1 THEN TRUE
-			ELSE NULL
+		USING CASE WHEN regional_geo_blocking = 1 THEN TRUE
+			ELSE FALSE
 			END,
   ALTER COLUMN regional_geo_blocking SET DEFAULT FALSE;
 
 ALTER TABLE deliveryservice
   ALTER COLUMN logs_enabled DROP DEFAULT,
 	ALTER COLUMN logs_enabled TYPE boolean
-		USING CASE WHEN logs_enabled = 0 THEN FALSE
-			WHEN logs_enabled = 1 THEN TRUE
-			ELSE NULL
-			END,
-  ALTER COLUMN logs_enabled SET DEFAULT FALSE;
-
-ALTER TABLE goose_db_version
-  ALTER COLUMN is_applied DROP DEFAULT,
-	ALTER COLUMN is_applied TYPE boolean
-		USING CASE WHEN is_applied = 0 THEN FALSE
-			WHEN is_applied = 1 THEN TRUE
+		USING CASE WHEN logs_enabled = 1 THEN TRUE
 			ELSE FALSE
 			END,
-  ALTER COLUMN is_applied SET DEFAULT FALSE;
+  ALTER COLUMN logs_enabled SET DEFAULT FALSE;
 
 ALTER TABLE parameter
   ALTER COLUMN secure DROP DEFAULT,
 	ALTER COLUMN secure TYPE boolean
-		USING CASE WHEN secure = 0 THEN FALSE
-			WHEN secure = 1 THEN TRUE
-			ELSE NULL
+		USING CASE WHEN secure = 1 THEN TRUE
+			ELSE FALSE
 			END,
   ALTER COLUMN secure SET DEFAULT FALSE;
 
 ALTER TABLE server
   ALTER COLUMN upd_pending DROP DEFAULT,
 	ALTER COLUMN upd_pending TYPE boolean
-		USING CASE WHEN upd_pending = 0 THEN FALSE
-			WHEN upd_pending = 1 THEN TRUE
-			ELSE NULL
+		USING CASE WHEN upd_pending = 1 THEN TRUE
+			ELSE FALSE
 			END,
   ALTER COLUMN upd_pending SET DEFAULT FALSE;
 
 ALTER TABLE tm_user
   ALTER COLUMN new_user DROP DEFAULT,
 	ALTER COLUMN new_user TYPE boolean
-		USING CASE WHEN new_user = 0 THEN FALSE
-			WHEN new_user = 1 THEN TRUE
-			ELSE NULL
+		USING CASE WHEN new_user = 1 THEN TRUE
+			ELSE FALSE
 			END,
   ALTER COLUMN new_user SET DEFAULT FALSE;
 
 ALTER TABLE to_extension
   ALTER COLUMN isactive DROP DEFAULT,
 	ALTER COLUMN isactive TYPE boolean
-		USING CASE WHEN isactive = 0 THEN FALSE
-			WHEN isactive = 1 THEN TRUE
-			ELSE NULL
+		USING CASE WHEN isactive = 1 THEN TRUE
+			ELSE FALSE
 			END,
     ALTER COLUMN isactive SET DEFAULT FALSE;
 
@@ -167,12 +147,6 @@ ALTER TABLE deliveryservice
    USING CASE WHEN logs_enabled THEN 1 ELSE 0 END,
   ALTER COLUMN logs_enabled SET DEFAULT 0;
 
-ALTER TABLE goose_db_version
-  ALTER COLUMN is_applied DROP DEFAULT,
-	ALTER COLUMN is_applied TYPE SMALLINT
-   USING CASE WHEN is_applied THEN 1 ELSE 0 END,
-  ALTER COLUMN is_applied SET DEFAULT 0;
-
 ALTER TABLE parameter
   ALTER COLUMN secure DROP DEFAULT,
 	ALTER COLUMN secure TYPE SMALLINT


[2/2] incubator-trafficcontrol git commit: This closes #85.

Posted by da...@apache.org.
This closes #85.


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

Branch: refs/heads/psql-rebase
Commit: fcc673f12b47391c3b771146bf28cea601a80886
Parents: 8be8688
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 15 11:02:21 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Nov 15 11:02:21 2016 -0700

----------------------------------------------------------------------

----------------------------------------------------------------------