From a41da0dc950851c7ed2edd486b6c3bddbeaf7f6e Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Tue, 30 Jun 2020 11:29:00 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20dm7=20dbfirst=20SQL=20?=
=?UTF-8?q?=E4=B8=AD=E5=AD=98=E5=9C=A8=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FreeSql.DbContext/FreeSql.DbContext.xml | 9 ---------
.../FreeSql.Provider.Dameng/DamengCodeFirst.cs | 2 +-
.../FreeSql.Provider.Dameng/DamengDbFirst.cs | 18 +++++++++---------
.../Dameng/OdbcDamengDbFirst.cs | 18 +++++++++---------
4 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
index 4854f49c..474ea8d5 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.xml
+++ b/FreeSql.DbContext/FreeSql.DbContext.xml
@@ -486,14 +486,5 @@
-
-
- 批量注入 Repository,可以参考代码自行调整
-
-
-
-
-
-
diff --git a/Providers/FreeSql.Provider.Dameng/DamengCodeFirst.cs b/Providers/FreeSql.Provider.Dameng/DamengCodeFirst.cs
index 09cb67f1..61e0573b 100644
--- a/Providers/FreeSql.Provider.Dameng/DamengCodeFirst.cs
+++ b/Providers/FreeSql.Provider.Dameng/DamengCodeFirst.cs
@@ -272,7 +272,7 @@ a.index_name,
case when c.descend = 'DESC' then 1 else 0 end,
case when a.uniqueness = 'UNIQUE' then 1 else 0 end
from all_indexes a,
-all_ind_columns c
+all_ind_columns c
where a.index_name = c.index_name
and a.table_owner = c.table_owner
and a.table_name = c.table_name
diff --git a/Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs b/Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs
index fc926d72..49c7ddfb 100644
--- a/Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs
+++ b/Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs
@@ -459,15 +459,15 @@ all_constraints b,
all_cons_columns c, --外键表
all_cons_columns d --主键表
where
-a.r_constraint_name = b.constraint_name
-and a.constraint_type = 'R'
-and b.constraint_type = 'P'
-and a.r_owner = b.owner
-and a.constraint_name = c.constraint_name
-and b.constraint_name = d.constraint_name
-and a.owner = c.owner
-and a.table_name = c.table_name
-and b.owner = d.owner
+a.r_constraint_name = b.constraint_name
+and a.constraint_type = 'R'
+and b.constraint_type = 'P'
+and a.r_owner = b.owner
+and a.constraint_name = c.constraint_name
+and b.constraint_name = d.constraint_name
+and a.owner = c.owner
+and a.table_name = c.table_name
+and b.owner = d.owner
and b.table_name = d.table_name
and a.owner in ({1}) and {0}
", loc8, databaseIn);
diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengDbFirst.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengDbFirst.cs
index eb2e1ddc..e941e104 100644
--- a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengDbFirst.cs
+++ b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengDbFirst.cs
@@ -459,15 +459,15 @@ all_constraints b,
all_cons_columns c, --外键表
all_cons_columns d --主键表
where
-a.r_constraint_name = b.constraint_name
-and a.constraint_type = 'R'
-and b.constraint_type = 'P'
-and a.r_owner = b.owner
-and a.constraint_name = c.constraint_name
-and b.constraint_name = d.constraint_name
-and a.owner = c.owner
-and a.table_name = c.table_name
-and b.owner = d.owner
+a.r_constraint_name = b.constraint_name
+and a.constraint_type = 'R'
+and b.constraint_type = 'P'
+and a.r_owner = b.owner
+and a.constraint_name = c.constraint_name
+and b.constraint_name = d.constraint_name
+and a.owner = c.owner
+and a.table_name = c.table_name
+and b.owner = d.owner
and b.table_name = d.table_name
and a.owner in ({1}) and {0}
", loc8, databaseIn);