From d3a5fc12963c3d44bcd9da8e95603915a9f617ac Mon Sep 17 00:00:00 2001 From: zhouyx <41593435@qq.com> Date: Thu, 13 Oct 2022 19:47:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?oksql=E6=9B=B4=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs index a0d59ec0a..b42514a56 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs @@ -13,7 +13,7 @@ namespace SqlSugar { get { - return "SELECT datname FROM sys_database"; + return "SELECT datname FROM sys_database "; } } protected override string GetColumnInfosByTableNameSql From 0fff3a9c8dd505b2c2dac042b1418b8c09eb91c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E8=BF=9C?= Date: Fri, 14 Oct 2022 16:26:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=A5=9E=E9=80=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=20=E8=A1=A8=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=A1=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=AD=A3=E5=92=8C=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Oscar/DbMaintenance/OscarDbMaintenance.cs | 58 +++++++++---------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs index b42514a56..caac239d5 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs @@ -20,18 +20,27 @@ namespace SqlSugar { get { - string sql = @"SELECT -COLUMN_NAME AS DbColumnName, -TABLE_NAME AS TableName, -DATA_TYPE AS DataType, - case when DATA_DEFAULT like 'NEXTVAL%' - then true else false end as IsIdentity, - case when NULLABLE = 'Y' - then true else false end as IsNullable -FROM -INFO_SCHEM.ALL_TAB_COLUMNS WHERE upper(TABLE_NAME)=upper('{0}') - -"; + string sql = @" SELECT + A.COLUMN_NAME AS DbColumnName, + A.TABLE_NAME AS TableName, + A.DATA_TYPE AS DataType, + C.ATTISAUTO as IsIdentity, + case when A.NULLABLE = 'Y' then true else false end as IsNullable , + A.DATA_LENGTH AS LENGTH, + B.COMMENTS AS ColumnDescription, + CASE WHEN K.COLUMN_NAME IS NULL THEN FALSE ELSE TRUE END AS IsPrimarykey, + DATA_SCALE AS DecimalDigits, + A.DATA_PRECISION AS SCALE, + A.DATA_DEFAULT as DefaultValue + FROM + INFO_SCHEM.ALL_TAB_COLUMNS A + LEFT JOIN INFO_SCHEM.SYS_CLASS T ON T.RELNAME=A.TABLE_NAME + LEFT JOIN INFO_SCHEM.ALL_COL_COMMENTS B ON A.TABLE_NAME=B.TABLE_NAME AND A.COLUMN_NAME=B.COLUMN_NAME + LEFT JOIN INFO_SCHEM.SYS_ATTRIBUTE C ON C.ATTNAME=A.COLUMN_NAME AND C.ATTRELID=T.OID + LEFT JOIN INFO_SCHEM.V_SYS_PRIMARY_KEYS K ON A.TABLE_NAME=K.TABLE_NAME AND K.COLUMN_NAME=A.COLUMN_NAME + WHERE upper(A.TABLE_NAME)=upper('{0}') + ORDER BY c.ATTNUM + "; return sql; } } @@ -39,15 +48,9 @@ INFO_SCHEM.ALL_TAB_COLUMNS WHERE upper(TABLE_NAME)=upper('{0}') { get { - return @"select cast(relname as varchar(500)) as Name , - '' AS Description - from sys_class c - where relkind = 'r' - and relname not like 'SYS_%' - and relname not like 'V_SYS_%' - and relname not like 'sql_%' - and relname not like 'AQ$%' - AND relname NOT IN('LOGIN_FORBIDDEN_RULE','DBMS_LOCK_ALLOCATED','DUAL'，'_OBJ_BINLOG_SHOW_EVENTS_','USER_LOGIN_HISTORY','LOGIN_ALLOW_IPLIST') + return @" select cast(relname as varchar(500)) as Name , DESCRIPTION AS Description FROM sys_class t + LEFT JOIN sys_description d ON t.OID=d.OBJOID AND d.OBJSUBID=0 + WHERE t.relvbase>0 AND t.relkind = 'r' order by relname"; } } @@ -55,16 +58,9 @@ INFO_SCHEM.ALL_TAB_COLUMNS WHERE upper(TABLE_NAME)=upper('{0}') { get { - return @"select cast(relname as varchar(500)) as Name , - '' AS DESCRIPTION - from sys_class c - where relkind = 'v' - and relname not like 'SYS_%' - and relname not like 'V_SYS_%' - and relname not like 'sql_%' - and relname not like 'AQ$%' - AND relvbase=1 - AND relname NOT IN('LOGIN_FORBIDDEN_RULE','DBMS_LOCK_ALLOCATED','DUAL'，'_OBJ_BINLOG_SHOW_EVENTS_','USER_LOGIN_HISTORY','LOGIN_ALLOW_IPLIST') + return @" select cast(relname as varchar(500)) as Name , DESCRIPTION AS Description FROM sys_class t + LEFT JOIN sys_description d ON t.OID=d.OBJOID AND d.OBJSUBID=0 + WHERE t.relvbase>0 AND t.relkind = 'v' order by relname"; } } From 0f7bc98f45993529592e7fbb506deca8c1495528 Mon Sep 17 00:00:00 2001 From: zhouyx <41593435@qq.com> Date: Sun, 16 Oct 2022 10:18:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=87=AA=E5=A2=9E=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs index caac239d5..648c307ae 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs @@ -24,7 +24,7 @@ namespace SqlSugar A.COLUMN_NAME AS DbColumnName, A.TABLE_NAME AS TableName, A.DATA_TYPE AS DataType, - C.ATTISAUTO as IsIdentity, + case when DATA_DEFAULT like 'NEXTVAL%' then true else false end as IsIdentity, case when A.NULLABLE = 'Y' then true else false end as IsNullable , A.DATA_LENGTH AS LENGTH, B.COMMENTS AS ColumnDescription, From b1e9a388f6a23d06ad09978c1b491f55d16548b3 Mon Sep 17 00:00:00 2001 From: zhouyx <41593435@qq.com> Date: Sun, 16 Oct 2022 11:49:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=87=AA=E5=A2=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs index 648c307ae..c6daa96c7 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs @@ -48,9 +48,10 @@ namespace SqlSugar { get { + //AND t.relnamespace=1 表空间限制。 return @" select cast(relname as varchar(500)) as Name , DESCRIPTION AS Description FROM sys_class t LEFT JOIN sys_description d ON t.OID=d.OBJOID AND d.OBJSUBID=0 - WHERE t.relvbase>0 AND t.relkind = 'r' + WHERE t.relvbase>0 AND t.relkind = 'r' order by relname"; } } From 42e736b87466bc0f552e00812a73cde4d97d6210 Mon Sep 17 00:00:00 2001 From: zhouyx <41593435@qq.com> Date: Sun, 16 Oct 2022 12:05:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=A5=9E=E9=80=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E8=AF=BB=E5=8F=96=E8=A1=A8=E5=92=8C=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E9=99=90=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E8=AF=BB=E5=8F=96=E6=9C=AC=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84=E8=A1=A8=E5=92=8C=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs index c6daa96c7..596c70df2 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Oscar/DbMaintenance/OscarDbMaintenance.cs @@ -51,7 +51,7 @@ namespace SqlSugar //AND t.relnamespace=1 表空间限制。 return @" select cast(relname as varchar(500)) as Name , DESCRIPTION AS Description FROM sys_class t LEFT JOIN sys_description d ON t.OID=d.OBJOID AND d.OBJSUBID=0 - WHERE t.relvbase>0 AND t.relkind = 'r' + WHERE t.relvbase>0 AND t.relkind = 'r' AND t.relnamespace=(SELECT OID FROM sys_namespace WHERE nspname =USER) order by relname"; } } @@ -61,7 +61,7 @@ namespace SqlSugar { return @" select cast(relname as varchar(500)) as Name , DESCRIPTION AS Description FROM sys_class t LEFT JOIN sys_description d ON t.OID=d.OBJOID AND d.OBJSUBID=0 - WHERE t.relvbase>0 AND t.relkind = 'v' + WHERE t.relvbase>0 AND t.relkind = 'v' AND t.relnamespace=(SELECT OID FROM sys_namespace WHERE nspname =USER) order by relname"; } }