merge sandbox to trunk for 1.4.4

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7723 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-09-28 07:24:47 +00:00
parent 200d63636c
commit b8299c8a65
683 changed files with 70982 additions and 69716 deletions

View file

@ -11,6 +11,8 @@
<column name="email_host" var="email_host" notnull="notnull" />
<column name="user_name" var="user_name" notnull="notnull" minlength="1" maxlength="40" />
<column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
<column name="find_account_question" var="find_account_question" />
<column name="find_account_answer" var="find_account_answer" />
<column name="homepage" var="homepage" />
<column name="blog" var="blog" />
<column name="birthday" var="birthday" />

View file

@ -0,0 +1,8 @@
<query id="updateAllChangePasswordDate" action="update">
<tables>
<table name="member" />
</tables>
<columns>
<column name="change_password_date" var="change_password_date" notnull="notnull" default="curdate()" />
</columns>
</query>

View file

@ -0,0 +1,11 @@
<query id="updateChangePasswordDate" action="update">
<tables>
<table name="member" />
</tables>
<columns>
<column name="change_password_date" var="change_password_date" notnull="notnull" default="curdate()" />
</columns>
<conditions>
<condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
</conditions>
</query>

View file

@ -9,6 +9,8 @@
<column name="email_host" var="email_host" notnull="notnull" />
<column name="user_name" var="user_name" notnull="notnull" minlength="2" maxlength="40" />
<column name="nick_name" var="nick_name" notnull="notnull" minlength="2" maxlength="40" />
<column name="find_account_question" var="find_account_question" />
<column name="find_account_answer" var="find_account_answer" />
<column name="homepage" var="homepage" default="" />
<column name="blog" var="blog" default="" />
<column name="birthday" var="birthday" />