merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,8 +1,16 @@
<query id="getPollListWithMember" action="select">
<tables>
<table name="poll_title" alias="P" />
<table name="poll" alias="P2" />
<table name="member" alias="M" />
<table name="poll" alias="P2" type="left join">
<conditions>
<condition operation="equal" column="P2.poll_srl" var="P.poll_srl" />
</conditions>
</table>
<table name="member" alias="M" type="left outer join">
<conditions>
<condition operation="equal" column="P2.member_srl" var="M.member_srl" />
</conditions>
</table>
</tables>
<columns>
<column name="P.poll_srl" alias="poll_srl" />
@ -17,15 +25,14 @@
<column name="M.*" />
</columns>
<conditions>
<condition operation="in" column="poll_index_srl" var="pollIndexSrlList" filter="number" pipe="and" />
<group pipe="and">
<condition operation="equal" column="P.member_srl" var="M.member_srl" notnull="notnull" />
<condition operation="equal" column="P2.member_srl" var="M.member_srl" notnull="notnull" pipe="and" />
<condition operation="equal" column="P2.poll_srl" var="P.poll_srl" notnull="notnull" pipe="and" />
<condition operation="in" column="poll_index_srl" var="pollIndexSrlList" filter="number" pipe="and" />
<condition operation="like" column="P.title" var="s_title" pipe="or"/>
<condition operation="like_prefix" column="P.regdate" var="s_regdate" pipe="or" />
<condition operation="like_prefix" column="P.ipaddress" var="s_ipaddress" pipe="or" />
</group>
<condition operation="like" column="P.title" var="s_title" pipe="or"/>
<condition operation="like_prefix" column="P.regdate" var="s_regdate" pipe="or" />
<condition operation="like_prefix" column="P.ipaddress" var="s_ipaddress" pipe="or" />
</conditions>
<navigation>
<index var="sort_index" default="P.list_order" order="asc" />