Skip to content

Commit de6809c

Browse files
committed
parse relationships, add CancellationToken support in queries
1 parent a783b15 commit de6809c

File tree

106 files changed

+4519
-3725
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+4519
-3725
lines changed

EntityFrameworkCore.Generator.sln

Lines changed: 62 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{6A18343D
1515
ProjectSection(SolutionItems) = preProject
1616
appveyor.yml = appveyor.yml
1717
src\Directory.Build.props = src\Directory.Build.props
18-
EndProjectSection
19-
EndProject
20-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AA406DDA-50E2-40C8-BCC9-3A2194771231}"
21-
ProjectSection(SolutionItems) = preProject
2218
README.md = README.md
2319
EndProjectSection
2420
EndProject
21+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{A27451D6-D564-40E2-B27B-A5A732F1C72D}"
22+
EndProject
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tracker.Core", "sample\Tracker\Tracker.Core\Tracker.Core.csproj", "{E504B9FB-51C1-41B5-BCB8-451001F8F450}"
24+
EndProject
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tracker.Database", "sample\Tracker\Tracker.Database\Tracker.Database.csproj", "{2FD881E6-B648-41E0-B466-9074547C832F}"
26+
EndProject
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tracker.Scaffold", "sample\Tracker\Tracker.Scaffold\Tracker.Scaffold.csproj", "{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}"
28+
EndProject
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tracker.Web", "sample\Tracker\Tracker.Web\Tracker.Web.csproj", "{0A75634B-0CD3-434B-AC1C-C40C450F3B88}"
30+
EndProject
2531
Global
2632
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2733
Debug|Any CPU = Debug|Any CPU
@@ -68,12 +74,64 @@ Global
6874
{C36914A2-9E52-4946-AD0E-8EF1EA52F38C}.Release|x64.Build.0 = Release|Any CPU
6975
{C36914A2-9E52-4946-AD0E-8EF1EA52F38C}.Release|x86.ActiveCfg = Release|Any CPU
7076
{C36914A2-9E52-4946-AD0E-8EF1EA52F38C}.Release|x86.Build.0 = Release|Any CPU
77+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Debug|Any CPU.Build.0 = Debug|Any CPU
79+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Debug|x64.ActiveCfg = Debug|Any CPU
80+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Debug|x64.Build.0 = Debug|Any CPU
81+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Debug|x86.ActiveCfg = Debug|Any CPU
82+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Debug|x86.Build.0 = Debug|Any CPU
83+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Release|Any CPU.ActiveCfg = Release|Any CPU
84+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Release|Any CPU.Build.0 = Release|Any CPU
85+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Release|x64.ActiveCfg = Release|Any CPU
86+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Release|x64.Build.0 = Release|Any CPU
87+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Release|x86.ActiveCfg = Release|Any CPU
88+
{E504B9FB-51C1-41B5-BCB8-451001F8F450}.Release|x86.Build.0 = Release|Any CPU
89+
{2FD881E6-B648-41E0-B466-9074547C832F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
90+
{2FD881E6-B648-41E0-B466-9074547C832F}.Debug|Any CPU.Build.0 = Debug|Any CPU
91+
{2FD881E6-B648-41E0-B466-9074547C832F}.Debug|x64.ActiveCfg = Debug|Any CPU
92+
{2FD881E6-B648-41E0-B466-9074547C832F}.Debug|x64.Build.0 = Debug|Any CPU
93+
{2FD881E6-B648-41E0-B466-9074547C832F}.Debug|x86.ActiveCfg = Debug|Any CPU
94+
{2FD881E6-B648-41E0-B466-9074547C832F}.Debug|x86.Build.0 = Debug|Any CPU
95+
{2FD881E6-B648-41E0-B466-9074547C832F}.Release|Any CPU.ActiveCfg = Release|Any CPU
96+
{2FD881E6-B648-41E0-B466-9074547C832F}.Release|Any CPU.Build.0 = Release|Any CPU
97+
{2FD881E6-B648-41E0-B466-9074547C832F}.Release|x64.ActiveCfg = Release|Any CPU
98+
{2FD881E6-B648-41E0-B466-9074547C832F}.Release|x64.Build.0 = Release|Any CPU
99+
{2FD881E6-B648-41E0-B466-9074547C832F}.Release|x86.ActiveCfg = Release|Any CPU
100+
{2FD881E6-B648-41E0-B466-9074547C832F}.Release|x86.Build.0 = Release|Any CPU
101+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Debug|Any CPU.Build.0 = Debug|Any CPU
103+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Debug|x64.ActiveCfg = Debug|Any CPU
104+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Debug|x64.Build.0 = Debug|Any CPU
105+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Debug|x86.ActiveCfg = Debug|Any CPU
106+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Debug|x86.Build.0 = Debug|Any CPU
107+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Release|Any CPU.ActiveCfg = Release|Any CPU
108+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Release|Any CPU.Build.0 = Release|Any CPU
109+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Release|x64.ActiveCfg = Release|Any CPU
110+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Release|x64.Build.0 = Release|Any CPU
111+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Release|x86.ActiveCfg = Release|Any CPU
112+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94}.Release|x86.Build.0 = Release|Any CPU
113+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
114+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Debug|Any CPU.Build.0 = Debug|Any CPU
115+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Debug|x64.ActiveCfg = Debug|Any CPU
116+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Debug|x64.Build.0 = Debug|Any CPU
117+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Debug|x86.ActiveCfg = Debug|Any CPU
118+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Debug|x86.Build.0 = Debug|Any CPU
119+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Release|Any CPU.ActiveCfg = Release|Any CPU
120+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Release|Any CPU.Build.0 = Release|Any CPU
121+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Release|x64.ActiveCfg = Release|Any CPU
122+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Release|x64.Build.0 = Release|Any CPU
123+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Release|x86.ActiveCfg = Release|Any CPU
124+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88}.Release|x86.Build.0 = Release|Any CPU
71125
EndGlobalSection
72126
GlobalSection(SolutionProperties) = preSolution
73127
HideSolutionNode = FALSE
74128
EndGlobalSection
75129
GlobalSection(NestedProjects) = preSolution
76130
{05E64176-6025-43C6-9F0F-2DD5E52EB325} = {3E4208F0-D270-45F4-BBBB-91DDA4050C1F}
131+
{E504B9FB-51C1-41B5-BCB8-451001F8F450} = {A27451D6-D564-40E2-B27B-A5A732F1C72D}
132+
{2FD881E6-B648-41E0-B466-9074547C832F} = {A27451D6-D564-40E2-B27B-A5A732F1C72D}
133+
{6B2F2EE1-3ABE-4556-8698-B0FE73F1AB94} = {A27451D6-D564-40E2-B27B-A5A732F1C72D}
134+
{0A75634B-0CD3-434B-AC1C-C40C450F3B88} = {A27451D6-D564-40E2-B27B-A5A732F1C72D}
77135
EndGlobalSection
78136
GlobalSection(ExtensibilityGlobals) = postSolution
79137
SolutionGuid = {1D52C3BA-3849-4790-810C-124F43DEDAFD}

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,13 @@ Entity Framework Core Generator supports generating [Read](https://efg.loresoft.
155155

156156
## Change Log
157157

158+
### Version 5.0
159+
160+
- add support for navigation property renames
161+
- update generated query methods to support CancellationToken
162+
- add support for temporal tables
163+
- add regex clean support for table and column names
164+
158165
### Version 4.5
159166

160167
- add support for nullable reference types

sample/Tracker/Tracker.Core/Data/Entities/Audit.cs

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -15,101 +15,101 @@ public partial class Audit : IHaveIdentifier
1515
public Audit()
1616
{
1717
#region Generated Constructor
18-
#endregion
18+
#endregion
1919
}
2020

2121
#region Generated Properties
22-
/// <summary>
23-
/// Gets or sets the property value representing column 'Id'.
24-
/// </summary>
25-
/// <value>
26-
/// The property value representing column 'Id'.
27-
/// </value>
28-
public Guid Id { get; set; }
29-
30-
/// <summary>
31-
/// Gets or sets the property value representing column 'Date'.
32-
/// </summary>
33-
/// <value>
34-
/// The property value representing column 'Date'.
35-
/// </value>
36-
public DateTime Date { get; set; }
37-
38-
/// <summary>
39-
/// Gets or sets the property value representing column 'UserId'.
40-
/// </summary>
41-
/// <value>
42-
/// The property value representing column 'UserId'.
43-
/// </value>
44-
public Guid? UserId { get; set; }
45-
46-
/// <summary>
47-
/// Gets or sets the property value representing column 'TaskId'.
48-
/// </summary>
49-
/// <value>
50-
/// The property value representing column 'TaskId'.
51-
/// </value>
52-
public Guid? TaskId { get; set; }
53-
54-
/// <summary>
55-
/// Gets or sets the property value representing column 'Content'.
56-
/// </summary>
57-
/// <value>
58-
/// The property value representing column 'Content'.
59-
/// </value>
60-
public string Content { get; set; } = null!;
61-
62-
/// <summary>
63-
/// Gets or sets the property value representing column 'Username'.
64-
/// </summary>
65-
/// <value>
66-
/// The property value representing column 'Username'.
67-
/// </value>
68-
public string Username { get; set; } = null!;
69-
70-
/// <summary>
71-
/// Gets or sets the property value representing column 'Created'.
72-
/// </summary>
73-
/// <value>
74-
/// The property value representing column 'Created'.
75-
/// </value>
76-
public DateTimeOffset Created { get; set; }
77-
78-
/// <summary>
79-
/// Gets or sets the property value representing column 'CreatedBy'.
80-
/// </summary>
81-
/// <value>
82-
/// The property value representing column 'CreatedBy'.
83-
/// </value>
84-
public string? CreatedBy { get; set; }
85-
86-
/// <summary>
87-
/// Gets or sets the property value representing column 'Updated'.
88-
/// </summary>
89-
/// <value>
90-
/// The property value representing column 'Updated'.
91-
/// </value>
92-
public DateTimeOffset Updated { get; set; }
93-
94-
/// <summary>
95-
/// Gets or sets the property value representing column 'UpdatedBy'.
96-
/// </summary>
97-
/// <value>
98-
/// The property value representing column 'UpdatedBy'.
99-
/// </value>
100-
public string? UpdatedBy { get; set; }
101-
102-
/// <summary>
103-
/// Gets or sets the property value representing column 'RowVersion'.
104-
/// </summary>
105-
/// <value>
106-
/// The property value representing column 'RowVersion'.
107-
/// </value>
108-
public Byte[] RowVersion { get; set; } = null!;
22+
/// <summary>
23+
/// Gets or sets the property value representing column 'Id'.
24+
/// </summary>
25+
/// <value>
26+
/// The property value representing column 'Id'.
27+
/// </value>
28+
public Guid Id { get; set; }
10929

110-
#endregion
30+
/// <summary>
31+
/// Gets or sets the property value representing column 'Date'.
32+
/// </summary>
33+
/// <value>
34+
/// The property value representing column 'Date'.
35+
/// </value>
36+
public DateTime Date { get; set; }
37+
38+
/// <summary>
39+
/// Gets or sets the property value representing column 'UserId'.
40+
/// </summary>
41+
/// <value>
42+
/// The property value representing column 'UserId'.
43+
/// </value>
44+
public Guid? UserId { get; set; }
45+
46+
/// <summary>
47+
/// Gets or sets the property value representing column 'TaskId'.
48+
/// </summary>
49+
/// <value>
50+
/// The property value representing column 'TaskId'.
51+
/// </value>
52+
public Guid? TaskId { get; set; }
53+
54+
/// <summary>
55+
/// Gets or sets the property value representing column 'Content'.
56+
/// </summary>
57+
/// <value>
58+
/// The property value representing column 'Content'.
59+
/// </value>
60+
public string Content { get; set; } = null!;
61+
62+
/// <summary>
63+
/// Gets or sets the property value representing column 'Username'.
64+
/// </summary>
65+
/// <value>
66+
/// The property value representing column 'Username'.
67+
/// </value>
68+
public string Username { get; set; } = null!;
69+
70+
/// <summary>
71+
/// Gets or sets the property value representing column 'Created'.
72+
/// </summary>
73+
/// <value>
74+
/// The property value representing column 'Created'.
75+
/// </value>
76+
public DateTimeOffset Created { get; set; }
77+
78+
/// <summary>
79+
/// Gets or sets the property value representing column 'CreatedBy'.
80+
/// </summary>
81+
/// <value>
82+
/// The property value representing column 'CreatedBy'.
83+
/// </value>
84+
public string? CreatedBy { get; set; }
85+
86+
/// <summary>
87+
/// Gets or sets the property value representing column 'Updated'.
88+
/// </summary>
89+
/// <value>
90+
/// The property value representing column 'Updated'.
91+
/// </value>
92+
public DateTimeOffset Updated { get; set; }
93+
94+
/// <summary>
95+
/// Gets or sets the property value representing column 'UpdatedBy'.
96+
/// </summary>
97+
/// <value>
98+
/// The property value representing column 'UpdatedBy'.
99+
/// </value>
100+
public string? UpdatedBy { get; set; }
101+
102+
/// <summary>
103+
/// Gets or sets the property value representing column 'RowVersion'.
104+
/// </summary>
105+
/// <value>
106+
/// The property value representing column 'RowVersion'.
107+
/// </value>
108+
public Byte[] RowVersion { get; set; } = null!;
109+
110+
#endregion
111111

112112
#region Generated Relationships
113-
#endregion
113+
#endregion
114114

115115
}

0 commit comments

Comments
 (0)