Skip to content

Commit

Permalink
Fix #8582, Fix 8577 DBManager::convert calls abstract function
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattlorimer
mattlorimer committed Mar 18, 2020
1 parent 56496c5 commit 2edb1f5
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions modules/Campaigns/Charts.php
View file
Expand Up @@ -228,7 +228,7 @@ public function campaign_response_by_activity_type($datay= array(), $targets=arr
$focus = BeanFactory::newBean('Campaigns');
$focus->retrieve($campaign_id);
$opp_count=0;
$opp_query = "select count(*) opp_count,sum(" . DBManager::convert("amount_usdollar", "IFNULL", array(0)).") total_value";
$opp_query = "select count(*) opp_count,sum(" . DBManagerFactory::getInstance()->convert("amount_usdollar", "IFNULL", array(0)).") total_value";
$opp_query .= " from opportunities";
$opp_query .= " where campaign_id='$campaign_id'";
$opp_query .= " and sales_stage='Prospecting'";
Expand Down Expand Up @@ -383,7 +383,7 @@ public function campaign_response_roi_data($datay= array(), $targets=array(), $c
$focus = BeanFactory::newBean('Campaigns');
$focus->retrieve($campaign_id);
$opp_count=0;
$opp_query = "select count(*) opp_count,sum(" . DBManager::convert("amount_usdollar", "IFNULL", array(0)).") total_value";
$opp_query = "select count(*) opp_count,sum(" . DBManagerFactory::getInstance()->convert("amount_usdollar", "IFNULL", array(0)).") total_value";
$opp_query .= " from opportunities";
$opp_query .= " where campaign_id='$campaign_id'";
$opp_query .= " and sales_stage='Prospecting'";
Expand Down
2 changes: 1 addition & 1 deletion modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.php
View file
Expand Up @@ -242,7 +242,7 @@ protected function constructQuery($datay= array(), $targets=array(), $campaign_i
$focus = BeanFactory::newBean('Campaigns');
$focus->retrieve($campaign_id);
$opp_count=0;
$opp_query = "select count(*) opp_count,sum(" . DBManager::convert("amount_usdollar", "IFNULL", array(0)).") total_value";
$opp_query = "select count(*) opp_count,sum(" . DBManagerFactory::getInstance()->convert("amount_usdollar", "IFNULL", array(0)).") total_value";
$opp_query .= " from opportunities";
$opp_query .= " where campaign_id='$campaign_id'";
$opp_query .= " and sales_stage='Prospecting'";
Expand Down
4 changes: 2 additions & 2 deletions modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php
View file
Expand Up @@ -376,8 +376,8 @@ protected function constructQuery()
sum(amount_usdollar/1000) AS total
FROM users,opportunities ";
$query .= " WHERE opportunities.assigned_user_id IN ('{$GLOBALS['current_user']->id}') " .
" AND opportunities.date_closed >= ". DBManager::convert("'".$this->mypbss_date_start."'", 'date').
" AND opportunities.date_closed <= ". DBManager::convert("'".$this->mypbss_date_end."'", 'date') .
" AND opportunities.date_closed >= ". DBManagerFactory::getInstance()->convert("'".$this->mypbss_date_start."'", 'date').
" AND opportunities.date_closed <= ". DBManagerFactory::getInstance()->convert("'".$this->mypbss_date_end."'", 'date') .
" AND opportunities.assigned_user_id = users.id AND opportunities.deleted=0 ";
if (count($this->mypbss_sales_stages) > 0) {
$query .= " AND opportunities.sales_stage IN ('" . implode("','", $this->mypbss_sales_stages) . "') ";
Expand Down
8 changes: 4 additions & 4 deletions modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.php
View file
Expand Up @@ -244,16 +244,16 @@ public function display()
protected function constructQuery()
{
$query = "SELECT sales_stage,".
DBManager::convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))." as m, ".
DBManagerFactory::getInstance()->convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))." as m, ".
"sum(amount_usdollar/1000) as total, count(*) as opp_count FROM opportunities ";
$query .= " WHERE opportunities.date_closed >= ".DBManager::convert("'".$this->obm_date_start."'", 'date') .
" AND opportunities.date_closed <= ".DBManager::convert("'".$this->obm_date_end."'", 'date') .
$query .= " WHERE opportunities.date_closed >= ".DBManagerFactory::getInstance()->convert("'".$this->obm_date_start."'", 'date') .
" AND opportunities.date_closed <= ".DBManagerFactory::getInstance()->convert("'".$this->obm_date_end."'", 'date') .
" AND opportunities.deleted=0";
if (count($this->obm_ids) > 0) {
$query .= " AND opportunities.assigned_user_id IN ('" . implode("','", $this->obm_ids) . "')";
}
$query .= " GROUP BY sales_stage,".
DBManager::convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'")) .
DBManagerFactory::getInstance()->convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'")) .
" ORDER BY m";

return $query;
Expand Down
4 changes: 2 additions & 2 deletions modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php
View file
Expand Up @@ -328,8 +328,8 @@ protected function constructQuery()
count(*) AS opp_count,
sum((amount_usdollar*".$conversion_rate.")/1000) AS total
FROM users,opportunities ";
$query .= " WHERE opportunities.date_closed >= ". DBManager::convert("'".$this->pbss_date_start."'", 'date').
" AND opportunities.date_closed <= ".DBManager::convert("'".$this->pbss_date_end."'", 'date') .
$query .= " WHERE opportunities.date_closed >= ". DBManagerFactory::getInstance()->convert("'".$this->pbss_date_start."'", 'date').
" AND opportunities.date_closed <= ".DBManagerFactory::getInstance()->convert("'".$this->pbss_date_end."'", 'date') .
" AND opportunities.assigned_user_id = users.id AND opportunities.deleted=0 ";
$query .= " GROUP BY opportunities.sales_stage";
return $query;
Expand Down
12 changes: 6 additions & 6 deletions modules/Charts/PredefinedChart.php
View file
Expand Up @@ -220,8 +220,8 @@ public function pipelineBySalesStageQuery()
$date_start = $timedate->swap_formats($date_start, $timedate->get_date_format(), $timedate->dbDayFormat);
$date_end = $timedate->swap_formats($date_end, $timedate->get_date_format(), $timedate->dbDayFormat);
//build the where clause for the query that matches $date_start and $date_end
$where .= " AND opportunities.date_closed >= ". DBManager::convert("'".$date_start."'", 'date'). "
AND opportunities.date_closed <= ".DBManager::convert("'".$date_end."'", 'date') ;
$where .= " AND opportunities.date_closed >= ". DBManagerFactory::getInstance()->convert("'".$date_start."'", 'date'). "
AND opportunities.date_closed <= ".DBManagerFactory::getInstance()->convert("'".$date_end."'", 'date') ;
$where .= " AND opportunities.assigned_user_id = users.id AND opportunities.deleted=0 ";

//Now do the db queries
Expand Down Expand Up @@ -401,10 +401,10 @@ public function outcomeByMonthQuery()

$opp = BeanFactory::newBean('Opportunities');
//build the where clause for the query that matches $date_start and $date_end
$where .= "AND opportunities.date_closed >= ".DBManager::convert("'".$date_start."'", 'date')." AND opportunities.date_closed <= ".DBManager::convert("'".$date_end."'", 'date')." AND opportunities.deleted=0";
$query = "SELECT sales_stage,".DBManager::convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))." as m, sum(amount_usdollar/1000) as total, count(*) as opp_count FROM opportunities ";
$where .= "AND opportunities.date_closed >= ".DBManagerFactory::getInstance()->convert("'".$date_start."'", 'date')." AND opportunities.date_closed <= ".DBManagerFactory::getInstance()->convert("'".$date_end."'", 'date')." AND opportunities.deleted=0";
$query = "SELECT sales_stage,".DBManagerFactory::getInstance()->convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))." as m, sum(amount_usdollar/1000) as total, count(*) as opp_count FROM opportunities ";
$query .= "WHERE ".$where;
$query .= " GROUP BY sales_stage,".DBManager::convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))."ORDER BY m";
$query .= " GROUP BY sales_stage,".DBManagerFactory::getInstance()->convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))."ORDER BY m";
return $query;
}

