Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 52f4bf6

Browse files
committed
Add SqlExpression GetAllTables() API
1 parent 7037a03 commit 52f4bf6

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EdotCover_002EIde_002ECore_002EFilterManagement_002EModel_002ESolutionFilterSettingsManagerMigrateSettings/@EntryIndexedValue">True</s:Boolean>
23
<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
34
<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>

src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,14 @@ public class TableOptions
2222

2323
public abstract partial class SqlExpression<T> : ISqlExpression
2424
{
25-
protected List<ModelDefinition> tableDefs = new List<ModelDefinition>();
25+
protected List<ModelDefinition> tableDefs = new();
26+
27+
public List<ModelDefinition> GetAllTables()
28+
{
29+
var allTableDefs = new List<ModelDefinition> { modelDef };
30+
allTableDefs.AddRange(tableDefs);
31+
return allTableDefs;
32+
}
2633

2734
public bool IsJoinedTable(Type type)
2835
{

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public abstract partial class SqlExpression<T> : ISqlExpression, IHasUntypedSqlE
1818
public const string FalseLiteral = "(1=0)";
1919

2020
private Expression<Func<T, bool>> underlyingExpression;
21-
private List<string> orderByProperties = new List<string>();
21+
private List<string> orderByProperties = new();
2222
private string selectExpression = string.Empty;
2323
private string fromExpression = null;
2424
private string whereExpression;
@@ -286,8 +286,7 @@ internal virtual SqlExpression<T> Select(string[] fields, bool distinct)
286286

287287
useFieldName = true;
288288

289-
var allTableDefs = new List<ModelDefinition> { modelDef };
290-
allTableDefs.AddRange(tableDefs);
289+
var allTableDefs = GetAllTables();
291290

292291
var fieldsList = new List<string>();
293292
var sb = StringBuilderCache.Allocate();

0 commit comments

Comments
 (0)