From 69efc3261e6f6e4dca268fb2de9866d8f2a14952 Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期一, 21 四月 2025 09:44:09 +0800
Subject: [PATCH] Merge branch 'dev'
---
ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index a0a7695..6c994d8 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -15,7 +15,7 @@
</resultMap>
<select id="selectPageDbTableList" resultMap="GenTableResult">
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isMySql()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isMySql()">
select table_name, table_comment, create_time, update_time
from information_schema.tables
where table_schema = (select database())
@@ -29,7 +29,7 @@
</if>
order by create_time desc
</if>
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isOracle()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isOracle()">
select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
from user_tables dt, user_tab_comments dtc, user_objects uo
where dt.table_name = dtc.table_name
@@ -45,7 +45,7 @@
</if>
order by create_time desc
</if>
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isPostgerSql()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isPostgerSql()">
select table_name, table_comment, create_time, update_time
from (
SELECT c.relname AS table_name,
@@ -69,7 +69,7 @@
</if>
order by create_time desc
</if>
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isSqlServer()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isSqlServer()">
SELECT cast(D.NAME as nvarchar) as table_name,
cast(F.VALUE as nvarchar) as table_comment,
crdate as create_time,
@@ -90,7 +90,7 @@
</select>
<select id="selectDbTableListByNames" resultMap="GenTableResult">
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isMySql()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isMySql()">
select table_name, table_comment, create_time, update_time from information_schema.tables
where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
and table_name in
@@ -98,7 +98,7 @@
#{name}
</foreach>
</if>
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isOracle()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isOracle()">
select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
from user_tables dt, user_tab_comments dtc, user_objects uo
where dt.table_name = dtc.table_name
@@ -111,7 +111,7 @@
#{name}
</foreach>
</if>
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isPostgerSql()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isPostgerSql()">
select table_name, table_comment, create_time, update_time
from (
SELECT c.relname AS table_name,
@@ -131,7 +131,7 @@
#{name}
</foreach>
</if>
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isSqlServer()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isSqlServer()">
SELECT cast(D.NAME as nvarchar) as table_name,
cast(F.VALUE as nvarchar) as table_comment,
crdate as create_time,
@@ -148,12 +148,12 @@
</select>
<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isMySql()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isMySql()">
select table_name, table_comment, create_time, update_time from information_schema.tables
where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
and table_name = #{tableName}
</if>
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isOracle()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isOracle()">
select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
from user_tables dt, user_tab_comments dtc, user_objects uo
where dt.table_name = dtc.table_name
@@ -163,7 +163,7 @@
AND dt.table_name NOT IN (select table_name from gen_table)
and lower(dt.table_name) = #{tableName}
</if>
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isPostgerSql()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isPostgerSql()">
select table_name, table_comment, create_time, update_time
from (
SELECT c.relname AS table_name,
@@ -180,7 +180,7 @@
where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%'
and table_name = #{tableName}
</if>
- <if test="@org.ruoyi.common.mybatis.helper.DataBaseHelper@isSqlServer()">
+ <if test="@org.ruoyi.helper.DataBaseHelper@isSqlServer()">
SELECT cast(D.NAME as nvarchar) as table_name,
cast(F.VALUE as nvarchar) as table_comment,
crdate as create_time,
--
Gitblit v1.9.3