From 8bcc368f3a4db447f0268f458b8a0ca1792a738e Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 28 Jul 2019 00:00:33 +0900
Subject: [PATCH 1/2] Delete unnecessary query for Cubrid

---
 modules/member/member.model.php                    | 14 ++------------
 .../getMemberInfoByEmailAddressForCubrid.xml       | 11 -----------
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 modules/member/queries/getMemberInfoByEmailAddressForCubrid.xml

diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 7b3f5900d..39e7fa6d9 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -289,18 +289,8 @@ class memberModel extends member
 		if(!$email_address) return;
 
 		$args = new stdClass();
-		
-		if(config('db.master.type') == 'cubrid')
-		{
-			$args->email_address = strtolower($email_address);
-			$output = executeQuery('member.getMemberInfoByEmailAddressForCubrid', $args);
-		}
-		else
-		{
-			$args->email_address = $email_address;
-			$output = executeQuery('member.getMemberInfoByEmailAddress', $args);
-		}
-		
+		$args->email_address = $email_address;
+		$output = executeQuery('member.getMemberInfoByEmailAddress', $args);
 		if(!$output->toBool()) return $output;
 		if(!$output->data) return;
 
diff --git a/modules/member/queries/getMemberInfoByEmailAddressForCubrid.xml b/modules/member/queries/getMemberInfoByEmailAddressForCubrid.xml
deleted file mode 100644
index 0cd753a7a..000000000
--- a/modules/member/queries/getMemberInfoByEmailAddressForCubrid.xml
+++ /dev/null
@@ -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>

From c5628ee893d9f6af26bc53d88aa17dc36326d431 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 28 Jul 2019 00:00:54 +0900
Subject: [PATCH 2/2] Fix inconsistent variable name $after_column

---
 classes/db/DBMysql.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index ac6a978a6..3e8413d87 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -467,7 +467,7 @@ class DBMySQL extends DB
 	 * @param boolean $notnull not null status, default value is false
 	 * @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 = isset($this->column_type[$type]) ? $this->column_type[$type] : $type;