From f3215b84f0ef50e03ae5ea5d832e5dc30f2bd90e Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Wed, 13 Dec 2023 16:08:58 +0900
Subject: [PATCH] =?UTF-8?q?IFNULL=20->=20NVL,=20=EC=B6=94=EA=B0=80:=20now,?=
 =?UTF-8?q?=20today=20=EC=98=A4=EB=9D=BC=ED=81=B4=20=EB=B2=84=EC=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/sql/mapper/base/utility.xml     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/test/resources/sql/mapper/base/utility.xml b/src/test/resources/sql/mapper/base/utility.xml
index 5187fae..c927282 100644
--- a/src/test/resources/sql/mapper/base/utility.xml
+++ b/src/test/resources/sql/mapper/base/utility.xml
@@ -20,16 +20,23 @@ SELECT FOUND_ROWS() TOT_CNT</select>
 
 <sql id="orderBy"><if test="fetchSize == null or fetchSize &lt; 1"><include refid="utility.sortBy" /></if></sql>
 
-<sql id="now">DATE_FORMAT(CURRENT_TIMESTAMP(), '%Y%m%d%H%i%s')</sql>
-
-<sql id="selectNow">SELECT<include refid="utility.now" />NOW</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="selectToday">SELECT<include refid="utility.today" />TODAY</sql>
+<!-- 오라클
+<sql id="now">TO_CHAR(CURRENT_TIMESTAMP, 'YYYYMMDDHH24MISS')</sql>
+
+<sql id="today">TO_CHAR(CURRENT_DATE, 'YYYYMMDD')</sql>
+-->
+
+<sql id="selectNow">SELECT<include refid="utility.now" />NOW FROM DUAL</sql>
+
+<sql id="selectToday">SELECT<include refid="utility.today" />TODAY FROM DUAL</sql>
 
-<sql id="thisDay">IFNULL(#{thisDay},<include refid="utility.today" />)</sql>
+<sql id="thisDay">NVL(#{thisDay},<include refid="utility.today" />)</sql>
 
-<sql id="selectThisDay">SELECT<include refid="utility.thisDay" />THIS_DAY</sql>
+<sql id="selectThisDay">SELECT<include refid="utility.thisDay" />THIS_DAY FROM DUAL</sql>
 
 </mapper>
\ No newline at end of file