Expand Down Expand Up @@ -494,7 +494,7 @@ public function pipelineByLeadSourceQuery($filters)
public function myModuleUsageLast30Days()
{
global $current_user;
$dateValue = DBManager::convert("'".$timedate->getNow()->modify("-30 days")->asDb()."'", "datetime");
$dateValue = DBManagerFactory::getInstance()->convert("'".$timedate->getNow()->modify("-30 days")->asDb()."'", "datetime");

$query = "SELECT tracker.module_name as module_name ";
$query .= ",COUNT(*) count FROM tracker ";
Expand Down
8 changes: 4 additions & 4 deletions modules/Charts/code/Chart_my_pipeline_by_sales_stage.php
View file
Expand Up @@ -290,8 +290,8 @@ function gen_xml_pipeline_by_sales_stage(
}

//build the where clause for the query that matches $date_start and $date_end
$where .= " AND opportunities.date_closed >= ". DBManager::convert("'".$date_start."'", 'date'). "
AND opportunities.date_closed <= ".DBManager::convert("'".$date_end."'", 'date') ;
$where .= " AND opportunities.date_closed >= ". DBManagerFactory::getInstance()->convert("'".$date_start."'", 'date'). "
AND opportunities.date_closed <= ".DBManagerFactory::getInstance()->convert("'".$date_end."'", 'date') ;
$where .= " AND opportunities.assigned_user_id = users.id AND opportunities.deleted=0 ";

//Now do the db queries
Expand Down Expand Up @@ -479,8 +479,8 @@ function constructQuery()
}

