From 9bf0b0e488c246fff54123d5c36e9baf3bdebead Mon Sep 17 00:00:00 2001 From: sunkaixuna <610262374@qq.com> Date: Sun, 5 Sep 2021 01:49:39 +0800 Subject: [PATCH] Update IsComplexModel --- .../SqlSugar/Realization/Dm/SqlBuilder/DmQueryBuilder.cs | 2 +- .../SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs | 2 +- .../Realization/Oracle/SqlBuilder/OracleQueryBuilder.cs | 2 +- .../Realization/PostgreSQL/SqlBuilder/PostgreSQLQueryBuilder.cs | 2 +- .../Realization/Sqlite/SqlBuilder/SqliteQueryBuilder.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Realization/Dm/SqlBuilder/DmQueryBuilder.cs b/Src/Asp.Net/SqlSugar/Realization/Dm/SqlBuilder/DmQueryBuilder.cs index 38868e522..dfc97ac19 100644 --- a/Src/Asp.Net/SqlSugar/Realization/Dm/SqlBuilder/DmQueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Realization/Dm/SqlBuilder/DmQueryBuilder.cs @@ -8,7 +8,7 @@ namespace SqlSugar { public override bool IsComplexModel(string sql) { - return Regex.IsMatch(sql, @"AS ""\w+\.\w+"""); + return Regex.IsMatch(sql, @"AS ""\w+\.\w+""")|| Regex.IsMatch(sql, @"AS ""\w+\.\w+\.\w+"""); } public override string SqlTemplate { diff --git a/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs b/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs index 179050eeb..53a7532ca 100644 --- a/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs @@ -31,7 +31,7 @@ namespace SqlSugar #region Common Methods public override bool IsComplexModel(string sql) { - return Regex.IsMatch(sql, @"AS \`\w+\.\w+\`"); + return Regex.IsMatch(sql, @"AS \`\w+\.\w+\`")|| Regex.IsMatch(sql, @"AS \`\w+\.\w+\.\w+\`"); } public override string ToSqlString() { diff --git a/Src/Asp.Net/SqlSugar/Realization/Oracle/SqlBuilder/OracleQueryBuilder.cs b/Src/Asp.Net/SqlSugar/Realization/Oracle/SqlBuilder/OracleQueryBuilder.cs index 89d2e5261..8da10b392 100644 --- a/Src/Asp.Net/SqlSugar/Realization/Oracle/SqlBuilder/OracleQueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Realization/Oracle/SqlBuilder/OracleQueryBuilder.cs @@ -11,7 +11,7 @@ namespace SqlSugar { public override bool IsComplexModel(string sql) { - return Regex.IsMatch(sql, @"AS ""\w+\.\w+"""); + return Regex.IsMatch(sql, @"AS ""\w+\.\w+""")|| Regex.IsMatch(sql, @"AS ""\w+\.\w+\.\w+"""); } public override string SqlTemplate { diff --git a/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLQueryBuilder.cs b/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLQueryBuilder.cs index 51e1cad28..8c6239f57 100644 --- a/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLQueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLQueryBuilder.cs @@ -31,7 +31,7 @@ namespace SqlSugar #region Common Methods public override bool IsComplexModel(string sql) { - return Regex.IsMatch(sql, @"AS ""\w+\.\w+"""); + return Regex.IsMatch(sql, @"AS ""\w+\.\w+""")|| Regex.IsMatch(sql, @"AS ""\w+\.\w+\.\w+"""); } public override string ToSqlString() { diff --git a/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteQueryBuilder.cs b/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteQueryBuilder.cs index 1133f74b3..29a466764 100644 --- a/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteQueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteQueryBuilder.cs @@ -31,7 +31,7 @@ namespace SqlSugar #region Common Methods public override bool IsComplexModel(string sql) { - return Regex.IsMatch(sql, @"AS \`\w+\.\w+\`"); + return Regex.IsMatch(sql, @"AS \`\w+\.\w+\`")|| Regex.IsMatch(sql, @"AS \`\w+\.\w+\.\w+\`"); } public override string ToSqlString() {