From 7b9358a4f0f95431e9012b6d9a4330fc17e73dc7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 06 六月 2024 11:13:47 +0800
Subject: [PATCH] ♥️发布 5.2.0-BETA2 公测版本
---
ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index 3c49edb..123d51a 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -2,15 +2,15 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.generator.mapper.GenTableColumnMapper">
+<mapper namespace="org.dromara.generator.mapper.GenTableColumnMapper">
- <resultMap type="com.ruoyi.generator.domain.GenTableColumn" id="GenTableColumnResult">
+ <resultMap type="org.dromara.generator.domain.GenTableColumn" id="GenTableColumnResult">
</resultMap>
<select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
- <if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isMySql()">
+ <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isMySql()">
select column_name,
- (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required,
+ (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else '0' end) as is_required,
(case when column_key = 'PRI' then '1' else '0' end) as is_pk,
ordinal_position as sort,
column_comment,
@@ -19,9 +19,9 @@
from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
order by ordinal_position
</if>
- <if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isOracle()">
+ <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isOracle()">
select lower(temp.column_name) as column_name,
- (case when (temp.nullable = 'N' and temp.constraint_type != 'P') then '1' else null end) as is_required,
+ (case when (temp.nullable = 'N' and temp.constraint_type != 'P') then '1' else '0' end) as is_required,
(case when temp.constraint_type = 'P' then '1' else '0' end) as is_pk,
temp.column_id as sort,
temp.comments as column_comment,
@@ -39,7 +39,7 @@
WHERE temp.row_flg = 1
ORDER BY temp.column_id
</if>
- <if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isPostgerSql()">
+ <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isPostgerSql()">
SELECT column_name, is_required, is_pk, sort, column_comment, is_increment, column_type
FROM (
SELECT c.relname AS table_name,
@@ -71,8 +71,9 @@
ORDER BY c.relname, a.attnum
) temp
WHERE table_name = (#{tableName})
+ AND column_type <![CDATA[ <> ]]> '-'
</if>
- <if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isSqlServer()">
+ <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isSqlServer()">
SELECT
cast(A.NAME as nvarchar) as column_name,
cast(B.NAME as nvarchar) + (case when B.NAME = 'numeric' then '(' + cast(A.prec as nvarchar) + ',' + cast(A.scale as nvarchar) + ')' else '' end) as column_type,
--
Gitblit v1.9.3