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 18:47:44 UTC
[1/2] incubator-trafficcontrol git commit: psql fix - status_name is
required in the group by clause
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/psql-rebase a627d1545 -> e30afe9f5
psql fix - status_name is required in the group by clause
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fa7da76b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fa7da76b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fa7da76b
Branch: refs/heads/psql-rebase
Commit: fa7da76bed7794fb875f45b6aeea0fbd12ff30b3
Parents: a627d15
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon Nov 14 11:21:55 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 14 11:46:59 2016 -0700
----------------------------------------------------------------------
traffic_ops/app/lib/Schema/Result/InfluxDBHostsOnline.pm | 2 +-
traffic_ops/app/lib/Schema/Result/RiakHostsOnline.pm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fa7da76b/traffic_ops/app/lib/Schema/Result/InfluxDBHostsOnline.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/InfluxDBHostsOnline.pm b/traffic_ops/app/lib/Schema/Result/InfluxDBHostsOnline.pm
index 1a33158..89b3378 100644
--- a/traffic_ops/app/lib/Schema/Result/InfluxDBHostsOnline.pm
+++ b/traffic_ops/app/lib/Schema/Result/InfluxDBHostsOnline.pm
@@ -38,7 +38,7 @@ __PACKAGE__->result_source_instance->view_definition(
JOIN status st ON st.id = s.status
WHERE s.type = (SELECT type.id FROM type WHERE name='INFLUXDB')
AND s.status = (SELECT status.id FROM status WHERE name ='ONLINE')
-GROUP BY s.host_name, s.domain_name, s.tcp_port"
+GROUP BY s.host_name, s.domain_name, s.tcp_port, status_name"
);
__PACKAGE__->add_columns(
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fa7da76b/traffic_ops/app/lib/Schema/Result/RiakHostsOnline.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/RiakHostsOnline.pm b/traffic_ops/app/lib/Schema/Result/RiakHostsOnline.pm
index 3e7027c..d2065d7 100644
--- a/traffic_ops/app/lib/Schema/Result/RiakHostsOnline.pm
+++ b/traffic_ops/app/lib/Schema/Result/RiakHostsOnline.pm
@@ -38,7 +38,7 @@ __PACKAGE__->result_source_instance->view_definition(
JOIN status st ON st.id = s.status
WHERE s.type = (SELECT type.id FROM type WHERE name='RIAK')
AND s.status = (SELECT status.id FROM status WHERE name ='ONLINE')
-GROUP BY s.host_name, s.domain_name, s.tcp_port"
+GROUP BY s.host_name, s.domain_name, s.tcp_port, status_name"
);
__PACKAGE__->add_columns(
[2/2] incubator-trafficcontrol git commit: This closes #77.
Posted by da...@apache.org.
This closes #77.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e30afe9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e30afe9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e30afe9f
Branch: refs/heads/psql-rebase
Commit: e30afe9f5175ac1b733726686ec2a6b6d13ea981
Parents: fa7da76
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Nov 14 11:47:35 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 14 11:47:35 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------