fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/member-phone-number

Browse source
This commit is contained in:
Kijin Sung 2019-07-28 00:01:20 +09:00
commit 11ffc78dda
3 changed files with 3 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/db/DBMysql.class.php
View file

@ -467,7 +467,7 @@ class DBMySQL extends DB
* @param boolean $notnull not null status, default value is false * @param boolean $notnull not null status, default value is false
* @return void * @return void
*/ */
function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = false, $after = null) function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = false, $after_column = null)
{ {
$type = strtolower($type); $type = strtolower($type);
$type = isset($this->column_type[$type]) ? $this->column_type[$type] : $type; $type = isset($this->column_type[$type]) ? $this->column_type[$type] : $type;

14
modules/member/member.model.php
View file

@ -289,18 +289,8 @@ class memberModel extends member
if(!$email_address) return; if(!$email_address) return;
$args = new stdClass(); $args = new stdClass();
$args->email_address = $email_address;
if(config('db.master.type') == 'cubrid') $output = executeQuery('member.getMemberInfoByEmailAddress', $args);
{
$args->email_address = strtolower($email_address);
$output = executeQuery('member.getMemberInfoByEmailAddressForCubrid', $args);
}
else
{
$args->email_address = $email_address;
$output = executeQuery('member.getMemberInfoByEmailAddress', $args);
}
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
if(!$output->data) return; if(!$output->data) return;

11
modules/member/queries/getMemberInfoByEmailAddressForCubrid.xml
View file

@ -1,11 +0,0 @@
<query id="getMemberInfoByEmailAddress" action="select">
<tables>
<table name="member" />
</tables>
<columns>
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="lcase(email_address)" var="email_address" notnull="notnull" />
</conditions>
</query>