From 71c8614ca8c2989ba2e735f9ff1d07cabc935dbf Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Fri, 22 Dec 2023 18:06:46 +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/main/resources/sql/mapper/base/utility.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/sql/mapper/base/utility.xml b/src/main/resources/sql/mapper/base/utility.xml
index 5187fae1..ab14fc82 100644
--- a/src/main/resources/sql/mapper/base/utility.xml
+++ b/src/main/resources/sql/mapper/base/utility.xml
@@ -20,13 +20,15 @@ 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="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</sql>
+<sql id="selectNow">SELECT<include refid="utility.now" />NOW FROM DUAL</sql>
 
-<sql id="today">DATE_FORMAT(CURRENT_DATE, '%Y%m%d')</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</sql>
+<sql id="selectToday">SELECT<include refid="utility.today" />TODAY FROM DUAL</sql>
 
 <sql id="thisDay">IFNULL(#{thisDay},<include refid="utility.today" />)</sql>