- 优化 WithTempQuery + SqlServer 未指定 OrderBy 的分页；

2881099 · 2881099 · commit f799191ac0e8 · 2023-07-21T14:39:34.000+08:00
diff --git a/Examples/base_entity/Program.cs b/Examples/base_entity/Program.cs
@@ -560,7 +560,7 @@ static void Main(string[] args)
 
                 //.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;min pool size=1;Max pool size=3;AllowLoadLocalInfile=true")
 
-                //.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
+                .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
 
                 //.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=2")
                 ////.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=toc;Pooling=true;Maximum Pool Size=2")
@@ -599,6 +599,9 @@ static void Main(string[] args)
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
             #endregion
 
+            var cccsql1 = fsql.Select<CCC>().Page(1, 10).ToSql();
+            var cccsql2 = fsql.Select<CCC>().Page(2, 10).ToSql();
+
             new Products
             {
                 title = "one plus pro"
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/Providers/FreeSql.Provider.Custom/SqlServer/Curd/CustomSqlServerSelect.cs b/Providers/FreeSql.Provider.Custom/SqlServer/Curd/CustomSqlServerSelect.cs
@@ -54,7 +54,8 @@ internal static string ToSqlStaticRowNumber(CommonUtils _commonUtils, CommonExpr
                         {
                             var pktb = _tables.Where(a => a.Table.Primarys.Any()).FirstOrDefault();
                             if (pktb != null) _orderby = string.Concat(" \r\nORDER BY ", pktb.Alias, ".", _commonUtils.QuoteSqlName(pktb?.Table.Primarys.First().Attribute.Name));
-                            else _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else if (_tables.FirstOrDefault()?.Table?.Columns?.Any() == true) _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else _orderby = " \r\nORDER BY getdate()";
                         }
                         else
                             _orderby = _groupby.Replace("GROUP BY ", "ORDER BY ");
@@ -277,7 +278,8 @@ internal static string ToSqlStaticOffsetFetchNext(CommonUtils _commonUtils, Comm
                         {
                             var pktb = _tables.Where(a => a.Table.Primarys.Any()).FirstOrDefault();
                             if (pktb != null) _orderby = string.Concat(" \r\nORDER BY ", pktb.Alias, ".", _commonUtils.QuoteSqlName(pktb?.Table.Primarys.First().Attribute.Name));
-                            else _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else if (_tables.FirstOrDefault()?.Table?.Columns?.Any() == true) _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else _orderby = " \r\nORDER BY getdate()";
                         }
                         else
                             _orderby = _groupby.Replace("GROUP BY ", "ORDER BY ");
diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerSelect.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerSelect.cs
@@ -54,7 +54,8 @@ internal static string ToSqlStaticRowNumber(CommonUtils _commonUtils, CommonExpr
                         {
                             var pktb = _tables.Where(a => a.Table.Primarys.Any()).FirstOrDefault();
                             if (pktb != null) _orderby = string.Concat(" \r\nORDER BY ", pktb.Alias, ".", _commonUtils.QuoteSqlName(pktb?.Table.Primarys.First().Attribute.Name));
-                            else _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else if (_tables.FirstOrDefault()?.Table?.Columns?.Any() == true) _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else _orderby = " \r\nORDER BY getdate()";
                         }
                         else
                             _orderby = _groupby.Replace("GROUP BY ", "ORDER BY ");
@@ -277,7 +278,8 @@ internal static string ToSqlStaticOffsetFetchNext(CommonUtils _commonUtils, Comm
                         {
                             var pktb = _tables.Where(a => a.Table.Primarys.Any()).FirstOrDefault();
                             if (pktb != null) _orderby = string.Concat(" \r\nORDER BY ", pktb.Alias, ".", _commonUtils.QuoteSqlName(pktb?.Table.Primarys.First().Attribute.Name));
-                            else _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else if (_tables.FirstOrDefault()?.Table?.Columns?.Any() == true) _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else _orderby = " \r\nORDER BY getdate()";
                         }
                         else
                             _orderby = _groupby.Replace("GROUP BY ", "ORDER BY ");
diff --git a/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs b/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs
@@ -54,7 +54,8 @@ internal static string ToSqlStaticRowNumber(CommonUtils _commonUtils, CommonExpr
                         {
                             var pktb = _tables.Where(a => a.Table.Primarys.Any()).FirstOrDefault();
                             if (pktb != null) _orderby = string.Concat(" \r\nORDER BY ", pktb.Alias, ".", _commonUtils.QuoteSqlName(pktb?.Table.Primarys.First().Attribute.Name));
-                            else _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else if (_tables.FirstOrDefault()?.Table?.Columns?.Any() == true) _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else _orderby = " \r\nORDER BY getdate()";
                         }
                         else
                             _orderby = _groupby.Replace("GROUP BY ", "ORDER BY ");
@@ -277,7 +278,8 @@ internal static string ToSqlStaticOffsetFetchNext(CommonUtils _commonUtils, Comm
                         {
                             var pktb = _tables.Where(a => a.Table.Primarys.Any()).FirstOrDefault();
                             if (pktb != null) _orderby = string.Concat(" \r\nORDER BY ", pktb.Alias, ".", _commonUtils.QuoteSqlName(pktb?.Table.Primarys.First().Attribute.Name));
-                            else _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else if(_tables.FirstOrDefault()?.Table?.Columns?.Any() == true) _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                            else _orderby = " \r\nORDER BY getdate()";
                         }
                         else
                             _orderby = _groupby.Replace("GROUP BY ", "ORDER BY ");

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ internal static string ToSqlStaticRowNumber(CommonUtils _commonUtils, CommonExpr`
`54`	`54`	`{`
`55`	`55`	`var pktb = _tables.Where(a => a.Table.Primarys.Any()).FirstOrDefault();`
`56`	`56`	`if (pktb != null) _orderby = string.Concat(" \r\nORDER BY ", pktb.Alias, ".", _commonUtils.QuoteSqlName(pktb?.Table.Primarys.First().Attribute.Name));`
`57`		`- else _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));`
	`57`	`+ else if (_tables.FirstOrDefault()?.Table?.Columns?.Any() == true) _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));`
	`58`	`+ else _orderby = " \r\nORDER BY getdate()";`
`58`	`59`	`}`
`59`	`60`	`else`
`60`	`61`	`_orderby = _groupby.Replace("GROUP BY ", "ORDER BY ");`
`@@ -277,7 +278,8 @@ internal static string ToSqlStaticOffsetFetchNext(CommonUtils _commonUtils, Comm`
`277`	`278`	`{`
`278`	`279`	`var pktb = _tables.Where(a => a.Table.Primarys.Any()).FirstOrDefault();`
`279`	`280`	`if (pktb != null) _orderby = string.Concat(" \r\nORDER BY ", pktb.Alias, ".", _commonUtils.QuoteSqlName(pktb?.Table.Primarys.First().Attribute.Name));`
`280`		`- else _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));`
	`281`	`+ else if (_tables.FirstOrDefault()?.Table?.Columns?.Any() == true) _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));`
	`282`	`+ else _orderby = " \r\nORDER BY getdate()";`
`281`	`283`	`}`
`282`	`284`	`else`
`283`	`285`	`_orderby = _groupby.Replace("GROUP BY ", "ORDER BY ");`