//build the where clause for the query that matches $date_start and $date_end
$where .= " AND opportunities.date_closed >= ". DBManager::convert("'".$date_start."'", 'date'). "
AND opportunities.date_closed <= ".DBManager::convert("'".$date_end."'", 'date') ;
$where .= " AND opportunities.date_closed >= ". DBManagerFactory::getInstance()->convert("'".$date_start."'", 'date'). "
AND opportunities.date_closed <= ".DBManagerFactory::getInstance()->convert("'".$date_end."'", 'date') ;
$where .= " AND opportunities.assigned_user_id = users.id AND opportunities.deleted=0 ";

//Now do the db queries
Expand Down
12 changes: 6 additions & 6 deletions modules/Charts/code/Chart_outcome_by_month.php
View file
Expand Up @@ -268,10 +268,10 @@ public function gen_xml(

$opp = BeanFactory::newBean('Opportunities');
//build the where clause for the query that matches $date_start and $date_end
$where .= "AND opportunities.date_closed >= ".DBManager::convert("'".$date_start."'", 'date')." AND opportunities.date_closed <= ".DBManager::convert("'".$date_end."'", 'date')." AND opportunities.deleted=0";
$query = "SELECT sales_stage,".DBManager::convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))." as m, sum(amount_usdollar/1000) as total, count(*) as opp_count FROM opportunities ";
$where .= "AND opportunities.date_closed >= ".DBManagerFactory::getInstance()->convert("'".$date_start."'", 'date')." AND opportunities.date_closed <= ".DBManagerFactory::getInstance()->convert("'".$date_end."'", 'date')." AND opportunities.deleted=0";
$query = "SELECT sales_stage,".DBManagerFactory::getInstance()->convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))." as m, sum(amount_usdollar/1000) as total, count(*) as opp_count FROM opportunities ";
$query .= "WHERE ".$where;
$query .= " GROUP BY sales_stage,".DBManager::convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))."ORDER BY m";
$query .= " GROUP BY sales_stage,".DBManagerFactory::getInstance()->convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))."ORDER BY m";
//Now do the db queries
//query for opportunity data that matches $datay and $user

Expand Down Expand Up @@ -449,10 +449,10 @@ public function constructQuery()

