mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 02:14:13 +00:00
Merge pull request #3013 from phl0/fixTimelineQsoQuer
Fix SQL join of QSO (affects QSOs without sat_name joined with satellites with empty name)
This commit is contained in:
@@ -340,7 +340,7 @@ class Timeline_model extends CI_Model {
|
||||
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
|
||||
$this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC', 'left outer');
|
||||
$this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer');
|
||||
$this->db->join('satellite', 'satellite.name = '.$this->config->item('table_name').'.COL_SAT_NAME', 'left outer');
|
||||
$this->db->join('satellite', $this->config->item('table_name').'.COL_PROP_MODE = "SAT" AND '.$this->config->item('table_name').'.COL_SAT_NAME = COALESCE(NULLIF(satellite.name, ""), NULLIF(satellite.displayname, ""))', 'left outer');
|
||||
|
||||
if ($band == 'SAT') { // Left for compatibility reasons
|
||||
$this->db->where('col_prop_mode', $band);
|
||||
|
||||
Reference in New Issue
Block a user