From 189d44ca1723890ae8ebe22aef91061d0ce9d87f Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Sat, 5 Aug 2017 13:15:59 +0800 Subject: [PATCH] - --- Src/Asp.Net/SqlServerTest/UnitTest/Mapping .cs | 2 +- Src/Asp.Net/SqlServerTest/UnitTest/Query/JoinQuery.cs | 10 +++++----- .../SqlServerTest/UnitTest/Query/SelectQuery.cs | 6 +++--- .../Abstract/SqlBuilderProvider/QueryBuilder.cs | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/Mapping .cs b/Src/Asp.Net/SqlServerTest/UnitTest/Mapping .cs index 07730ab94..f1ef5314c 100644 --- a/Src/Asp.Net/SqlServerTest/UnitTest/Mapping .cs +++ b/Src/Asp.Net/SqlServerTest/UnitTest/Mapping .cs @@ -33,7 +33,7 @@ namespace OrmTest.UnitTest .GroupBy(st => st.Id) .GroupBy((st, sc) => sc.Id).OrderBy(st => st.Id, OrderByType.Asc) .Select((st, sc) => new { stid = st.Id, scid = sc.Id }).ToSql(); - base.Check(@"SELECT [st].[ID] AS [stid] , [sc].[id] AS [scid] FROM [STudent] st Left JOIN School sc ON ( [st].[SchoolId] = [sc].[id] ) WHERE ( [st].[ID] = @Id0 ) AND ( [sc].[id] = @Id1 ) AND ( [sc].[id] = [st].[ID] )GROUP BY [st].[ID],[sc].[id] ORDER BY [st].[ID] ASC ", + base.Check(@"SELECT [st].[ID] AS [stid] , [sc].[id] AS [scid] FROM [STudent] st Left JOIN [School] sc ON ( [st].[SchoolId] = [sc].[id] ) WHERE ( [st].[ID] = @Id0 ) AND ( [sc].[id] = @Id1 ) AND ( [sc].[id] = [st].[ID] )GROUP BY [st].[ID],[sc].[id] ORDER BY [st].[ID] ASC ", null, t2.Key, null, " Mapping t2 error"); var x2 = GetInstance(); diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/Query/JoinQuery.cs b/Src/Asp.Net/SqlServerTest/UnitTest/Query/JoinQuery.cs index 556cee8bc..60f3fb2c1 100644 --- a/Src/Asp.Net/SqlServerTest/UnitTest/Query/JoinQuery.cs +++ b/Src/Asp.Net/SqlServerTest/UnitTest/Query/JoinQuery.cs @@ -39,7 +39,7 @@ namespace OrmTest.UnitTest JoinType.Left,st.SchoolId==sc.Id }).Select((st, sc) => new ViewModelStudent { Name = st.Name, SchoolId = SqlFunc.AggregateMin(sc.Id) }).ToSql(); - string sql = @"SELECT [st].[Name] AS [Name] , MIN([sc].[Id]) AS [SchoolId] FROM [STudent] st Left JOIN School sc ON ( [st].[SchoolId] = [sc].[Id] ) "; + string sql = @"SELECT [st].[Name] AS [Name] , MIN([sc].[Id]) AS [SchoolId] FROM [STudent] st Left JOIN [School] sc ON ( [st].[SchoolId] = [sc].[Id] ) "; base.Check(sql, null, join6.Key, null, "join 6 Error"); } } @@ -52,7 +52,7 @@ namespace OrmTest.UnitTest JoinType.Left,st.SchoolId==sc.Id }).Select((st, sc) => new ViewModelStudent { Name = st.Name, SchoolId = SqlFunc.AggregateMin(sc.Id*1) }).ToSql(); - string sql = @"SELECT [st].[Name] AS [Name] , MIN(( [sc].[Id] * @Id0 )) AS [SchoolId] FROM [STudent] st Left JOIN School sc ON ( [st].[SchoolId] = [sc].[Id] ) "; + string sql = @"SELECT [st].[Name] AS [Name] , MIN(( [sc].[Id] * @Id0 )) AS [SchoolId] FROM [STudent] st Left JOIN [School] sc ON ( [st].[SchoolId] = [sc].[Id] ) "; base.Check(sql, new List() { new SugarParameter("@Id0",1) }, join7.Key, join7.Value, "join 7 Error"); @@ -93,7 +93,7 @@ namespace OrmTest.UnitTest .Where("st.id>@id") .AddParameters(new { id = 1 }) .Select("st.*").ToSql(); - string sql = @"SELECT st.* FROM [Student] st Left JOIN School sh ON sh.id=st.schoolid WHERE st.id>@id "; + string sql = @"SELECT st.* FROM [Student] st Left JOIN [School] sh ON sh.id=st.schoolid WHERE st.id>@id "; base.Check(sql,new List() {new SugarParameter("@id",1)}, join3.Key, join3.Value, "join 3 Error"); } } @@ -105,7 +105,7 @@ namespace OrmTest.UnitTest var join1 = db.Queryable((st, sc) => new object[] { JoinType.Left,st.SchoolId==sc.Id }).Where(st => st.Id > 0).Select("*").ToSql(); - base.Check(@"SELECT * FROM [STudent] st Left JOIN School sc ON ( [st].[SchoolId] = [sc].[Id] ) WHERE ( [st].[ID] > @Id0 ) ", + base.Check(@"SELECT * FROM [STudent] st Left JOIN [School] sc ON ( [st].[SchoolId] = [sc].[Id] ) WHERE ( [st].[ID] > @Id0 ) ", new List() { new SugarParameter("@Id0",0) }, join1.Key, join1.Value, "join 1 Error"); @@ -118,7 +118,7 @@ namespace OrmTest.UnitTest var join2 = db.Queryable((st, sc) => new object[] { JoinType.Left,st.SchoolId==sc.Id }).Where(st => st.Id > 2).Select("*").ToSql(); - base.Check(@"SELECT * FROM [STudent] st Left JOIN School sc ON ( [st].[SchoolId] = [sc].[Id] ) WHERE ( [st].[ID] > @Id0 ) ", + base.Check(@"SELECT * FROM [STudent] st Left JOIN [School] sc ON ( [st].[SchoolId] = [sc].[Id] ) WHERE ( [st].[ID] > @Id0 ) ", new List() { new SugarParameter("@Id0",2) }, join2.Key, join2.Value, "join 2 Error"); diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/Query/SelectQuery.cs b/Src/Asp.Net/SqlServerTest/UnitTest/Query/SelectQuery.cs index d3d8f4fe0..0f7b7506f 100644 --- a/Src/Asp.Net/SqlServerTest/UnitTest/Query/SelectQuery.cs +++ b/Src/Asp.Net/SqlServerTest/UnitTest/Query/SelectQuery.cs @@ -50,7 +50,7 @@ namespace OrmTest.UnitTest var t1 = db.Queryable((st, sc) => new object[] { JoinType.Inner,st.Id==sc.Id }).GroupBy(st => st.Id).Having(st => SqlFunc.AggregateAvg(st.Id) == 1).Select(st => new { avgId = SqlFunc.AggregateAvg(st.Id) }).ToSql(); - base.Check("SELECT AVG([st].[ID]) AS [avgId] FROM [STudent] st Inner JOIN School sc ON ( [st].[ID] = [sc].[Id] ) GROUP BY [st].[ID] HAVING (AVG([st].[ID]) = @Const0 ) ", + base.Check("SELECT AVG([st].[ID]) AS [avgId] FROM [STudent] st Inner JOIN [School] sc ON ( [st].[ID] = [sc].[Id] ) GROUP BY [st].[ID] HAVING (AVG([st].[ID]) = @Const0 ) ", new List() { new SugarParameter("@Const0",1) } @@ -64,7 +64,7 @@ namespace OrmTest.UnitTest .Where(st => st.Id > 0) .Select((st, st2) => new { stid = st.Id, scId = st2.Id, xx = st }).ToSql(); - base.Check("SELECT [st].[Id] AS [stid] , [st2].[Id] AS [scId] , [st].[Id] AS [School.Id] , [st].[Name] AS [School.Name] FROM [School] st Left JOIN School st2 ON ( [st].[Id] = [st2].[Id] ) WHERE ( [st].[Id] > @Id0 ) " + base.Check("SELECT [st].[Id] AS [stid] , [st2].[Id] AS [scId] , [st].[Id] AS [School.Id] , [st].[Name] AS [School.Name] FROM [School] st Left JOIN [School] st2 ON ( [st].[Id] = [st2].[Id] ) WHERE ( [st].[Id] > @Id0 ) " , new List() { new SugarParameter("@Id0",0) }, t2.Key, t2.Value, "select t2 Error"); @@ -75,7 +75,7 @@ namespace OrmTest.UnitTest JoinType.Left,sc2.Id==sc.Id }).Where(st => st.Id > 0) .Select((st) => new School() { Id = st.Id }).ToSql(); - base.Check("SELECT [st].[ID] AS [Id] FROM [STudent] st Left JOIN School sc ON ( [st].[SchoolId] = [sc].[Id] ) Left JOIN School sc2 ON ( [sc2].[Id] = [sc].[Id] ) WHERE ( [st].[ID] > @Id0 ) ", + base.Check("SELECT [st].[ID] AS [Id] FROM [STudent] st Left JOIN [School] sc ON ( [st].[SchoolId] = [sc].[Id] ) Left JOIN [School] sc2 ON ( [sc2].[Id] = [sc].[Id] ) WHERE ( [st].[ID] > @Id0 ) ", new List() { new SugarParameter("@Id0",0) }, t3.Key, t3.Value, "select t3 Error"); diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs index 7e3ba6f72..7210640aa 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs @@ -306,7 +306,7 @@ namespace SqlSugar return string.Format( this.JoinTemplate, joinInfo.JoinType.ToString() + PubConst.Space, - joinInfo.TableName + PubConst.Space, + Builder.GetTranslationTableName(joinInfo.TableName) + PubConst.Space, joinInfo.ShortName + PubConst.Space + joinInfo.TableWithString, joinInfo.JoinWhere); }