$opp = BeanFactory::newBean('Opportunities');
//build the where clause for the query that matches $date_start and $date_end
$where .= "AND opportunities.date_closed >= ".DBManager::convert("'".$date_start."'", 'date')." AND opportunities.date_closed <= ".DBManager::convert("'".$date_end."'", 'date')." AND opportunities.deleted=0";
$query = "SELECT sales_stage,".DBManager::convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))." as m, sum(amount_usdollar/1000) as total, count(*) as opp_count FROM opportunities ";
$where .= "AND opportunities.date_closed >= ".DBManagerFactory::getInstance()->convert("'".$date_start."'", 'date')." AND opportunities.date_closed <= ".DBManagerFactory::getInstance()->convert("'".$date_end."'", 'date')." AND opportunities.deleted=0";
$query = "SELECT sales_stage,".DBManagerFactory::getInstance()->convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))." as m, sum(amount_usdollar/1000) as total, count(*) as opp_count FROM opportunities ";
$query .= "WHERE ".$where;
$query .= " GROUP BY sales_stage,".DBManager::convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))."ORDER BY m";
$query .= " GROUP BY sales_stage,".DBManagerFactory::getInstance()->convert('opportunities.date_closed', 'date_format', array("'%Y-%m'"), array("'YYYY-MM'"))."ORDER BY m";
return $query;
}

Expand Down
8 changes: 4 additions & 4 deletions modules/Charts/code/Chart_pipeline_by_sales_stage.php
View file
Expand Up @@ -348,8 +348,8 @@ public function gen_xml(
}

//build the where clause for the query that matches $date_start and $date_end
$where .= " AND opportunities.date_closed >= ". DBManager::convert("'".$date_start."'", 'date'). "
AND opportunities.date_closed <= ".DBManager::convert("'".$date_end."'", 'date') ;
$where .= " AND opportunities.date_closed >= ". DBManagerFactory::getInstance()->convert("'".$date_start."'", 'date'). "
AND opportunities.date_closed <= ".DBManagerFactory::getInstance()->convert("'".$date_end."'", 'date') ;
$where .= " AND opportunities.assigned_user_id = users.id AND opportunities.deleted=0 ";

//Now do the db queries
Expand Down Expand Up @@ -595,8 +595,8 @@ public function constructQuery()
}

//build the where clause for the query that matches $date_start and $date_end
$where .= " AND opportunities.date_closed >= ". DBManager::convert("'".$date_start."'", 'date'). "
AND opportunities.date_closed <= ".DBManager::convert("'".$date_end."'", 'date') ;
$where .= " AND opportunities.date_closed >= ". DBManagerFactory::getInstance()->convert("'".$date_start."'", 'date'). "
AND opportunities.date_closed <= ".DBManagerFactory::getInstance()->convert("'".$date_end."'", 'date') ;
$where .= " AND opportunities.assigned_user_id = users.id AND opportunities.deleted=0 ";

//Now do the db queries
Expand Down
2 changes: 1 addition & 1 deletion modules/Schedulers/_AddJobsHere.php
View file
Expand Up @@ -387,7 +387,7 @@ function trimTracker()
continue;
}

