Do not adjust the collation when querying host names

refs #8613
This commit is contained in:
Johannes Meyer 2015-04-08 14:40:34 +02:00
parent 1835479738
commit b449127680

View File

@ -35,7 +35,7 @@ class StatusQuery extends IdoQuery
protected $columnMap = array( protected $columnMap = array(
'hosts' => array( 'hosts' => array(
'host' => 'ho.name1 COLLATE latin1_general_ci', 'host' => 'ho.name1 COLLATE latin1_general_ci',
'host_name' => 'ho.name1 COLLATE latin1_general_ci', 'host_name' => 'ho.name1',
'host_display_name' => 'h.display_name', 'host_display_name' => 'h.display_name',
'host_alias' => 'h.alias', 'host_alias' => 'h.alias',
'host_address' => 'h.address', 'host_address' => 'h.address',
@ -168,7 +168,8 @@ class StatusQuery extends IdoQuery
'servicegroup_alias' => 'sg.alias' 'servicegroup_alias' => 'sg.alias'
), ),
'services' => array( 'services' => array(
'service_host_name' => 'so.name1 COLLATE latin1_general_ci', 'service_host' => 'so.name1 COLLATE latin1_general_ci',
'service_host_name' => 'so.name1',
'service' => 'so.name2 COLLATE latin1_general_ci', 'service' => 'so.name2 COLLATE latin1_general_ci',
'service_description' => 'so.name2 COLLATE latin1_general_ci', 'service_description' => 'so.name2 COLLATE latin1_general_ci',
'service_display_name' => 's.display_name', 'service_display_name' => 's.display_name',