Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use table alias/name when building date query #9700

Closed
wants to merge 1 commit into from
Closed

Use table alias/name when building date query #9700

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions includes/database/engine/class-date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,19 @@ class Date extends Base {
'AND'
);


/**
* @since 3.2.6
* @var string|null Table name
*/
public $table_name = null;

/**
* @since 3.2.6
* @var string|null Table alias
*/
public $table_alias = null;

/**
* Constructor.
*
Expand Down Expand Up @@ -362,6 +375,12 @@ public function get_column( $query = array() ) {
? esc_sql( $this->validate_column( $query['column'] ) )
: $this->column;

if (!empty($this->table_alias)) {
$retval = $this->table_alias . '.' . $retval;
} elseif (!empty($this->table_name)) {
$retval = $this->table_name . '.' . $retval;
}

return $retval;
}

Expand Down Expand Up @@ -602,11 +621,15 @@ public function validate_column( $column = '' ) {
* Generate WHERE clause to be appended to a main query.
*
* @since 1.0.0
* @param string $table_name Optional. Table name. Default null.
* @param string $table_alias Optional. Table alias. Default null.
*
* @return string MySQL WHERE clauses.
*/
public function get_sql() {
$sql = $this->get_sql_clauses();
public function get_sql( $table_name = null, $table_alias = null ) {
$this->table_name = $this->sanitize_table_name( $table_name );
$this->table_alias = $this->sanitize_table_name( $table_alias );
$sql = $this->get_sql_clauses();

/**
* Filters the date query clauses.
Expand Down