From 0ec5bc77157c11413489787835ac95b7f765d104 Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Fri, 8 Sep 2023 11:16:51 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20v3.2.700=20Oracle=20Ex?= =?UTF-8?q?ists=20=E5=AD=90=E6=9F=A5=E8=AF=A2=20bug=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FreeSql.Provider.Custom/Oracle/Curd/CustomOracleSelect.cs | 4 ++-- Providers/FreeSql.Provider.Dameng/Curd/DamengSelect.cs | 4 ++-- .../FreeSql.Provider.Odbc/Dameng/Curd/OdbcDamengSelect.cs | 4 ++-- .../FreeSql.Provider.Odbc/Oracle/Curd/OdbcOracleSelect.cs | 4 ++-- Providers/FreeSql.Provider.Oracle/Curd/OracleSelect.cs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Providers/FreeSql.Provider.Custom/Oracle/Curd/CustomOracleSelect.cs b/Providers/FreeSql.Provider.Custom/Oracle/Curd/CustomOracleSelect.cs index ad62bf0d..7a8086e1 100644 --- a/Providers/FreeSql.Provider.Custom/Oracle/Curd/CustomOracleSelect.cs +++ b/Providers/FreeSql.Provider.Custom/Oracle/Curd/CustomOracleSelect.cs @@ -57,8 +57,8 @@ namespace FreeSql.Custom.Oracle if (string.IsNullOrEmpty(tbsfrom[b].NavigateCondition) && string.IsNullOrEmpty(tbsfrom[b].On) && string.IsNullOrEmpty(tbsfrom[b].Cascade) && - string.IsNullOrEmpty(tbsfrom[b].CascadeBefore)) sb.Append(" ON 1 = 1"); - else sb.Append(" ON ").Append(string.Join(" AND ", new[] + string.IsNullOrEmpty(tbsfrom[b].CascadeBefore)) sbunion.Append(" ON 1 = 1"); + else sbunion.Append(" ON ").Append(string.Join(" AND ", new[] { tbsfrom[b].CascadeBefore, tbsfrom[b].NavigateCondition ?? tbsfrom[b].On, diff --git a/Providers/FreeSql.Provider.Dameng/Curd/DamengSelect.cs b/Providers/FreeSql.Provider.Dameng/Curd/DamengSelect.cs index 443400bc..89536822 100644 --- a/Providers/FreeSql.Provider.Dameng/Curd/DamengSelect.cs +++ b/Providers/FreeSql.Provider.Dameng/Curd/DamengSelect.cs @@ -56,8 +56,8 @@ namespace FreeSql.Dameng.Curd if (string.IsNullOrEmpty(tbsfrom[b].NavigateCondition) && string.IsNullOrEmpty(tbsfrom[b].On) && string.IsNullOrEmpty(tbsfrom[b].Cascade) && - string.IsNullOrEmpty(tbsfrom[b].CascadeBefore)) sb.Append(" ON 1 = 1"); - else sb.Append(" ON ").Append(string.Join(" AND ", new[] + string.IsNullOrEmpty(tbsfrom[b].CascadeBefore)) sbunion.Append(" ON 1 = 1"); + else sbunion.Append(" ON ").Append(string.Join(" AND ", new[] { tbsfrom[b].CascadeBefore, tbsfrom[b].NavigateCondition ?? tbsfrom[b].On, diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/Curd/OdbcDamengSelect.cs b/Providers/FreeSql.Provider.Odbc/Dameng/Curd/OdbcDamengSelect.cs index 81d4ab32..1dc9c3a0 100644 --- a/Providers/FreeSql.Provider.Odbc/Dameng/Curd/OdbcDamengSelect.cs +++ b/Providers/FreeSql.Provider.Odbc/Dameng/Curd/OdbcDamengSelect.cs @@ -56,8 +56,8 @@ namespace FreeSql.Odbc.Dameng if (string.IsNullOrEmpty(tbsfrom[b].NavigateCondition) && string.IsNullOrEmpty(tbsfrom[b].On) && string.IsNullOrEmpty(tbsfrom[b].Cascade) && - string.IsNullOrEmpty(tbsfrom[b].CascadeBefore)) sb.Append(" ON 1 = 1"); - else sb.Append(" ON ").Append(string.Join(" AND ", new[] + string.IsNullOrEmpty(tbsfrom[b].CascadeBefore)) sbunion.Append(" ON 1 = 1"); + else sbunion.Append(" ON ").Append(string.Join(" AND ", new[] { tbsfrom[b].CascadeBefore, tbsfrom[b].NavigateCondition ?? tbsfrom[b].On, diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/Curd/OdbcOracleSelect.cs b/Providers/FreeSql.Provider.Odbc/Oracle/Curd/OdbcOracleSelect.cs index f1c46abd..3a876c73 100644 --- a/Providers/FreeSql.Provider.Odbc/Oracle/Curd/OdbcOracleSelect.cs +++ b/Providers/FreeSql.Provider.Odbc/Oracle/Curd/OdbcOracleSelect.cs @@ -56,8 +56,8 @@ namespace FreeSql.Odbc.Oracle if (string.IsNullOrEmpty(tbsfrom[b].NavigateCondition) && string.IsNullOrEmpty(tbsfrom[b].On) && string.IsNullOrEmpty(tbsfrom[b].Cascade) && - string.IsNullOrEmpty(tbsfrom[b].CascadeBefore)) sb.Append(" ON 1 = 1"); - else sb.Append(" ON ").Append(string.Join(" AND ", new[] + string.IsNullOrEmpty(tbsfrom[b].CascadeBefore)) sbunion.Append(" ON 1 = 1"); + else sbunion.Append(" ON ").Append(string.Join(" AND ", new[] { tbsfrom[b].CascadeBefore, tbsfrom[b].NavigateCondition ?? tbsfrom[b].On, diff --git a/Providers/FreeSql.Provider.Oracle/Curd/OracleSelect.cs b/Providers/FreeSql.Provider.Oracle/Curd/OracleSelect.cs index dc3eea2a..c1de966a 100644 --- a/Providers/FreeSql.Provider.Oracle/Curd/OracleSelect.cs +++ b/Providers/FreeSql.Provider.Oracle/Curd/OracleSelect.cs @@ -57,8 +57,8 @@ namespace FreeSql.Oracle.Curd if (string.IsNullOrEmpty(tbsfrom[b].NavigateCondition) && string.IsNullOrEmpty(tbsfrom[b].On) && string.IsNullOrEmpty(tbsfrom[b].Cascade) && - string.IsNullOrEmpty(tbsfrom[b].CascadeBefore)) sb.Append(" ON 1 = 1"); - else sb.Append(" ON ").Append(string.Join(" AND ", new[] + string.IsNullOrEmpty(tbsfrom[b].CascadeBefore)) sbunion.Append(" ON 1 = 1"); + else sbunion.Append(" ON ").Append(string.Join(" AND ", new[] { tbsfrom[b].CascadeBefore, tbsfrom[b].NavigateCondition ?? tbsfrom[b].On,