Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added table name to time period sql params. 

Without this, the subquery could not be used in some contexts, as the column name was ambiguous.
This commit is contained in:
Peter Fabian 2018-11-27 16:23:40 +01:00
parent 8dbcbfc6cb
commit 7dd611f4d4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/woocommerce-admin/includes/data-stores/class-wc-admin-reports-data-store.php
View File

@ -444,6 +444,10 @@ class WC_Admin_Reports_Data_Store {
* @return array * @return array
*/ */
protected function get_time_period_sql_params( $query_args ) { protected function get_time_period_sql_params( $query_args ) {
global $wpdb;
$table_name = $wpdb->prefix . $this::TABLE_NAME;
$sql_query = array( $sql_query = array(
'from_clause' => '', 'from_clause' => '',
'where_time_clause' => '', 'where_time_clause' => '',
@ -453,14 +457,14 @@ class WC_Admin_Reports_Data_Store {
if ( isset( $query_args['before'] ) && '' !== $query_args['before'] ) { if ( isset( $query_args['before'] ) && '' !== $query_args['before'] ) {
$datetime = new DateTime( $query_args['before'] ); $datetime = new DateTime( $query_args['before'] );
$datetime_str = $datetime->format( WC_Admin_Reports_Interval::$sql_datetime_format ); $datetime_str = $datetime->format( WC_Admin_Reports_Interval::$sql_datetime_format );
$sql_query['where_time_clause'] .= " AND date_created <= '$datetime_str'"; $sql_query['where_time_clause'] .= " AND {$table_name}.date_created <= '$datetime_str'";
} }
if ( isset( $query_args['after'] ) && '' !== $query_args['after'] ) { if ( isset( $query_args['after'] ) && '' !== $query_args['after'] ) {
$datetime = new DateTime( $query_args['after'] ); $datetime = new DateTime( $query_args['after'] );
$datetime_str = $datetime->format( WC_Admin_Reports_Interval::$sql_datetime_format ); $datetime_str = $datetime->format( WC_Admin_Reports_Interval::$sql_datetime_format );
$sql_query['where_time_clause'] .= " AND date_created >= '$datetime_str'"; $sql_query['where_time_clause'] .= " AND {$table_name}.date_created >= '$datetime_str'";
} }
return $sql_query; return $sql_query;