merged 1.5.0 branch into 1.5.0-DB

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8547 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-06-29 15:36:09 +00:00
parent 4973c78fbc
commit 01d0925dd5
145 changed files with 990 additions and 31147 deletions

View file

@ -0,0 +1,9 @@
<query id="deleteTrash" action="delete">
<tables>
<table name="trash" />
</tables>
<conditions>
<condition operation="equal" column="trash_srl" var="trashSrl" filter="number" />
<condition operation="in" column="trash_srl" var="trashSrls" filter="number" />
</conditions>
</query>

View file

@ -0,0 +1,11 @@
<query id="getTrash" action="select">
<tables>
<table name="trash" />
</tables>
<columns>
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="trash_srl" var="trashSrl" filter="number" notnull="notnull" />
</conditions>
</query>

View file

@ -0,0 +1,21 @@
<query id="getTrashList" action="select">
<tables>
<table name="trash" alias="T" />
<table name="member" alias="M" />
</tables>
<columns>
<column name="T.*" />
<column name="M.user_id" />
<column name="M.nick_name" />
</columns>
<conditions>
<condition operation="equal" column="T.remover_srl" default="M.member_srl" notnull="notnull" />
<condition operation="equal" column="trash_srl" var="trashSrl" filter="number" />
</conditions>
<navigation>
<index var="sort_index" default="trash_srl" order="desc" />
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
</navigation>
</query>

View file

@ -0,0 +1,15 @@
<query id="insertTrash" action="insert">
<tables>
<table name="trash" />
</tables>
<columns>
<column name="trash_srl" var="trashSrl" filter="number" notnull="notnull" />
<column name="title" var="title" notnull="notnull" />
<column name="origin_module" var="originModule" notnull="notnull" default="document" />
<column name="serialized_object" var="serializedObject" />
<column name="description" var="description" />
<column name="ipaddress" var="ipaddress" default="ipaddress()" />
<column name="remover_srl" var="removerSrl" default="0" filter="number" />
<column name="regdate" var="regdate" default="curdate()" />
</columns>
</query>