merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -1,10 +0,0 @@
<query id="addOpenIDToMember" action="insert">
<tables>
<table name="member_openid" />
</tables>
<columns>
<column name="openid" var="openid" notnull="notnull" />
<column name="member_srl" var="member_srl" notnull="notnull" />
<column name="regdate" default="curdate()" />
</columns>
</query>

View file

@ -0,0 +1,11 @@
<query id="chkDeniedNickName" action="select">
<tables>
<table name="member_denied_nick_name" />
</tables>
<columns>
<column name="count(*)" alias="count" />
</columns>
<conditions>
<condition operation="equal" column="nick_name" var="nick_name" />
</conditions>
</query>

View file

@ -0,0 +1,8 @@
<query id="deleteDeniedNickName" action="delete">
<tables>
<table name="member_denied_nick_name" />
</tables>
<conditions>
<condition operation="equal" column="nick_name" var="nick_name" notnull="notnull" />
</conditions>
</query>

View file

@ -1,8 +0,0 @@
<query id="deleteMemberOpenID" action="delete">
<tables>
<table name="member_openid" />
</tables>
<conditions>
<condition operation="equal" column="openid" var="openid" notnull="notnull" />
</conditions>
</query>

View file

@ -1,8 +0,0 @@
<query id="deleteMemberOpenIDByMemberSrl" action="delete">
<tables>
<table name="member_openid" />
</tables>
<conditions>
<condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />
</conditions>
</query>

View file

@ -1,9 +0,0 @@
<query id="deleteOpenIdAssociation" action="delete">
<tables>
<table name="member_openid_association" />
</tables>
<conditions>
<condition operation="equal" column="server_url" var="server_url" />
<condition operation="equal" column="handle" var="handle" pipe="and" />
</conditions>
</query>

View file

@ -1,8 +0,0 @@
<query id="deleteOpenIdNonce" action="delete">
<tables>
<table name="member_openid_nonce" />
</tables>
<conditions>
<condition operation="equal" column="nonce" var="nonce" />
</conditions>
</query>

View file

@ -0,0 +1,8 @@
<query id="getDeniedNickNames" action="select">
<tables>
<table name="member_denied_nick_name" />
</tables>
<columns>
<column name="*" />
</columns>
</query>

View file

@ -1,14 +0,0 @@
<query id="getMemberOpenIDByMemberSrl" action="select">
<tables>
<table name="member_openid" />
</tables>
<columns>
<column name="openid" />
</columns>
<navigation>
<index var="sort_index" default="regdate" order="asc" />
</navigation>
<conditions>
<condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />
</conditions>
</query>

View file

@ -1,11 +0,0 @@
<query id="getMemberSrlByOpenID" action="select">
<tables>
<table name="member_openid" />
</tables>
<columns>
<column name="member_srl" />
</columns>
<conditions>
<condition operation="equal" column="openid" var="openid" notnull="notnull" />
</conditions>
</query>

View file

@ -1,12 +0,0 @@
<query id="getOpenIdAssociation" action="select">
<tables>
<table name="member_openid_association" />
</tables>
<columns>
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="server_url" var="server_url" notnull="notnull" />
<condition operation="equal" column="handle" var="handle" pipe="and" />
</conditions>
</query>

View file

@ -1,11 +0,0 @@
<query id="getOpenIdNonce" action="select">
<tables>
<table name="member_openid_nonce" />
</tables>
<columns>
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="nonce" var="nonce" notnull="notnull" />
</conditions>
</query>

View file

@ -0,0 +1,10 @@
<query id="insertDeniedNickName" action="insert">
<tables>
<table name="member_denied_nick_name" />
</tables>
<columns>
<column name="nick_name" var="nick_name" notnull="notnull" />
<column name="regdate" default="curdate()" />
<column name="description" var="description" default="" />
</columns>
</query>

View file

@ -1,13 +0,0 @@
<query id="insertOpenIdAssociation" action="insert">
<tables>
<table name="member_openid_association" />
</tables>
<columns>
<column name="server_url" var="server_url" notnull="notnull" />
<column name="handle" var="handle" notnull="notnull" />
<column name="secret" var="secret" notnull="notnull" />
<column name="issued" var="issued" notnull="notnull" />
<column name="lifetime" var="lifetime" notnull="notnull" />
<column name="assoc_type" var="assoc_type" notnull="notnull" />
</columns>
</query>

View file

@ -1,9 +0,0 @@
<query id="insertOpenIdNonce" action="insert">
<tables>
<table name="member_openid_nonce" />
</tables>
<columns>
<column name="nonce" var="nonce" notnull="notnull" />
<column name="expires" var="expires" notnull="notnull" />
</columns>
</query>

View file

@ -8,6 +8,8 @@
<column name="nick_name" var="nick_name" notnull="notnull" minlength="2" maxlength="40" />
<column name="user_id" var="user_id" notnull="notnull" />
<column name="email_address" var="email_address" notnull="notnull"/>
<column name="email_id" var="email_id" />
<column name="email_host" var="email_host" />
<column name="find_account_question" var="find_account_question" />
<column name="find_account_answer" var="find_account_answer" default="" />
<column name="homepage" var="homepage" default="" />