fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-18 02:39:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.2.5 ( ~ r10673)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10674 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-14 08:04:10 +00:00
parent f0c12f5756
commit ea84468e7d
19 changed files with 173 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/document/document.model.php
View file

@ -252,7 +252,7 @@
$division = (int)Context::get('division');
// order by list_order and (module_srl===0 or module_srl many count), therefore case table full scan
if($args->sort_index == 'list_order' && ((int)$args->exclude_module_srl === 0 || count($args->module_srl) > 10))
if($args->sort_index == 'list_order' && ($args->exclude_module_srl === '0' || count(explode(',', $args->module_srl)) > 5))
{
$listSqlID = 'document.getDocumentListUseIndex';
$divisionSqlID = 'document.getDocumentDivisionUseIndex';

3
modules/document/queries/deleteDocument.xml
View file

@ -1,8 +1,7 @@
<query id="deleteDocument" action="delete">
<query id="deleteDocument" action="delete" priority="LOW">
<tables>
<table name="documents" />
</tables>
<priority type="low" />
<conditions>
<condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
</conditions>

4
modules/document/queries/getDocumentDivisionUseIndex.xml
View file

@ -5,7 +5,9 @@
<columns>
<column name="*" />
</columns>
<index_hint name="idx_list_order" type="use" />
<index_hint for="MYSQL">
<index table="documents" name="idx_list_order" type="USE" />
</index_hint>
<conditions>
<condition operation="in" column="module_srl" var="module_srl" filter="number" />
<condition operation="notin" column="module_srl" var="exclude_module_srl" filter="number" pipe="and" />

4
modules/document/queries/getDocumentListUseIndex.xml
View file

@ -5,7 +5,9 @@
<columns>
<column name="*" />
</columns>
<index_hint name="idx_list_order" type="use" />
<index_hint for="MYSQL">
<index table="documents" name="idx_list_order" type="USE" />
</index_hint>
<conditions>
<condition operation="in" column="module_srl" var="module_srl" filter="number" />
<condition operation="notin" column="module_srl" var="exclude_module_srl" filter="number" pipe="and" />

3
modules/document/queries/insertDocument.xml
View file

@ -1,8 +1,7 @@
<query id="insertDocument" action="insert">
<query id="insertDocument" action="insert" priority="LOW">
<tables>
<table name="documents" />
</tables>
<priority type="low" />
<columns>
<column name="document_srl" var="document_srl" filter="number" notnull="notnull" />
<column name="module_srl" var="module_srl" filter="number" default="0" />

3
modules/document/queries/updateDocument.xml
View file

@ -1,8 +1,7 @@
<query id="updateDocument" action="update">
<query id="updateDocument" action="update" priority="LOW">
<tables>
<table name="documents" />
</tables>
<priority type="low" />
<columns>
<column name="module_srl" var="module_srl" filter="number" default="0" />
<column name="category_srl" var="category_srl" filter="number" default="0" />