Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Use short table aliases

Browse Source 
[MAILPOET-4778]
This commit is contained in:
Jan Jakes
2022-11-08 09:53:13 +03:00
committed by David Remer
parent 467f354eb1
commit c0ce5944dc
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
mailpoet/lib/Automation/Engine/Storage/WorkflowStorage.php
View File

@@ -65,16 +65,16 @@ class WorkflowStorage {
$versionsTable = esc_sql($this->versionsTable); $versionsTable = esc_sql($this->versionsTable);
$query = !$versionId ? (string)$this->wpdb->prepare(" $query = !$versionId ? (string)$this->wpdb->prepare("
SELECT workflow.*, version.id AS version_id, version.steps SELECT w.*, v.id AS version_id, v.steps
FROM $workflowsTable as workflow, $versionsTable as version FROM $workflowsTable as w, $versionsTable as v
WHERE version.workflow_id = workflow.id AND workflow.id = %d WHERE v.workflow_id = w.id AND w.id = %d
ORDER BY version.id DESC ORDER BY v.id DESC
LIMIT 0,1;", LIMIT 0,1;",
$workflowId $workflowId
) : (string)$this->wpdb->prepare(" ) : (string)$this->wpdb->prepare("
SELECT workflow.*, version.id AS version_id, version.steps SELECT w.*, v.id AS version_id, v.steps
FROM $workflowsTable as workflow, $versionsTable as version FROM $workflowsTable as w, $versionsTable as v
WHERE version.workflow_id = workflow.id AND version.id = %d", WHERE v.workflow_id = w.id AND v.id = %d",
$versionId $versionId
); );
$data = $this->wpdb->get_row($query, ARRAY_A); $data = $this->wpdb->get_row($query, ARRAY_A);
@@ -87,16 +87,16 @@ class WorkflowStorage {
$versionsTable = esc_sql($this->versionsTable); $versionsTable = esc_sql($this->versionsTable);
$query = $status ? $query = $status ?
(string)$this->wpdb->prepare(" (string)$this->wpdb->prepare("
SELECT workflow.*, version.id AS version_id, version.steps SELECT w.*, v.id AS version_id, v.steps
FROM $workflowsTable AS workflow INNER JOIN $versionsTable as version ON (version.workflow_id=workflow.id) FROM $workflowsTable AS w INNER JOIN $versionsTable as v ON (v.workflow_id = w.id)
WHERE version.id = (SELECT Max(id) FROM $versionsTable WHERE workflow_id= version.workflow_id) AND workflow.status IN (%s) WHERE v.id = (SELECT Max(id) FROM $versionsTable WHERE workflow_id = v.workflow_id) AND w.status IN (%s)
ORDER BY workflow.id DESC", ORDER BY w.id DESC",
implode(",", $status) implode(",", $status)
) : ) :
"SELECT workflow.*, version.id AS version_id, version.steps "SELECT w.*, v.id AS version_id, v.steps
FROM $workflowsTable AS workflow INNER JOIN $versionsTable as version ON (version.workflow_id=workflow.id) FROM $workflowsTable AS w INNER JOIN $versionsTable as v ON (v.workflow_id = w.id)
WHERE version.id = (SELECT Max(id) FROM $versionsTable WHERE workflow_id= version.workflow_id) WHERE v.id = (SELECT Max(id) FROM $versionsTable WHERE workflow_id = v.workflow_id)
ORDER BY workflow.id DESC;"; ORDER BY w.id DESC;";
$data = $this->wpdb->get_results($query, ARRAY_A); $data = $this->wpdb->get_results($query, ARRAY_A);
return array_map(function (array $workflowData) { return array_map(function (array $workflowData) {
@@ -116,10 +116,10 @@ class WorkflowStorage {
$query = (string)$this->wpdb->prepare( $query = (string)$this->wpdb->prepare(
" "
SELECT DISTINCT triggers.trigger_key SELECT DISTINCT t.trigger_key
FROM {$workflowsTable} AS workflow FROM {$workflowsTable} AS w
JOIN $triggersTable as triggers JOIN $triggersTable as t
WHERE workflow.status = %s AND workflow.id = triggers.workflow_id WHERE w.status = %s AND w.id = t.workflow_id
ORDER BY trigger_key DESC ORDER BY trigger_key DESC
", ",
Workflow::STATUS_ACTIVE Workflow::STATUS_ACTIVE
@@ -135,14 +135,14 @@ class WorkflowStorage {
$query = (string)$this->wpdb->prepare( $query = (string)$this->wpdb->prepare(
" "
SELECT workflow.*, version.id AS version_id, version.steps SELECT w.*, v.id AS version_id, v.steps
FROM $workflowsTable AS workflow FROM $workflowsTable AS w
INNER JOIN $triggersTable as t ON (t.workflow_id = workflow.id) INNER JOIN $triggersTable as t ON (t.workflow_id = w.id)
INNER JOIN $versionsTable as version ON (version.workflow_id = workflow.id) INNER JOIN $versionsTable as v ON (v.workflow_id = w.id)
WHERE workflow.status = %s WHERE w.status = %s
AND t.trigger_key = %s AND t.trigger_key = %s
AND version.id = ( AND v.id = (
SELECT MAX(id) FROM $versionsTable WHERE workflow_id = version.workflow_id SELECT MAX(id) FROM $versionsTable WHERE workflow_id = v.workflow_id
) )
", ",
Workflow::STATUS_ACTIVE, Workflow::STATUS_ACTIVE,