$timeStamp = DBManager::convert("'" . $timedate->asDb($timedate->getNow()->get("-" . $prune_interval . " days")) . "'", "datetime");
$timeStamp = DBManagerFactory::getInstance()->convert("'" . $timedate->asDb($timedate->getNow()->get("-" . $prune_interval . " days")) . "'", "datetime");
if ($tableName == 'tracker_sessions') {
$query = "DELETE FROM $tableName WHERE date_end < $timeStamp";
} else {
Expand Down
8 changes: 4 additions & 4 deletions service/v4_1/SugarWebServiceImplv4_1.php
View file
Expand Up @@ -309,18 +309,18 @@ public function get_modified_relationships(

// Cast to integer
$deleted = (int)$deleted;
$query = "(m1.date_modified > " . DBManager::convert(
$query = "(m1.date_modified > " . DBManagerFactory::getInstance()->convert(
"'" . DBManagerFactory::getInstance()->quote($from_date) . "'",
'datetime'
) . " AND m1.date_modified <= " . DBManager::convert(
) . " AND m1.date_modified <= " . DBManagerFactory::getInstance()->convert(
"'" . DBManagerFactory::getInstance()->quote($to_date) . "'",
'datetime'
) . " AND {0}.deleted = $deleted)";
if (isset($deletion_date) && !empty($deletion_date)) {
$query .= " OR ({0}.date_modified > " . DBManager::convert(
$query .= " OR ({0}.date_modified > " . DBManagerFactory::getInstance()->convert(
"'" . DBManagerFactory::getInstance()->quote($deletion_date) . "'",
'datetime'
) . " AND {0}.date_modified <= " . DBManager::convert(
) . " AND {0}.date_modified <= " . DBManagerFactory::getInstance()->convert(
"'" . DBManagerFactory::getInstance()->quote($to_date) . "'",
'datetime'
) . " AND {0}.deleted = 1)";
Expand Down
4 changes: 2 additions & 2 deletions soap/SoapData.php
View file
Expand Up @@ -99,9 +99,9 @@ function sync_get_modified_relationships($session, $module_name, $related_module
$sugar_config['list_max_entries_per_page'] = $max_results;
}

$date_query = "(m1.date_modified > " . DBManager::convert("'".DBManagerFactory::getInstance()->quote($from_date)."'", 'datetime'). " AND m1.date_modified <= ". DBManager::convert("'".DBManagerFactory::getInstance()->quote($to_date)."'", 'datetime')." AND {0}.deleted = $deleted)";
$date_query = "(m1.date_modified > " . DBManagerFactory::getInstance()->convert("'".DBManagerFactory::getInstance()->quote($from_date)."'", 'datetime'). " AND m1.date_modified <= ". DBManagerFactory::getInstance()->convert("'".DBManagerFactory::getInstance()->quote($to_date)."'", 'datetime')." AND {0}.deleted = $deleted)";
if (isset($deletion_date) && !empty($deletion_date)) {
$date_query .= " OR ({0}.date_modified > " . DBManager::convert("'".DBManagerFactory::getInstance()->quote($deletion_date)."'", 'datetime'). " AND {0}.date_modified <= ". DBManager::convert("'".DBManagerFactory::getInstance()->quote($to_date)."'", 'datetime')." AND {0}.deleted = 1)";
$date_query .= " OR ({0}.date_modified > " . DBManagerFactory::getInstance()->convert("'".DBManagerFactory::getInstance()->quote($deletion_date)."'", 'datetime'). " AND {0}.date_modified <= ". DBManagerFactory::getInstance()->convert("'".DBManagerFactory::getInstance()->quote($to_date)."'", 'datetime')." AND {0}.deleted = 1)";
}

$in = '';
Expand Down
2 changes: 1 addition & 1 deletion soap/SoapPortalUsers.php
View file
Expand Up @@ -275,7 +275,7 @@ function portal_get_entry_list_filter($session, $module_name, $order_by, $select

$where .= "$sugar->table_name$cstm.$name $operator ";
if ($sugar->field_defs['name']['type'] == 'datetime') {
$where .= DBManager::convert("'".DBManagerFactory::getInstance()->quote($value)."'", 'datetime');
$where .= DBManagerFactory::getInstance()->convert("'".DBManagerFactory::getInstance()->quote($value)."'", 'datetime');
} else {
if (empty($value)) {
$tmp = array();
Expand Down
6 changes: 3 additions & 3 deletions soap/SoapRelationshipHelper.php
View file
Expand Up @@ -279,8 +279,8 @@ function server_save_relationships($list, $from_date, $to_date)
{
require_once('include/utils/db_utils.php');
global $beanList, $beanFiles;
$from_date = DBManager::convert("'".DBManagerFactory::getInstance()->quote($from_date)."'", 'datetime');
$to_date = DBManager::convert("'".DBManagerFactory::getInstance()->quote($to_date)."'", 'datetime');
$from_date = DBManagerFactory::getInstance()->convert("'".DBManagerFactory::getInstance()->quote($from_date)."'", 'datetime');
$to_date = DBManagerFactory::getInstance()->convert("'".DBManagerFactory::getInstance()->quote($to_date)."'", 'datetime');
global $sugar_config;
$db = DBManagerFactory::getInstance();

Expand All @@ -307,7 +307,7 @@ function server_save_relationships($list, $from_date, $to_date)
if ($name == 'date_modified') {
$value = $to_date;
} else {
$value = DBManager::convert("'".DBManagerFactory::getInstance()->quote($name_value['value'])."'", 'varchar');
$value = DBManagerFactory::getInstance()->convert("'".DBManagerFactory::getInstance()->quote($name_value['value'])."'", 'varchar');
}
if ($name != 'resolve') {
if (empty($insert)) {
Expand Down

0 comments on commit 2edb1f5

Please sign in to comment.