From 0873b371a1ff4cf96bee475cc0381f591fe634d4 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 31 Jan 2021 16:27:37 +0900
Subject: [PATCH] Change some other instances of problematic GROUP BY into
 SELECT DISTINCT

---
 modules/comment/queries/getDeclaredLatest.xml |  5 +---
 .../document/queries/getDeclaredLatest.xml    |  5 +---
 .../queries/getDocumentListWithinComment.xml  |  5 +---
 .../getDocumentListWithinExtraVars.xml        |  5 +---
 ...etDocumentListWithinExtraVarsExtraSort.xml |  5 +---
 .../queries/getDocumentListWithinTag.xml      |  5 +---
 modules/member/queries/getMemberList.xml      |  8 +++----
 .../queries/getMemberListWithinGroup.xml      | 24 ++++++-------------
 8 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/modules/comment/queries/getDeclaredLatest.xml b/modules/comment/queries/getDeclaredLatest.xml
index 5d12df41b..99e4334d2 100644
--- a/modules/comment/queries/getDeclaredLatest.xml
+++ b/modules/comment/queries/getDeclaredLatest.xml
@@ -4,7 +4,7 @@
 		<table name="comment_declared" />
         <table name="comment_declared_log" />
     </tables>
-    <columns>
+    <columns distinct="distinct">
         <column name="comment_declared_log.comment_srl" />
 		<column name="count(*)" alias="declared_count" />
 		<column name="max(comment_declared_log.regdate)" alias="latest_declared" />
@@ -15,9 +15,6 @@
 		<condition operation="more" column="comment_declared.declared_count" default="1" pipe="and" />
         <condition operation="in" column="comment_declared_log.comment_srl" var="comment_srls" pipe="and" />
     </conditions>
-    <groups>
-        <group column="comment_declared_log.comment_srl" />
-    </groups>
     <navigation>
         <index var="sort_index" default="latest_declared" order="order_type" />
         <list_count var="list_count" default="20" />
diff --git a/modules/document/queries/getDeclaredLatest.xml b/modules/document/queries/getDeclaredLatest.xml
index 0b5d84b65..bf13c44bc 100644
--- a/modules/document/queries/getDeclaredLatest.xml
+++ b/modules/document/queries/getDeclaredLatest.xml
@@ -4,7 +4,7 @@
 		<table name="document_declared" />
         <table name="document_declared_log" />
     </tables>
-    <columns>
+    <columns distinct="distinct">
         <column name="document_declared_log.document_srl" />
 		<column name="count(*)" alias="declared_count" />
 		<column name="max(document_declared_log.regdate)" alias="latest_declared" />
@@ -15,9 +15,6 @@
 		<condition operation="more" column="document_declared.declared_count" default="1" pipe="and" />
         <condition operation="in" column="document_declared_log.document_srl" var="document_srls" pipe="and" />
     </conditions>
-    <groups>
-        <group column="document_declared_log.document_srl" />
-    </groups>
     <navigation>
         <index var="sort_index" default="latest_declared" order="order_type" />
         <list_count var="list_count" default="20" />
diff --git a/modules/document/queries/getDocumentListWithinComment.xml b/modules/document/queries/getDocumentListWithinComment.xml
index cfb1f7511..06cc7d117 100644
--- a/modules/document/queries/getDocumentListWithinComment.xml
+++ b/modules/document/queries/getDocumentListWithinComment.xml
@@ -3,7 +3,7 @@
 		<table name="documents" />
 		<table name="comments" />
 	</tables>
-	<columns>
+	<columns distinct="distinct">
 		<column name="documents.*" />
 	</columns>
 	<conditions>
@@ -23,9 +23,6 @@
 		<condition operation="more" column="documents.regdate" var="start_regdate" pipe="and" />
 		<condition operation="less" column="documents.regdate" var="end_regdate" pipe="and" />
 	</conditions>
-	<groups>
-		<group column="documents.document_srl" />
-	</groups>
 	<navigation>
 		<index var="sort_index" default="documents.list_order" order="order_type" />
 		<list_count var="list_count" default="20" />
diff --git a/modules/document/queries/getDocumentListWithinExtraVars.xml b/modules/document/queries/getDocumentListWithinExtraVars.xml
index df3fb089b..3e1403a9c 100644
--- a/modules/document/queries/getDocumentListWithinExtraVars.xml
+++ b/modules/document/queries/getDocumentListWithinExtraVars.xml
@@ -3,7 +3,7 @@
 		<table name="documents" />
 		<table name="document_extra_vars" alias="extra_vars" />
 	</tables>
-	<columns>
+	<columns distinct="distinct">
 		<column name="documents.*" />
 	</columns>
 	<conditions>
@@ -16,9 +16,6 @@
 		<condition operation="in" column="documents.status" var="statusList" pipe="and" />
 		<condition operation="like" column="extra_vars.value" var="var_value" notnull="notnull" pipe="and" />
 	</conditions>
-	<groups>
-		<group column="extra_vars.document_srl" />
-	</groups>
 	<navigation>
 		<index var="sort_index" default="documents.list_order" order="order_type" />
 		<list_count var="list_count" default="20" />
