fixed ambiguous field name in on clause task #173

mod/analysis/searchSql.php

@@ -23,7 +23,7 @@ public function sqlForJsonQuery($json) {
         //var_dump('searchQuery',$queryArray);
 
         $this->generateSqlArray();
-        $sql = $this->getSql();        
+        $sql = $this->getSql();
         return $sql;
     }
 
@@ -554,8 +554,8 @@ public function getFieldAlias($formField, $type = 'query', $entityType = null, $
         $entity = $formField["map"]["entity"];
         $field = $formField["map"]["field"];
 
-        
-        if (is_location_field($entity,$field)){                
+
+        if (is_location_field($entity,$field)){
             return "concat($entity.{$field}_longitude,',',$entity.{$field}_latitude) AS $entity"."_"."$field";
         }
 
@@ -577,10 +577,10 @@ public function createResult($entity, $field, $type) {
         $entityArray = $this->getEntityArray($entity);
 
         $selectField = $this->getFieldAlias($entityArray[$field], $type, $entity);
-        //var_dump('selectField' , $entityArray[$field]);        
+        //var_dump('selectField' , $entityArray[$field]);
         if (($selectField == null || $selectField == '' )) {
-             error_log(var_export($field,true));             
-        }   
+             error_log(var_export($field,true));
+        }
 
         if (!($selectField == null || $selectField == '' )) {
             $this->sqlArray['select'][$selectField] = $selectField;
@@ -641,7 +641,7 @@ public function managementJoin($entity) {
             }
         }
         if ($join) {
-            $this->sqlArray['join'][] = array('table' => 'management', 'jointype' => 'LEFT', 'field1' => 'entity_id', 'field2' => get_primary_key($entity), 'as' => $as, 'condition' => " AND entity_type ='$entity' ");
+            $this->sqlArray['join'][] = array('table' => 'management', 'jointype' => 'LEFT', 'field1' => $as.'.entity_id', 'field2' => get_primary_key($entity), 'as' => $as, 'condition' => " AND $as.entity_type ='$entity' ");
         }
     }