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/14 17:07:21 UTC
[18/53] [abbrv] incubator-trafficcontrol git commit: fixing tests
after merging master
fixing tests after merging master
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/536abd8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/536abd8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/536abd8e
Branch: refs/heads/psql-rebase
Commit: 536abd8e1606b83d784a7e98ea284bd05562e8bc
Parents: 65abbb6
Author: Jackie Heitzer <ja...@cable.comcast.com>
Authored: Thu Aug 11 15:04:45 2016 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Nov 11 13:52:00 2016 -0700
----------------------------------------------------------------------
traffic_ops/app/db/create_tables.sql | 433 ++++++++++---------
...20160729000000_add_geolimit_redirect_url.sql | 23 -
.../20160808092026_fix_column_types.sql | 77 ++++
.../20160809092015_update_serverchecks.sql | 9 -
traffic_ops/app/t/deliveryservice.t | 59 +--
traffic_ops/app/t_integration/extensions.t | 6 +-
6 files changed, 321 insertions(+), 286 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/536abd8e/traffic_ops/app/db/create_tables.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/create_tables.sql b/traffic_ops/app/db/create_tables.sql
index 8dcc250..3456db1 100644
--- a/traffic_ops/app/db/create_tables.sql
+++ b/traffic_ops/app/db/create_tables.sql
@@ -224,7 +224,8 @@ CREATE TABLE deliveryservice (
geo_provider smallint DEFAULT '0'::smallint,
geo_limit_countries character varying(750),
logs_enabled boolean,
- multi_site_origin_algorithm boolean
+ multi_site_origin_algorithm boolean,
+ geolimit_redirect_url character varying(255)
);
@@ -984,7 +985,6 @@ CREATE TABLE servercheck (
ap bigint,
aq bigint,
ar bigint,
- "as" bigint,
at bigint,
au bigint,
av bigint,
@@ -997,6 +997,7 @@ CREATE TABLE servercheck (
bc bigint,
bd bigint,
be bigint,
+ bf bigint,
last_updated timestamp with time zone DEFAULT now()
);
@@ -1528,7 +1529,7 @@ SELECT pg_catalog.setval('cdn_id_seq', 1, true);
-- Data for Name: deliveryservice; Type: TABLE DATA; Schema: public; Owner: to_user
--
-COPY deliveryservice (id, xml_id, active, dscp, signed, qstring_ignore, geo_limit, http_bypass_fqdn, dns_bypass_ip, dns_bypass_ip6, dns_bypass_ttl, org_server_fqdn, type, profile, cdn_id, ccr_dns_ttl, global_max_mbps, global_max_tps, long_desc, long_desc_1, long_desc_2, max_dns_answers, info_url, miss_lat, miss_long, check_path, last_updated, protocol, ssl_key_version, ipv6_routing_enabled, range_request_handling, edge_header_rewrite, origin_shield, mid_header_rewrite, regex_remap, cacheurl, remap_text, multi_site_origin, display_name, tr_response_headers, initial_dispersion, dns_bypass_cname, tr_request_headers, regional_geo_blocking, geo_provider, geo_limit_countries, logs_enabled, multi_site_origin_algorithm) FROM stdin;
+COPY deliveryservice (id, xml_id, active, dscp, signed, qstring_ignore, geo_limit, http_bypass_fqdn, dns_bypass_ip, dns_bypass_ip6, dns_bypass_ttl, org_server_fqdn, type, profile, cdn_id, ccr_dns_ttl, global_max_mbps, global_max_tps, long_desc, long_desc_1, long_desc_2, max_dns_answers, info_url, miss_lat, miss_long, check_path, last_updated, protocol, ssl_key_version, ipv6_routing_enabled, range_request_handling, edge_header_rewrite, origin_shield, mid_header_rewrite, regex_remap, cacheurl, remap_text, multi_site_origin, display_name, tr_response_headers, initial_dispersion, dns_bypass_cname, tr_request_headers, regional_geo_blocking, geo_provider, geo_limit_countries, logs_enabled, multi_site_origin_algorithm, geolimit_redirect_url) FROM stdin;
\.
@@ -1839,7 +1840,7 @@ SELECT pg_catalog.setval('server_id_seq', 1, true);
-- Data for Name: servercheck; Type: TABLE DATA; Schema: public; Owner: to_user
--
-COPY servercheck (id, server, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, "as", at, au, av, aw, ax, ay, az, ba, bb, bc, bd, be, last_updated) FROM stdin;
+COPY servercheck (id, server, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, bf, at, au, av, aw, ax, ay, az, ba, bb, bc, bd, be, last_updated) FROM stdin;
\.
@@ -1949,781 +1950,781 @@ SELECT pg_catalog.setval('type_id_seq', 1, true);
--
--- Name: idx_419494_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_447932_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY asn
- ADD CONSTRAINT idx_419494_primary PRIMARY KEY (id, cachegroup);
+ ADD CONSTRAINT idx_447932_primary PRIMARY KEY (id, cachegroup);
--
--- Name: idx_419504_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_447942_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY cachegroup
- ADD CONSTRAINT idx_419504_primary PRIMARY KEY (id, type);
+ ADD CONSTRAINT idx_447942_primary PRIMARY KEY (id, type);
--
--- Name: idx_419510_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_447948_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY cachegroup_parameter
- ADD CONSTRAINT idx_419510_primary PRIMARY KEY (cachegroup, parameter);
+ ADD CONSTRAINT idx_447948_primary PRIMARY KEY (cachegroup, parameter);
--
--- Name: idx_419518_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_447956_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY cdn
- ADD CONSTRAINT idx_419518_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_447956_primary PRIMARY KEY (id);
--
--- Name: idx_419527_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_447965_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY deliveryservice
- ADD CONSTRAINT idx_419527_primary PRIMARY KEY (id, type);
+ ADD CONSTRAINT idx_447965_primary PRIMARY KEY (id, type);
--
--- Name: idx_419543_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_447981_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY deliveryservice_regex
- ADD CONSTRAINT idx_419543_primary PRIMARY KEY (deliveryservice, regex);
+ ADD CONSTRAINT idx_447981_primary PRIMARY KEY (deliveryservice, regex);
--
--- Name: idx_419547_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_447985_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY deliveryservice_server
- ADD CONSTRAINT idx_419547_primary PRIMARY KEY (deliveryservice, server);
+ ADD CONSTRAINT idx_447985_primary PRIMARY KEY (deliveryservice, server);
--
--- Name: idx_419552_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_447990_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY deliveryservice_tmuser
- ADD CONSTRAINT idx_419552_primary PRIMARY KEY (deliveryservice, tm_user_id);
+ ADD CONSTRAINT idx_447990_primary PRIMARY KEY (deliveryservice, tm_user_id);
--
--- Name: idx_419559_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_447997_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY division
- ADD CONSTRAINT idx_419559_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_447997_primary PRIMARY KEY (id);
--
--- Name: idx_419567_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448005_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY federation
- ADD CONSTRAINT idx_419567_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448005_primary PRIMARY KEY (id);
--
--- Name: idx_419576_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448014_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY federation_deliveryservice
- ADD CONSTRAINT idx_419576_primary PRIMARY KEY (federation, deliveryservice);
+ ADD CONSTRAINT idx_448014_primary PRIMARY KEY (federation, deliveryservice);
--
--- Name: idx_419581_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448019_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY federation_federation_resolver
- ADD CONSTRAINT idx_419581_primary PRIMARY KEY (federation, federation_resolver);
+ ADD CONSTRAINT idx_448019_primary PRIMARY KEY (federation, federation_resolver);
--
--- Name: idx_419588_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448026_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY federation_resolver
- ADD CONSTRAINT idx_419588_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448026_primary PRIMARY KEY (id);
--
--- Name: idx_419594_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448032_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY federation_tmuser
- ADD CONSTRAINT idx_419594_primary PRIMARY KEY (federation, tm_user);
+ ADD CONSTRAINT idx_448032_primary PRIMARY KEY (federation, tm_user);
--
--- Name: idx_419601_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448039_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY hwinfo
- ADD CONSTRAINT idx_419601_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448039_primary PRIMARY KEY (id);
--
--- Name: idx_419612_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448050_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY job
- ADD CONSTRAINT idx_419612_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448050_primary PRIMARY KEY (id);
--
--- Name: idx_419623_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448061_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY job_agent
- ADD CONSTRAINT idx_419623_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448061_primary PRIMARY KEY (id);
--
--- Name: idx_419635_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448073_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY job_result
- ADD CONSTRAINT idx_419635_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448073_primary PRIMARY KEY (id);
--
--- Name: idx_419646_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448084_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY job_status
- ADD CONSTRAINT idx_419646_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448084_primary PRIMARY KEY (id);
--
--- Name: idx_419654_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448092_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY log
- ADD CONSTRAINT idx_419654_primary PRIMARY KEY (id, tm_user);
+ ADD CONSTRAINT idx_448092_primary PRIMARY KEY (id, tm_user);
--
--- Name: idx_419665_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448103_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY parameter
- ADD CONSTRAINT idx_419665_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448103_primary PRIMARY KEY (id);
--
--- Name: idx_419677_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448115_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY phys_location
- ADD CONSTRAINT idx_419677_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448115_primary PRIMARY KEY (id);
--
--- Name: idx_419688_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448126_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY profile
- ADD CONSTRAINT idx_419688_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448126_primary PRIMARY KEY (id);
--
--- Name: idx_419694_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448132_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY profile_parameter
- ADD CONSTRAINT idx_419694_primary PRIMARY KEY (profile, parameter);
+ ADD CONSTRAINT idx_448132_primary PRIMARY KEY (profile, parameter);
--
--- Name: idx_419701_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448139_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY regex
- ADD CONSTRAINT idx_419701_primary PRIMARY KEY (id, type);
+ ADD CONSTRAINT idx_448139_primary PRIMARY KEY (id, type);
--
--- Name: idx_419710_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448148_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY region
- ADD CONSTRAINT idx_419710_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448148_primary PRIMARY KEY (id);
--
--- Name: idx_419718_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448156_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY role
- ADD CONSTRAINT idx_419718_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448156_primary PRIMARY KEY (id);
--
--- Name: idx_419724_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448162_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY server
- ADD CONSTRAINT idx_419724_primary PRIMARY KEY (id, cachegroup, type, status, profile);
+ ADD CONSTRAINT idx_448162_primary PRIMARY KEY (id, cachegroup, type, status, profile);
--
--- Name: idx_419738_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448176_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY servercheck
- ADD CONSTRAINT idx_419738_primary PRIMARY KEY (id, server);
+ ADD CONSTRAINT idx_448176_primary PRIMARY KEY (id, server);
--
--- Name: idx_419746_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448184_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY staticdnsentry
- ADD CONSTRAINT idx_419746_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448184_primary PRIMARY KEY (id);
--
--- Name: idx_419755_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448193_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY stats_summary
- ADD CONSTRAINT idx_419755_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448193_primary PRIMARY KEY (id);
--
--- Name: idx_419766_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448204_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY status
- ADD CONSTRAINT idx_419766_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448204_primary PRIMARY KEY (id);
--
--- Name: idx_419772_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448210_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY steering_target
- ADD CONSTRAINT idx_419772_primary PRIMARY KEY (deliveryservice, target);
+ ADD CONSTRAINT idx_448210_primary PRIMARY KEY (deliveryservice, target);
--
--- Name: idx_419779_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448217_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY tm_user
- ADD CONSTRAINT idx_419779_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448217_primary PRIMARY KEY (id);
--
--- Name: idx_419792_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448230_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY to_extension
- ADD CONSTRAINT idx_419792_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448230_primary PRIMARY KEY (id);
--
--- Name: idx_419802_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
+-- Name: idx_448240_primary; Type: CONSTRAINT; Schema: public; Owner: to_user
--
ALTER TABLE ONLY type
- ADD CONSTRAINT idx_419802_primary PRIMARY KEY (id);
+ ADD CONSTRAINT idx_448240_primary PRIMARY KEY (id);
--
--- Name: idx_419494_cr_id_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447932_cr_id_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419494_cr_id_unique ON asn USING btree (id);
+CREATE UNIQUE INDEX idx_447932_cr_id_unique ON asn USING btree (id);
--
--- Name: idx_419494_fk_cran_cachegroup1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447932_fk_cran_cachegroup1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419494_fk_cran_cachegroup1 ON asn USING btree (cachegroup);
+CREATE INDEX idx_447932_fk_cran_cachegroup1 ON asn USING btree (cachegroup);
--
--- Name: idx_419504_cg_name_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447942_cg_name_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419504_cg_name_unique ON cachegroup USING btree (name);
+CREATE UNIQUE INDEX idx_447942_cg_name_unique ON cachegroup USING btree (name);
--
--- Name: idx_419504_cg_short_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447942_cg_short_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419504_cg_short_unique ON cachegroup USING btree (short_name);
+CREATE UNIQUE INDEX idx_447942_cg_short_unique ON cachegroup USING btree (short_name);
--
--- Name: idx_419504_fk_cg_1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447942_fk_cg_1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419504_fk_cg_1 ON cachegroup USING btree (parent_cachegroup_id);
+CREATE INDEX idx_447942_fk_cg_1 ON cachegroup USING btree (parent_cachegroup_id);
--
--- Name: idx_419504_fk_cg_secondary; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447942_fk_cg_secondary; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419504_fk_cg_secondary ON cachegroup USING btree (secondary_parent_cachegroup_id);
+CREATE INDEX idx_447942_fk_cg_secondary ON cachegroup USING btree (secondary_parent_cachegroup_id);
--
--- Name: idx_419504_fk_cg_type1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447942_fk_cg_type1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419504_fk_cg_type1 ON cachegroup USING btree (type);
+CREATE INDEX idx_447942_fk_cg_type1 ON cachegroup USING btree (type);
--
--- Name: idx_419504_lo_id_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447942_lo_id_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419504_lo_id_unique ON cachegroup USING btree (id);
+CREATE UNIQUE INDEX idx_447942_lo_id_unique ON cachegroup USING btree (id);
--
--- Name: idx_419510_fk_parameter; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447948_fk_parameter; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419510_fk_parameter ON cachegroup_parameter USING btree (parameter);
+CREATE INDEX idx_447948_fk_parameter ON cachegroup_parameter USING btree (parameter);
--
--- Name: idx_419518_cdn_cdn_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447956_cdn_cdn_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419518_cdn_cdn_unique ON cdn USING btree (name);
+CREATE UNIQUE INDEX idx_447956_cdn_cdn_unique ON cdn USING btree (name);
--
--- Name: idx_419527_ds_id_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447965_ds_id_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419527_ds_id_unique ON deliveryservice USING btree (id);
+CREATE UNIQUE INDEX idx_447965_ds_id_unique ON deliveryservice USING btree (id);
--
--- Name: idx_419527_ds_name_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447965_ds_name_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419527_ds_name_unique ON deliveryservice USING btree (xml_id);
+CREATE UNIQUE INDEX idx_447965_ds_name_unique ON deliveryservice USING btree (xml_id);
--
--- Name: idx_419527_fk_cdn1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447965_fk_cdn1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419527_fk_cdn1 ON deliveryservice USING btree (cdn_id);
+CREATE INDEX idx_447965_fk_cdn1 ON deliveryservice USING btree (cdn_id);
--
--- Name: idx_419527_fk_deliveryservice_profile1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447965_fk_deliveryservice_profile1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419527_fk_deliveryservice_profile1 ON deliveryservice USING btree (profile);
+CREATE INDEX idx_447965_fk_deliveryservice_profile1 ON deliveryservice USING btree (profile);
--
--- Name: idx_419527_fk_deliveryservice_type1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447965_fk_deliveryservice_type1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419527_fk_deliveryservice_type1 ON deliveryservice USING btree (type);
+CREATE INDEX idx_447965_fk_deliveryservice_type1 ON deliveryservice USING btree (type);
--
--- Name: idx_419543_fk_ds_to_regex_regex1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447981_fk_ds_to_regex_regex1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419543_fk_ds_to_regex_regex1 ON deliveryservice_regex USING btree (regex);
+CREATE INDEX idx_447981_fk_ds_to_regex_regex1 ON deliveryservice_regex USING btree (regex);
--
--- Name: idx_419547_fk_ds_to_cs_contentserver1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447985_fk_ds_to_cs_contentserver1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419547_fk_ds_to_cs_contentserver1 ON deliveryservice_server USING btree (server);
+CREATE INDEX idx_447985_fk_ds_to_cs_contentserver1 ON deliveryservice_server USING btree (server);
--
--- Name: idx_419552_fk_tm_userid; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447990_fk_tm_userid; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419552_fk_tm_userid ON deliveryservice_tmuser USING btree (tm_user_id);
+CREATE INDEX idx_447990_fk_tm_userid ON deliveryservice_tmuser USING btree (tm_user_id);
--
--- Name: idx_419559_name_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_447997_name_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419559_name_unique ON division USING btree (name);
+CREATE UNIQUE INDEX idx_447997_name_unique ON division USING btree (name);
--
--- Name: idx_419576_fk_fed_to_ds1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448014_fk_fed_to_ds1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419576_fk_fed_to_ds1 ON federation_deliveryservice USING btree (deliveryservice);
+CREATE INDEX idx_448014_fk_fed_to_ds1 ON federation_deliveryservice USING btree (deliveryservice);
--
--- Name: idx_419581_fk_federation_federation_resolver; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448019_fk_federation_federation_resolver; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419581_fk_federation_federation_resolver ON federation_federation_resolver USING btree (federation);
+CREATE INDEX idx_448019_fk_federation_federation_resolver ON federation_federation_resolver USING btree (federation);
--
--- Name: idx_419581_fk_federation_resolver_to_fed1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448019_fk_federation_resolver_to_fed1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419581_fk_federation_resolver_to_fed1 ON federation_federation_resolver USING btree (federation_resolver);
+CREATE INDEX idx_448019_fk_federation_resolver_to_fed1 ON federation_federation_resolver USING btree (federation_resolver);
--
--- Name: idx_419588_federation_resolver_ip_address; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448026_federation_resolver_ip_address; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419588_federation_resolver_ip_address ON federation_resolver USING btree (ip_address);
+CREATE UNIQUE INDEX idx_448026_federation_resolver_ip_address ON federation_resolver USING btree (ip_address);
--
--- Name: idx_419588_fk_federation_mapping_type; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448026_fk_federation_mapping_type; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419588_fk_federation_mapping_type ON federation_resolver USING btree (type);
+CREATE INDEX idx_448026_fk_federation_mapping_type ON federation_resolver USING btree (type);
--
--- Name: idx_419594_fk_federation_federation_resolver; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448032_fk_federation_federation_resolver; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419594_fk_federation_federation_resolver ON federation_tmuser USING btree (federation);
+CREATE INDEX idx_448032_fk_federation_federation_resolver ON federation_tmuser USING btree (federation);
--
--- Name: idx_419594_fk_federation_tmuser_role; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448032_fk_federation_tmuser_role; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419594_fk_federation_tmuser_role ON federation_tmuser USING btree (role);
+CREATE INDEX idx_448032_fk_federation_tmuser_role ON federation_tmuser USING btree (role);
--
--- Name: idx_419594_fk_federation_tmuser_tmuser; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448032_fk_federation_tmuser_tmuser; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419594_fk_federation_tmuser_tmuser ON federation_tmuser USING btree (tm_user);
+CREATE INDEX idx_448032_fk_federation_tmuser_tmuser ON federation_tmuser USING btree (tm_user);
--
--- Name: idx_419601_fk_hwinfo1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448039_fk_hwinfo1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419601_fk_hwinfo1 ON hwinfo USING btree (serverid);
+CREATE INDEX idx_448039_fk_hwinfo1 ON hwinfo USING btree (serverid);
--
--- Name: idx_419601_serverid; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448039_serverid; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419601_serverid ON hwinfo USING btree (serverid, description);
+CREATE UNIQUE INDEX idx_448039_serverid ON hwinfo USING btree (serverid, description);
--
--- Name: idx_419612_fk_job_agent_id1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448050_fk_job_agent_id1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419612_fk_job_agent_id1 ON job USING btree (agent);
+CREATE INDEX idx_448050_fk_job_agent_id1 ON job USING btree (agent);
--
--- Name: idx_419612_fk_job_deliveryservice1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448050_fk_job_deliveryservice1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419612_fk_job_deliveryservice1 ON job USING btree (job_deliveryservice);
+CREATE INDEX idx_448050_fk_job_deliveryservice1 ON job USING btree (job_deliveryservice);
--
--- Name: idx_419612_fk_job_status_id1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448050_fk_job_status_id1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419612_fk_job_status_id1 ON job USING btree (status);
+CREATE INDEX idx_448050_fk_job_status_id1 ON job USING btree (status);
--
--- Name: idx_419612_fk_job_user_id1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448050_fk_job_user_id1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419612_fk_job_user_id1 ON job USING btree (job_user);
+CREATE INDEX idx_448050_fk_job_user_id1 ON job USING btree (job_user);
--
--- Name: idx_419635_fk_agent_id1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448073_fk_agent_id1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419635_fk_agent_id1 ON job_result USING btree (agent);
+CREATE INDEX idx_448073_fk_agent_id1 ON job_result USING btree (agent);
--
--- Name: idx_419635_fk_job_id1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448073_fk_job_id1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419635_fk_job_id1 ON job_result USING btree (job);
+CREATE INDEX idx_448073_fk_job_id1 ON job_result USING btree (job);
--
--- Name: idx_419654_fk_log_1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448092_fk_log_1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419654_fk_log_1 ON log USING btree (tm_user);
+CREATE INDEX idx_448092_fk_log_1 ON log USING btree (tm_user);
--
--- Name: idx_419665_parameter_name_value_idx; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448103_parameter_name_value_idx; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419665_parameter_name_value_idx ON parameter USING btree (name, value);
+CREATE INDEX idx_448103_parameter_name_value_idx ON parameter USING btree (name, value);
--
--- Name: idx_419677_fk_phys_location_region_idx; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448115_fk_phys_location_region_idx; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419677_fk_phys_location_region_idx ON phys_location USING btree (region);
+CREATE INDEX idx_448115_fk_phys_location_region_idx ON phys_location USING btree (region);
--
--- Name: idx_419677_name_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448115_name_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419677_name_unique ON phys_location USING btree (name);
+CREATE UNIQUE INDEX idx_448115_name_unique ON phys_location USING btree (name);
--
--- Name: idx_419677_short_name_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448115_short_name_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419677_short_name_unique ON phys_location USING btree (short_name);
+CREATE UNIQUE INDEX idx_448115_short_name_unique ON phys_location USING btree (short_name);
--
--- Name: idx_419688_name_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448126_name_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419688_name_unique ON profile USING btree (name);
+CREATE UNIQUE INDEX idx_448126_name_unique ON profile USING btree (name);
--
--- Name: idx_419694_fk_atsprofile_atsparameters_atsparameters1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448132_fk_atsprofile_atsparameters_atsparameters1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419694_fk_atsprofile_atsparameters_atsparameters1 ON profile_parameter USING btree (parameter);
+CREATE INDEX idx_448132_fk_atsprofile_atsparameters_atsparameters1 ON profile_parameter USING btree (parameter);
--
--- Name: idx_419694_fk_atsprofile_atsparameters_atsprofile1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448132_fk_atsprofile_atsparameters_atsprofile1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419694_fk_atsprofile_atsparameters_atsprofile1 ON profile_parameter USING btree (profile);
+CREATE INDEX idx_448132_fk_atsprofile_atsparameters_atsprofile1 ON profile_parameter USING btree (profile);
--
--- Name: idx_419701_fk_regex_type1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448139_fk_regex_type1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419701_fk_regex_type1 ON regex USING btree (type);
+CREATE INDEX idx_448139_fk_regex_type1 ON regex USING btree (type);
--
--- Name: idx_419701_re_id_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448139_re_id_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419701_re_id_unique ON regex USING btree (id);
+CREATE UNIQUE INDEX idx_448139_re_id_unique ON regex USING btree (id);
--
--- Name: idx_419710_fk_region_division1_idx; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448148_fk_region_division1_idx; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419710_fk_region_division1_idx ON region USING btree (division);
+CREATE INDEX idx_448148_fk_region_division1_idx ON region USING btree (division);
--
--- Name: idx_419710_name_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448148_name_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419710_name_unique ON region USING btree (name);
+CREATE UNIQUE INDEX idx_448148_name_unique ON region USING btree (name);
--
--- Name: idx_419724_cs_ip_address_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448162_cs_ip_address_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419724_cs_ip_address_unique ON server USING btree (ip_address);
+CREATE UNIQUE INDEX idx_448162_cs_ip_address_unique ON server USING btree (ip_address);
--
--- Name: idx_419724_fk_cdn2; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448162_fk_cdn2; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419724_fk_cdn2 ON server USING btree (cdn_id);
+CREATE INDEX idx_448162_fk_cdn2 ON server USING btree (cdn_id);
--
--- Name: idx_419724_fk_contentserver_atsprofile1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448162_fk_contentserver_atsprofile1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419724_fk_contentserver_atsprofile1 ON server USING btree (profile);
+CREATE INDEX idx_448162_fk_contentserver_atsprofile1 ON server USING btree (profile);
--
--- Name: idx_419724_fk_contentserver_contentserverstatus1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448162_fk_contentserver_contentserverstatus1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419724_fk_contentserver_contentserverstatus1 ON server USING btree (status);
+CREATE INDEX idx_448162_fk_contentserver_contentserverstatus1 ON server USING btree (status);
--
--- Name: idx_419724_fk_contentserver_contentservertype1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448162_fk_contentserver_contentservertype1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419724_fk_contentserver_contentservertype1 ON server USING btree (type);
+CREATE INDEX idx_448162_fk_contentserver_contentservertype1 ON server USING btree (type);
--
--- Name: idx_419724_fk_contentserver_phys_location1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448162_fk_contentserver_phys_location1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419724_fk_contentserver_phys_location1 ON server USING btree (phys_location);
+CREATE INDEX idx_448162_fk_contentserver_phys_location1 ON server USING btree (phys_location);
--
--- Name: idx_419724_fk_server_cachegroup1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448162_fk_server_cachegroup1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419724_fk_server_cachegroup1 ON server USING btree (cachegroup);
+CREATE INDEX idx_448162_fk_server_cachegroup1 ON server USING btree (cachegroup);
--
--- Name: idx_419724_host_name; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448162_host_name; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419724_host_name ON server USING btree (host_name);
+CREATE UNIQUE INDEX idx_448162_host_name ON server USING btree (host_name);
--
--- Name: idx_419724_ip6_address; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448162_ip6_address; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419724_ip6_address ON server USING btree (ip6_address);
+CREATE UNIQUE INDEX idx_448162_ip6_address ON server USING btree (ip6_address);
--
--- Name: idx_419724_se_id_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448162_se_id_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419724_se_id_unique ON server USING btree (id);
+CREATE UNIQUE INDEX idx_448162_se_id_unique ON server USING btree (id);
--
--- Name: idx_419738_fk_serverstatus_server1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448176_fk_serverstatus_server1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419738_fk_serverstatus_server1 ON servercheck USING btree (server);
+CREATE INDEX idx_448176_fk_serverstatus_server1 ON servercheck USING btree (server);
--
--- Name: idx_419738_server; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448176_server; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419738_server ON servercheck USING btree (server);
+CREATE UNIQUE INDEX idx_448176_server ON servercheck USING btree (server);
--
--- Name: idx_419738_ses_id_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448176_ses_id_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419738_ses_id_unique ON servercheck USING btree (id);
+CREATE UNIQUE INDEX idx_448176_ses_id_unique ON servercheck USING btree (id);
--
--- Name: idx_419746_combi_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448184_combi_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419746_combi_unique ON staticdnsentry USING btree (host, address, deliveryservice, cachegroup);
+CREATE UNIQUE INDEX idx_448184_combi_unique ON staticdnsentry USING btree (host, address, deliveryservice, cachegroup);
--
--- Name: idx_419746_fk_staticdnsentry_cachegroup1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448184_fk_staticdnsentry_cachegroup1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419746_fk_staticdnsentry_cachegroup1 ON staticdnsentry USING btree (cachegroup);
+CREATE INDEX idx_448184_fk_staticdnsentry_cachegroup1 ON staticdnsentry USING btree (cachegroup);
--
--- Name: idx_419746_fk_staticdnsentry_ds; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448184_fk_staticdnsentry_ds; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419746_fk_staticdnsentry_ds ON staticdnsentry USING btree (deliveryservice);
+CREATE INDEX idx_448184_fk_staticdnsentry_ds ON staticdnsentry USING btree (deliveryservice);
--
--- Name: idx_419746_fk_staticdnsentry_type; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448184_fk_staticdnsentry_type; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419746_fk_staticdnsentry_type ON staticdnsentry USING btree (type);
+CREATE INDEX idx_448184_fk_staticdnsentry_type ON staticdnsentry USING btree (type);
--
--- Name: idx_419779_fk_user_1; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448217_fk_user_1; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419779_fk_user_1 ON tm_user USING btree (role);
+CREATE INDEX idx_448217_fk_user_1 ON tm_user USING btree (role);
--
--- Name: idx_419779_tmuser_email_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448217_tmuser_email_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419779_tmuser_email_unique ON tm_user USING btree (email);
+CREATE UNIQUE INDEX idx_448217_tmuser_email_unique ON tm_user USING btree (email);
--
--- Name: idx_419779_username_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448217_username_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419779_username_unique ON tm_user USING btree (username);
+CREATE UNIQUE INDEX idx_448217_username_unique ON tm_user USING btree (username);
--
--- Name: idx_419792_fk_ext_type_idx; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448230_fk_ext_type_idx; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE INDEX idx_419792_fk_ext_type_idx ON to_extension USING btree (type);
+CREATE INDEX idx_448230_fk_ext_type_idx ON to_extension USING btree (type);
--
--- Name: idx_419792_id_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448230_id_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419792_id_unique ON to_extension USING btree (id);
+CREATE UNIQUE INDEX idx_448230_id_unique ON to_extension USING btree (id);
--
--- Name: idx_419802_name_unique; Type: INDEX; Schema: public; Owner: to_user
+-- Name: idx_448240_name_unique; Type: INDEX; Schema: public; Owner: to_user
--
-CREATE UNIQUE INDEX idx_419802_name_unique ON type USING btree (name);
+CREATE UNIQUE INDEX idx_448240_name_unique ON type USING btree (name);
--
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/536abd8e/traffic_ops/app/db/migrations/20160729000000_add_geolimit_redirect_url.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migrations/20160729000000_add_geolimit_redirect_url.sql b/traffic_ops/app/db/migrations/20160729000000_add_geolimit_redirect_url.sql
deleted file mode 100644
index 959362b..0000000
--- a/traffic_ops/app/db/migrations/20160729000000_add_geolimit_redirect_url.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-
--- +goose Up
--- SQL in section 'Up' is executed when this migration is applied
-alter table deliveryservice add geolimit_redirect_url varchar(255) default NULL;
-
--- +goose Down
--- SQL section 'Down' is executed when this migration is rolled back
-alter table deliveryservice drop column geolimit_redirect_url;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/536abd8e/traffic_ops/app/db/migrations/20160808092026_fix_column_types.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migrations/20160808092026_fix_column_types.sql b/traffic_ops/app/db/migrations/20160808092026_fix_column_types.sql
new file mode 100644
index 0000000..f764311
--- /dev/null
+++ b/traffic_ops/app/db/migrations/20160808092026_fix_column_types.sql
@@ -0,0 +1,77 @@
+
+-- +goose Up
+-- SQL in section 'Up' is executed when this migration is applied
+
+ALTER TABLE cachegroup ALTER COLUMN latitude TYPE numeric;
+ALTER TABLE cachegroup ALTER COLUMN longitude TYPE numeric;
+
+ALTER TABLE deliveryservice ALTER COLUMN signed TYPE smallint USING (signed::int::smallint);
+ALTER TABLE deliveryservice ALTER COLUMN qstring_ignore TYPE smallint USING (qstring_ignore::int::smallint);
+
+ALTER TABLE deliveryservice
+ ALTER COLUMN geo_limit DROP DEFAULT,
+ ALTER COLUMN geo_limit TYPE smallint USING (geo_limit::int::smallint),
+ ALTER COLUMN geo_limit SET DEFAULT '0';
+
+ALTER TABLE deliveryservice ALTER COLUMN miss_lat TYPE numeric;
+ALTER TABLE deliveryservice ALTER COLUMN miss_long TYPE numeric;
+ALTER TABLE deliveryservice ALTER COLUMN multi_site_origin TYPE smallint USING (multi_site_origin::int::smallint);
+ALTER TABLE deliveryservice ALTER COLUMN regional_geo_blocking TYPE smallint USING (regional_geo_blocking::int::smallint);
+ALTER TABLE deliveryservice ALTER COLUMN logs_enabled TYPE smallint USING (logs_enabled::int::smallint);
+ALTER TABLE deliveryservice ALTER COLUMN multi_site_origin_algorithm TYPE smallint USING (multi_site_origin_algorithm::int::smallint);
+
+ALTER TABLE parameter
+ ALTER COLUMN secure DROP DEFAULT,
+ ALTER COLUMN secure TYPE smallint USING (secure::int::smallint),
+ ALTER COLUMN secure SET DEFAULT '0';
+
+ALTER TABLE server
+ ALTER COLUMN upd_pending DROP DEFAULT,
+ ALTER COLUMN upd_pending TYPE smallint USING (upd_pending::int::smallint),
+ ALTER COLUMN upd_pending SET DEFAULT '0';
+
+ALTER TABLE tm_user
+ ALTER COLUMN new_user DROP DEFAULT,
+ ALTER COLUMN new_user TYPE smallint USING (new_user::int::smallint),
+ ALTER COLUMN new_user SET DEFAULT '1';
+
+ALTER TABLE to_extension ALTER COLUMN isactive TYPE smallint USING (isactive::int::smallint);
+
+
+
+-- +goose Down
+-- SQL section 'Down' is executed when this migration is rolled back
+
+ALTER TABLE cachegroup ALTER COLUMN latitude TYPE double precision;
+ALTER TABLE cachegroup ALTER COLUMN longitude TYPE double precision;
+
+ALTER TABLE deliveryservice ALTER COLUMN signed TYPE boolean USING (signed::int::boolean);
+ALTER TABLE deliveryservice ALTER COLUMN qstring_ignore TYPE boolean USING (qstring_ignore::int::boolean);
+
+ALTER TABLE deliveryservice
+ ALTER COLUMN geo_limit DROP DEFAULT,
+ ALTER COLUMN geo_limit TYPE boolean USING (geo_limit::int::boolean),
+ ALTER COLUMN geo_limit SET DEFAULT FALSE;
+
+ALTER TABLE deliveryservice ALTER COLUMN miss_lat TYPE double precision;
+ALTER TABLE deliveryservice ALTER COLUMN miss_long TYPE double precision;
+ALTER TABLE deliveryservice ALTER COLUMN multi_site_origin TYPE boolean USING (multi_site_origin::int::boolean);
+ALTER TABLE deliveryservice ALTER COLUMN regional_geo_blocking TYPE boolean USING (regional_geo_blocking::int::boolean);
+ALTER TABLE deliveryservice ALTER COLUMN multi_site_origin_algorithm TYPE boolean USING (multi_site_origin_algorithm::int::boolean);
+
+ALTER TABLE parameter
+ ALTER COLUMN secure DROP DEFAULT,
+ ALTER COLUMN secure TYPE boolean USING (secure::int::boolean),
+ ALTER COLUMN secure SET DEFAULT FALSE;
+
+ALTER TABLE server
+ ALTER COLUMN upd_pending DROP DEFAULT,
+ ALTER COLUMN upd_pending TYPE boolean USING (upd_pending::int::boolean),
+ ALTER COLUMN upd_pending SET DEFAULT FALSE;
+
+ALTER TABLE tm_user
+ ALTER COLUMN new_user DROP DEFAULT,
+ ALTER COLUMN new_user TYPE boolean USING (new_user::int::boolean),
+ ALTER COLUMN new_user SET DEFAULT TRUE;
+
+ALTER TABLE to_extension ALTER COLUMN isactive TYPE boolean USING (isactive::int::boolean);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/536abd8e/traffic_ops/app/db/migrations/20160809092015_update_serverchecks.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migrations/20160809092015_update_serverchecks.sql b/traffic_ops/app/db/migrations/20160809092015_update_serverchecks.sql
deleted file mode 100644
index 60435b5..0000000
--- a/traffic_ops/app/db/migrations/20160809092015_update_serverchecks.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-
--- +goose Up
--- SQL in section 'Up' is executed when this migration is applied
-ALTER TABLE servercheck CHANGE `as` `bf` int(11) DEFAULT NULL;
-
-
--- +goose Down
--- SQL section 'Down' is executed when this migration is rolled back
-ALTER TABLE servercheck CHANGE `bf` `as` int(11) DEFAULT NULL;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/536abd8e/traffic_ops/app/t/deliveryservice.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/deliveryservice.t b/traffic_ops/app/t/deliveryservice.t
index 60d357f..63e5994 100644
--- a/traffic_ops/app/t/deliveryservice.t
+++ b/traffic_ops/app/t/deliveryservice.t
@@ -216,10 +216,14 @@ ok $t->post_ok(
#Validate create
# Note the 4 is the index, not the id.
#This can potentially make the tests fragile if more ds's are added to the fixtures...
-ok $t->get_ok('/datadeliveryservice')->status_is(200)->json_is( '/4/dscp' => '40' )->json_is( '/4/active' => '1' )->json_is( '/4/protocol' => '1' )
- ->json_is( '/4/display_name' => 'target-ds2-displayname' )->json_is( '/4/regional_geo_blocking' => '1' )->json_is( '/0/regional_geo_blocking' => '1' )
- ->json_is( '/1/regional_geo_blocking' => '1' ),
- "validate delivery services were created";
+ok $t->get_ok('/datadeliveryservice')->status_is(200)
+ ->json_is( '/4/xml_id' => 'steering-target-ds2' )->json_is( '/4/dscp' => '40' )
+ ->json_is( '/4/active' => '1' )->json_is( '/4/protocol' => '1' )
+ ->json_is( '/4/display_name' => 'target-ds2-displayname' )
+ ->json_is( '/4/regional_geo_blocking' => '1' )
+ ->json_is( '/0/regional_geo_blocking' => '1' )
+ ->json_is( '/1/regional_geo_blocking' => '1' ),
+ "validate delivery services were created";
$t3_id = &get_ds_id('tst_xml_id_3');
ok defined($t3_id), "validated delivery service with all fields was added";
@@ -280,40 +284,25 @@ ok $t->post_ok(
# Note the 4 is the index, not the id.
#The delivery service that was updated is always the last one in the list coming back from /datadeliveryservice.
#This can potentially make the tests fragile if more ds's are added to the fixtures...
-<<<<<<< HEAD
ok $t->get_ok('/datadeliveryservice')->status_is(200)
->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( '/8/dscp' => '41' )->json_is( '/8/active' => '0' )
- ->json_is( '/8/profile_description' => 'mid description' )
- ->json_is( '/8/org_server_fqdn' => 'http://update.knutsel.com' )
- ->json_is( '/8/xml_id' => 'tst_xml_id_3_update' )
- ->json_is( '/8/signed' => '0' )->json_is( '/8/qstring_ignore' => '0' )
- ->json_is( '/8/dns_bypass_ip' => '10.10.10.11' )
- ->json_is( '/8/dns_bypass_ip6' => '2001:558:fee8:180::1/64' )
- ->json_is( '/8/dns_bypass_ttl' => '31' )->json_is( '/8/ccr_dns_ttl' => 3601 )
- ->json_is( '/8/global_max_mbps' => 4000000 )
- ->json_is( '/8/global_max_tps' => 10001 )->json_is( '/8/miss_lat' => '0' )
- ->json_is( '/8/miss_long' => '0' )->json_is( '/8/long_desc' => 'long_update' )
- ->json_is( '/8/long_desc_1' => 'cust_update' )
- ->json_is( '/8/long_desc_2' => 'service_update' )
- ->json_is( '/8/info_url' => 'http://knutsel-update.com' )
- ->json_is( '/8/protocol' => '1' )->json_is( '/8/profile_name' => 'MID1' )
- ->json_is( '/8/geolimit_redirect_url' => 'http://update.redirect.url.com' )
- ->json_is( '/8/display_name' => 'Testing Delivery Service' )
- ->json_is( '/8/regional_geo_blocking' => '1' ),
+ ->json_is( '/6/dscp' => '40' )->json_is( '/6/active' => '1' )
+ ->json_is( '/6/profile_description' => 'ccr description' )
+ ->json_is( '/6/org_server_fqdn' => 'http://target-ds4.edge' )
+ ->json_is( '/6/xml_id' => 'steering-target-ds4' )
+ ->json_is( '/6/signed' => '0' )->json_is( '/6/qstring_ignore' => '0' )
+ ->json_is( '/6/dns_bypass_ip' => 'hokeypokey' )
+ ->json_is( '/6/dns_bypass_ttl' => '10' )->json_is( '/6/ccr_dns_ttl' => 3600 )
+ ->json_is( '/6/global_max_mbps' => 0 )
+ ->json_is( '/6/global_max_tps' => 0 )->json_is( '/6/miss_lat' => '41.881944' )
+ ->json_is( '/6/miss_long' => '-87.627778' )->json_is( '/6/long_desc' => 'target-ds4 long_desc' )
+ ->json_is( '/6/long_desc_1' => 'target-ds4 long_desc_1' )
+ ->json_is( '/6/long_desc_2' => 'target-ds4 long_desc_2' )
+ ->json_is( '/6/info_url' => 'http://target-ds4.edge/info_url.html' )
+ ->json_is( '/6/protocol' => '1' )->json_is( '/6/profile_name' => 'CCR1' )
+ ->json_is( '/6/display_name' => 'target-ds4-displayname' )
+ ->json_is( '/6/regional_geo_blocking' => '1' ),
"validate delivery service was updated";
-=======
-ok $t->get_ok('/datadeliveryservice')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )->json_is( '/6/dscp' => '40' )
- ->json_is( '/6/active' => '1' )->json_is( '/6/profile_description' => 'ccr description' )
- ->json_is( '/6/org_server_fqdn' => 'http://target-ds4.edge' )->json_is( '/6/xml_id' => 'steering-target-ds4' )->json_is( '/6/signed' => '0' )
- ->json_is( '/6/qstring_ignore' => '0' )->json_is( '/6/dns_bypass_ip' => 'hokeypokey' )
- ->json_is( '/6/dns_bypass_ttl' => '10' )->json_is( '/6/ccr_dns_ttl' => 3600 )->json_is( '/6/global_max_mbps' => 0 )
- ->json_is( '/6/global_max_tps' => 0 )->json_is( '/6/miss_lat' => '41.881944' )->json_is( '/6/miss_long' => '-87.627778' )
- ->json_is( '/6/long_desc' => 'target-ds4 long_desc' )->json_is( '/6/long_desc_1' => 'target-ds4 long_desc_1' )->json_is( '/6/long_desc_2' => 'target-ds4 long_desc_2' )
- ->json_is( '/6/info_url' => 'http://target-ds4.edge/info_url.html' )->json_is( '/6/protocol' => '1' )->json_is( '/6/profile_name' => 'CCR1' )
- ->json_is( '/6/display_name' => 'target-ds4-displayname' )->json_is( '/6/regional_geo_blocking' => '1' ),
- "validate delivery service was updated";
->>>>>>> fc7353a... fixing tests.
#delete delivery service
# ok $t->get_ok("/ds/$t3_id/delete")->status_is(302), "delete ds";
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/536abd8e/traffic_ops/app/t_integration/extensions.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t_integration/extensions.t b/traffic_ops/app/t_integration/extensions.t
index 6d7bbdf..5d5a28a 100644
--- a/traffic_ops/app/t_integration/extensions.t
+++ b/traffic_ops/app/t_integration/extensions.t
@@ -66,9 +66,9 @@ $t->get_ok('/server_check')->status_is(200)->text_is( 'th#col1' => 'Hostname' )-
->text_is( 'th#col8' => 'DSCP' )->text_is( 'th#col9' => 'X1' )->text_is( 'th#col10' => 'X2' )->text_is( 'th#col11' => '10G6' )
->text_is( 'th#col12' => 'X3' )->text_is( 'th#col13' => 'STAT' )->text_is( 'th#col14' => 'X4' )->text_is( 'th#col15' => 'MTU' )
->text_is( 'th#col16' => 'TRTR' )->text_is( 'th#col17' => 'TRMO' )->text_is( 'th#col18' => 'CHR' )->text_is( 'th#col19' => 'CDU' )
- ->text_is( 'th#col20' => 'ORT' )->text_is( 'th#col21' => 'X5' )->text_is( 'th#col22' => 'X6' )->text_is( 'th#col23' => 'X8' )
- ->text_is( 'th#col24' => 'X9' )->text_is( 'th#col25' => 'X10' )->text_is( 'th#col26' => 'X11' )->text_is( 'th#col27' => 'X12' )
- ->text_is( 'th#col28' => 'X13' )->text_is( 'th#col29' => 'X14' )->text_is( 'th#col30' => 'X15' );
+ ->text_is( 'th#col20' => 'ORT' )->text_is( 'th#col21' => 'X5' )->text_is( 'th#col22' => 'X6' )->text_is( 'th#col23' => 'X7' )
+ ->text_is( 'th#col24' => 'X8' )->text_is( 'th#col25' => 'X9' )->text_is( 'th#col26' => 'X10' )->text_is( 'th#col27' => 'X11' )
+ ->text_is( 'th#col28' => 'X12' )->text_is( 'th#col29' => 'X13' )->text_is( 'th#col30' => 'X14' );
# post stome status
my $test_server_id = "23";