diff --git a/modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml b/modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml
index 650d229fa..e25c041a9 100644
--- a/modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml
+++ b/modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml
@@ -4,7 +4,7 @@
     <table name="document_extra_vars" alias="ev" />
     <table name="document_extra_vars" alias="es" />
   </tables>
-  <columns>
+  <columns distinct="distinct">
     <column name="d.*" />
   </columns>
   <index_hint name="idx_document_list_order" type="use" />
@@ -54,9 +54,6 @@
 			<condition operation="equal" column="es.document_srl" default="d.document_srl" pipe="and" />
 		</group>
   </conditions>
-    <groups>
-        <group column="d.document_srl" />
-    </groups>
   <navigation>
     <index var="ev.value" default="ev.value" order="order_type" />
     <list_count var="list_count" default="20" />
diff --git a/modules/document/queries/getDocumentListWithinTag.xml b/modules/document/queries/getDocumentListWithinTag.xml
index 8f5cefd24..7ac28474a 100644
--- a/modules/document/queries/getDocumentListWithinTag.xml
+++ b/modules/document/queries/getDocumentListWithinTag.xml
@@ -3,7 +3,7 @@
 		<table name="documents" />
 		<table name="tags" />
 	</tables>
-	<columns>
+	<columns distinct="distinct">
 		<column name="documents.*" />
 	</columns>
 	<conditions>
@@ -22,9 +22,6 @@
 		<condition operation="more" column="documents.regdate" var="start_regdate" pipe="and" />
 		<condition operation="less" column="documents.regdate" var="end_regdate" pipe="and" />
 	</conditions>
-	<groups>
-		<group column="documents.document_srl" />
-	</groups>
 	<navigation>
 		<index var="sort_index" default="documents.list_order" order="order_type" />
 		<list_count var="list_count" default="20" />
diff --git a/modules/member/queries/getMemberList.xml b/modules/member/queries/getMemberList.xml
index aacca521d..196b18416 100644
--- a/modules/member/queries/getMemberList.xml
+++ b/modules/member/queries/getMemberList.xml
@@ -22,10 +22,10 @@
 			<condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
             <condition operation="like_prefix" column="last_login" var="s_last_login" pipe="or" />
 			<condition operation="like_prefix" column="last_login_ipaddress" var="s_last_login_ipaddress" pipe="or" />
-            <condition operation="more" column="member.regdate" var="s_regdate_more" pipe="or" />
-            <condition operation="less" column="member.regdate" var="s_regdate_less" pipe="or" />
-            <condition operation="more" column="member.last_login" var="s_last_login_more" pipe="or" />
-            <condition operation="less" column="member.last_login" var="s_last_login_less" pipe="or" />
+            <condition operation="more" column="regdate" var="s_regdate_more" pipe="or" />
+            <condition operation="less" column="regdate" var="s_regdate_less" pipe="or" />
+            <condition operation="more" column="last_login" var="s_last_login_more" pipe="or" />
+            <condition operation="less" column="last_login" var="s_last_login_less" pipe="or" />
         </group>
     </conditions>
     <navigation>
diff --git a/modules/member/queries/getMemberListWithinGroup.xml b/modules/member/queries/getMemberListWithinGroup.xml
index 0077d4e7e..f2efa0da6 100644
--- a/modules/member/queries/getMemberListWithinGroup.xml
+++ b/modules/member/queries/getMemberListWithinGroup.xml
@@ -1,27 +1,17 @@
 <query id="getMemberListWithinGroup" action="select">
 	<tables>
 		<table name="member" />
+		<table name="member_group_member" alias="mgm" />
 	</tables>
-	<columns>
+	<columns distinct="distinct">
 		<column name="member.*" />
 	</columns>
 	<conditions>
-		<query operation="in" column="member.member_srl" alias="mgm">
-			<tables>
-				<table name="member_group_member" />
-			</tables>
-			<columns>
-				<column name="member_group_member.member_srl" />
-			</columns>
-			<conditions>
-				<condition operation="in" column="member_group_member.group_srl" var="selected_group_srl" notnull="notnull" />
-			</conditions>
-		</query>
-		<group pipe="and">
-			<condition operation="equal" column="member.is_admin" var="is_admin" />
-			<condition operation="equal" column="member.denied" var="is_denied" pipe="and" />
-			<condition operation="in" column="member.member_srl" var="member_srls" pipe="and" />
-		</group>
+		<condition operation="equal" column="member.member_srl" var="mgm.member_srl" notnull="notnull" />
+		<condition operation="in" column="mgm.group_srl" var="selected_group_srl" notnull="notnull" />
+		<condition operation="equal" column="member.is_admin" var="is_admin" />
+		<condition operation="equal" column="member.denied" var="is_denied" pipe="and" />
+		<condition operation="in" column="member.member_srl" var="member_srls" pipe="and" />
 		<group pipe="and">
 			<condition operation="like" column="member.user_id" var="s_user_id" />
 			<condition operation="like" column="member.user_name" var="s_user_name" pipe="or" />