Consolidate queries

This commit is contained in:
Kijin Sung 2025-05-23 15:16:36 +09:00
parent 8291cd671e
commit 4155f9fe9c
5 changed files with 6 additions and 30 deletions

View file

@ -433,7 +433,7 @@ class DocumentAdminController extends Document
// We need to do this twice because of the unique constraint.
foreach ($changes as $change)
{
$output = executeQuery('document.updateDocumentExtraKeyIdxByEid', [
$output = executeQuery('document.updateDocumentExtraKeyIdx', [
'module_srl' => $module_srl,
'eid' => $change['eid'],
'var_idx' => $change['old_idx'],
@ -445,7 +445,7 @@ class DocumentAdminController extends Document
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdxByEid', [
$output = executeQuery('document.updateDocumentExtraVarIdx', [
'module_srl' => $module_srl,
'eid' => $change['eid'],
'var_idx' => $change['old_idx'],

View file

@ -7,6 +7,7 @@
</columns>
<conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" />
<condition operation="equal" column="eid" var="eid" />
</conditions>
</query>

View file

@ -1,13 +0,0 @@
<query id="updateDocumentExtraKeyIdxByEid" action="update">
<tables>
<table name="document_extra_keys" />
</tables>
<columns>
<column name="var_idx" var="new_idx" notnull="notnull" />
</columns>
<conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" />
<condition operation="equal" column="eid" var="eid" notnull="notnull" />
</conditions>
</query>

View file

@ -7,6 +7,7 @@
</columns>
<conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" />
<condition operation="equal" column="eid" var="eid" />
</conditions>
</query>

View file

@ -1,13 +0,0 @@
<query id="updateDocumentExtraVarIdxByEid" action="update">
<tables>
<table name="document_extra_vars" />
</tables>
<columns>
<column name="var_idx" var="new_idx" notnull="notnull" />
</columns>
<conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="var_idx" var="var_idx" notnull="notnull" />
<condition operation="equal" column="eid" var="eid" notnull="notnull" />
</conditions>
</query>