Skip to content

Commit f3168ff

Browse files
sjh37sjh37
committed
Merge branch 'development' into 568_Support_SQLite
2 parents 15fad23 + d96df01 commit f3168ff

File tree

16 files changed

+17
-17
lines changed

16 files changed

+17
-17
lines changed

‎BuildTT/BuildTT.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private static void CreateTT(string generatorRoot, string ttRoot)
9797
Settings.AddParameterlessConstructorToDbContext = true; // EF6 only. If true, then DbContext will have a default (parameter-less) constructor which automatically passes in the connection string name, if false then no parameter-less constructor will be created.
9898
Settings.ConfigurationClassName = ""Configuration""; // Configuration, Mapping, Map, etc. This is appended to the Poco class name to configure the mappings.
9999
Settings.DatabaseReaderPlugin = """"; // Eg, ""c:\\Path\\YourDatabaseReader.dll,Full.Name.Of.Class.Including.Namespace"". See #501. This will allow you to specify a pluggable provider for reading your database.
100-
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2 & 3+. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated.
100+
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2-4. If true, mapping will be used, and no mapping tables will be generated. If false, all tables will be generated.
101101
102102
Settings.EntityClassesModifiers = ""public""; // ""public partial"";
103103
Settings.ConfigurationClassesModifiers = ""public""; // ""public partial"";

‎EntityFramework.Reverse.POCO.Generator/Database NorthwindSqlCe40.tt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Settings.DatabaseType = DatabaseType.SqlCe; // SqlServer, SqlCe, SQLite, PostgreSQL. Coming next: MySql, Oracle
1414
Settings.TemplateType = TemplateType.EfCore7; // EfCore7, EfCore6, EfCore5, EfCore3, EfCore2, Ef6, FileBasedCore2-7. FileBased specify folder using Settings.TemplateFolder
1515
Settings.GeneratorType = GeneratorType.EfCore; // EfCore, Ef6, Custom. Custom edit GeneratorCustom class to provide your own implementation
16-
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2 & 3. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated.
16+
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2-4. If true, mapping will be used, and no mapping tables will be generated. If false, all tables will be generated.
1717
Settings.FileManagerType = FileManagerType.EfCore; // .NET Core project = EfCore; .NET 4.x project = VisualStudio; No output (testing only) = Null
1818
Settings.ConnectionString = @"Data Source=C:\S\Source (open source)\EntityFramework Reverse POCO Code Generator\EntityFramework.Reverse.POCO.Generator\App_Data\NorthwindSqlCe40.sdf";
1919
Settings.ConnectionStringName = "MyDbContextSqlCE4"; // ConnectionString key as specified in your app.config/web.config/appsettings.json. Not used by the generator, but is placed into the generated DbContext constructor.
@@ -80,7 +80,7 @@
8080
Settings.AddParameterlessConstructorToDbContext = true; // EF6 only. If true, then DbContext will have a default (parameter-less) constructor which automatically passes in the connection string name, if false then no parameter-less constructor will be created.
8181
Settings.ConfigurationClassName = "Configuration"; // Configuration, Mapping, Map, etc. This is appended to the Poco class name to configure the mappings.
8282
Settings.DatabaseReaderPlugin = ""; // Eg, "c:\\Path\\YourDatabaseReader.dll,Full.Name.Of.Class.Including.Namespace". See #501. This will allow you to specify a pluggable provider for reading your database.
83-
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2 & 3+. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated.
83+
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2-4. If true, mapping will be used, and no mapping tables will be generated. If false, all tables will be generated.
8484

8585
Settings.EntityClassesModifiers = "public"; // "public partial";
8686
Settings.ConfigurationClassesModifiers = "public"; // "public partial";

‎EntityFramework.Reverse.POCO.Generator/Database.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
Settings.AddParameterlessConstructorToDbContext = true; // EF6 only. If true, then DbContext will have a default (parameter-less) constructor which automatically passes in the connection string name, if false then no parameter-less constructor will be created.
8282
Settings.ConfigurationClassName = "Configuration"; // Configuration, Mapping, Map, etc. This is appended to the Poco class name to configure the mappings.
8383
Settings.DatabaseReaderPlugin = ""; // Eg, "c:\\Path\\YourDatabaseReader.dll,Full.Name.Of.Class.Including.Namespace". See #501. This will allow you to specify a pluggable provider for reading your database.
84-
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2 & 3+. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated.
84+
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2-4. If true, mapping will be used, and no mapping tables will be generated. If false, all tables will be generated.
8585

8686
Settings.EntityClassesModifiers = "public"; // "public partial";
8787
Settings.ConfigurationClassesModifiers = "public"; // "public partial";

‎EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4760,7 +4760,7 @@
47604760
// Work out if there are any foreign key relationship naming clashes
47614761
ProcessForeignKeys(foreignKeys, true, filter);
47624762

4763-
// Mappings tables can only be true for Ef6
4763+
// Mappings tables can only be true for Ef6 and EFCore 5 onwards
47644764
if (Settings.UseMappingTables && !(Settings.IsEf6() || Settings.IsEfCore5Plus()))
47654765
Settings.UseMappingTables = false;
47664766

‎Generator/Generators/Generator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ private void AddForeignKeysToFilters(List<RawForeignKey> rawForeignKeys)
574574
// Work out if there are any foreign key relationship naming clashes
575575
ProcessForeignKeys(foreignKeys, true, filter);
576576

577-
// Mappings tables can only be true for Ef6
577+
// Mappings tables can only be true for Ef6 and EFCore 5 onwards
578578
if (Settings.UseMappingTables && !(Settings.IsEf6() || Settings.IsEfCore5Plus()))
579579
Settings.UseMappingTables = false;
580580

‎Tester.Integration.EFCore6/ContextHasSameNameAsDb/EfrpgTest.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
Settings.AddParameterlessConstructorToDbContext = true; // EF6 only. If true, then DbContext will have a default (parameter-less) constructor which automatically passes in the connection string name, if false then no parameter-less constructor will be created.
6060
Settings.ConfigurationClassName = "Configuration"; // Configuration, Mapping, Map, etc. This is appended to the Poco class name to configure the mappings.
6161
Settings.DatabaseReaderPlugin = ""; // Eg, "c:\\Path\\YourDatabaseReader.dll,Full.Name.Of.Class.Including.Namespace". See #501. This will allow you to specify a pluggable provider for reading your database.
62-
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2 & 3. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated.
62+
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2-4. If true, mapping will be used, and no mapping tables will be generated. If false, all tables will be generated.
6363

6464
Settings.EntityClassesModifiers = "public"; // "public partial";
6565
Settings.ConfigurationClassesModifiers = "public"; // "public partial";

‎Tester.Integration.EFCore6/EfrpgTest.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Settings.DatabaseType = DatabaseType.SqlServer;
1414
Settings.TemplateType = TemplateType.EfCore6;
1515
Settings.GeneratorType = GeneratorType.EfCore;
16-
Settings.UseMappingTables = true; // Set to false for EfCore. EFCore will add support for this in v3 at some point, so please set this to false. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated.
16+
Settings.UseMappingTables = true; // Must be false for TemplateType.EfCore2-4. If true, mapping will be used, and no mapping tables will be generated. If false, all tables will be generated.
1717
Settings.FileManagerType = FileManagerType.EfCore; // .NET project = VisualStudio; .NET Core project = EfCore; No output (testing only) = Null
1818
Settings.ConnectionString = "Data Source=(local);Initial Catalog=EfrpgTest;Integrated Security=True;Application Name=EntityFramework Reverse POCO Generator";
1919
Settings.ConnectionStringName = "MyDbContext"; // ConnectionString key as specified in your app.config/web.config/appsettings.json

‎Tester.Integration.EFCore6/EfrpgTest_no_pascal_casing.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Settings.DatabaseType = DatabaseType.SqlServer;
1414
Settings.TemplateType = TemplateType.EfCore6;
1515
Settings.GeneratorType = GeneratorType.EfCore;
16-
Settings.UseMappingTables = true; // Set to false for EfCore. EFCore will add support for this in v3 at some point, so please set this to false. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated.
16+
Settings.UseMappingTables = true; // Must be false for TemplateType.EfCore2-4. If true, mapping will be used, and no mapping tables will be generated. If false, all tables will be generated.
1717
Settings.FileManagerType = FileManagerType.EfCore; // .NET project = VisualStudio; .NET Core project = EfCore; No output (testing only) = Null
1818
Settings.ConnectionString = "Data Source=(local);Initial Catalog=EfrpgTest;Integrated Security=True;Application Name=EntityFramework Reverse POCO Generator";
1919
Settings.ConnectionStringName = "My_Db_Context"; // ConnectionString key as specified in your app.config/web.config/appsettings.json

‎Tester.Integration.EFCore6/EnumViaTables.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Settings.TemplateType = TemplateType.EfCore6; // EfCore6, EfCore5, EfCore3, EfCore2, Ef6, FileBasedCore2, FileBasedCore3, FileBasedCore5, FileBasedCore6. FileBased specify folder using Settings.TemplateFolder
1515
Settings.GeneratorType = GeneratorType.EfCore; // EfCore, Ef6, Custom. Custom edit GeneratorCustom class to provide your own implementation
1616

17-
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2 & 3. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated.
17+
Settings.UseMappingTables = false; // Must be false for TemplateType.EfCore2-4. If true, mapping will be used, and no mapping tables will be generated. If false, all tables will be generated.
1818
Settings.FileManagerType = FileManagerType.EfCore; // .NET Core project = EfCore; .NET project = VisualStudio; No output (testing only) = Null
1919
Settings.ConnectionString = "Data Source=(local);Initial Catalog=EfrpgTest;Integrated Security=True;MultipleActiveResultSets=True;Encrypt=false;TrustServerCertificate=true"; // This is used by the generator to reverse engineer your database
2020
Settings.ConnectionStringName = "EnumViaTablesDbContext"; // ConnectionString key as specified in your app.config/web.config/appsettings.json. Not used by the generator, but is placed into the generated DbContext constructor.

‎Tester.Integration.EFCore6/Northwind.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Settings.TemplateType = TemplateType.EfCore6; // EfCore6, EfCore5, EfCore3, EfCore2, Ef6, FileBasedCore2, FileBasedCore3, FileBasedCore5, FileBasedCore6. FileBased specify folder using Settings.TemplateFolder
1515
Settings.GeneratorType = GeneratorType.EfCore; // EfCore, Ef6, Custom. Custom edit GeneratorCustom class to provide your own implementation
1616

17-
Settings.UseMappingTables = true; // Must be false for TemplateType.EfCore2 & 3. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated.
17+
Settings.UseMappingTables = true; // Must be false for TemplateType.EfCore2-4. If true, mapping will be used, and no mapping tables will be generated. If false, all tables will be generated.
1818
Settings.FileManagerType = FileManagerType.EfCore; // .NET Core project = EfCore; .NET project = VisualStudio; No output (testing only) = Null
1919
Settings.ConnectionString = "Data Source=(local);Initial Catalog=Northwind;Integrated Security=True;MultipleActiveResultSets=True;Encrypt=false;TrustServerCertificate=true"; // This is used by the generator to reverse engineer your database
2020
Settings.ConnectionStringName = "NorthwindDbContext"; // ConnectionString key as specified in your app.config/web.config/appsettings.json. Not used by the generator, but is placed into the generated DbContext constructor.

0 commit comments

Comments
 (0)