From 7172ee67248c791a3447161d50b7b5756990cf4f Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Fri, 22 Dec 2023 18:03:01 +0900
Subject: [PATCH] =?UTF-8?q?databaseIdProvider=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/resources/spring/context-datasource.xml | 11 ++++++++++-
 src/test/resources/sql/mapper/base/utility.xml   | 15 +++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/test/resources/spring/context-datasource.xml b/src/test/resources/spring/context-datasource.xml
index 971a5b9..726cf5f 100644
--- a/src/test/resources/spring/context-datasource.xml
+++ b/src/test/resources/spring/context-datasource.xml
@@ -20,11 +20,20 @@
  -->
     </bean>
 	
+	<bean id="databaseIdProvider" class="org.apache.ibatis.mapping.VendorDatabaseIdProvider">
+		<property name="properties">
+			<props>
+				<prop key="Oracle">oracle</prop>
+				<prop key="MariaDB">mariadb</prop>
+			</props>
+		</property>
+	</bean>
+	
 	<bean id="sqlSession" class="org.mybatis.spring.SqlSessionFactoryBean"
 		p:dataSource-ref="dataSource"
 		p:configLocation="classpath:sql/mybatis-config.xml"
 		p:mapperLocations="classpath:sql/mapper/**/*.xml"
-	/>
+		p:databaseIdProvider-ref="databaseIdProvider"/>
 	
  	<bean id="mapperConfigurer" class="org.egovframe.rte.psl.dataaccess.mapper.MapperConfigurer">
 		<property name="basePackage" value="cokr.xit" />
diff --git a/src/test/resources/sql/mapper/base/utility.xml b/src/test/resources/sql/mapper/base/utility.xml
index c927282..7f335db 100644
--- a/src/test/resources/sql/mapper/base/utility.xml
+++ b/src/test/resources/sql/mapper/base/utility.xml
@@ -20,19 +20,14 @@ SELECT FOUND_ROWS() TOT_CNT</select>
 
 <sql id="orderBy"><if test="fetchSize == null or fetchSize &lt; 1"><include refid="utility.sortBy" /></if></sql>
 
-<!-- 마리아 DB -->
-<sql id="now">DATE_FORMAT(CURRENT_TIMESTAMP, '%Y%m%d%H%i%s')</sql>
-
-<sql id="today">DATE_FORMAT(CURRENT_DATE, '%Y%m%d')</sql>
-
-<!-- 오라클
-<sql id="now">TO_CHAR(CURRENT_TIMESTAMP, 'YYYYMMDDHH24MISS')</sql>
-
-<sql id="today">TO_CHAR(CURRENT_DATE, 'YYYYMMDD')</sql>
--->
+<sql id="now"><if test="_databaseId == 'mariadb'">DATE_FORMAT(CURRENT_TIMESTAMP, '%Y%m%d%H%i%s')</if>
+<if test="_databaseId == 'oracle'">TO_CHAR(CURRENT_TIMESTAMP, 'YYYYMMDDHH24MISS')</if></sql>
 
 <sql id="selectNow">SELECT<include refid="utility.now" />NOW FROM DUAL</sql>
 
+<sql id="today"><if test="_databaseId == 'mariadb'">DATE_FORMAT(CURRENT_DATE, '%Y%m%d')</if>
+<if test="_databaseId == 'oracle'">TO_CHAR(CURRENT_DATE, 'YYYYMMDD')</if></sql>
+
 <sql id="selectToday">SELECT<include refid="utility.today" />TODAY FROM DUAL</sql>
 
 <sql id="thisDay">NVL(#{thisDay},<include refid="utility.today" />)</sql>