|
@@ -696,7 +696,7 @@ function tripal_core_chado_select($table, $columns, $values, $options = NULL) {
|
|
|
'case_insensitive_columns' => $options['case_insensitive_columns']
|
|
|
);
|
|
|
$results = tripal_core_chado_get_foreign_key($table_desc, $field, $value, $foreign_options);
|
|
|
- if (count($results) ==0) {
|
|
|
+ if (!$results or count($results) ==0) {
|
|
|
|
|
|
// foreign key records are required
|
|
|
// thus if none matched then return FALSE and alert the admin through watchdog
|
|
@@ -776,12 +776,6 @@ function tripal_core_chado_select($table, $columns, $values, $options = NULL) {
|
|
|
if ($options['return_sql']) {
|
|
|
return array('sql' => $sql, 'args' => $args);
|
|
|
}
|
|
|
- // if we got to this point and we have no arguments for our where
|
|
|
- // clause then a recursive call to a FK relationship has returned nothing
|
|
|
- // we can't continue so just return nothing.
|
|
|
- if($where and empty($args)){
|
|
|
- return array();
|
|
|
- }
|
|
|
$previous_db = tripal_db_set_active('chado'); // use chado database
|
|
|
$resource = db_query($sql, $args);
|
|
|
tripal_db_set_active($previous_db); // now use drupal database
|