support mode : TableToFile(default), RowMapToFile , TableToDir

README.md

@@ -20,7 +20,7 @@ mode: TableToDir
     table               :   "xxx/{{databaseName}}/{{tableName}}"
     row                 :   "xxx/{{databaseName}}/{{tableName}}/{{key}}.json"
 
-mode: TableToFile(default),RowMapToFile
+mode: TableToFile(default), RowMapToFile
     connectionString    :   "xxx/{{databaseName}}"
     table               :   "xxx/{{databaseName}}/{{tableName}}.json"
 
@@ -201,6 +201,7 @@ dotnet add package Vitorm.File
     "Data": [
       {
         "provider": "File",
+        "mode": "TableToFile",
         "namespace": "App",
         "connectionString": "Data/db_orm"
       }
@@ -313,7 +314,8 @@ namespace App
 
 
 # Examples:  
-[Test Example](https://github.com/Vit-Orm/Vitorm.File/tree/master/test/Vitorm.File.MsTest)    
+[Vitorm Example](https://github.com/Vit-Orm/Vitorm.File/tree/master/test/Vitorm.File.TableToFile.MsTest)    
+[Vitorm.Data Example](https://github.com/Vit-Orm/Vitorm.File/tree/master/test/Vitorm.File.Data.TableToFile.MsTest)    
 
 
 

Vitorm.File.sln

@@ -19,9 +19,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{05176905-A2A
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vitorm.File", "src\Vitorm.File\Vitorm.File.csproj", "{7AC01F47-AD5A-4B61-9F05-38094C1EF23B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vitorm.File.MsTest", "test\Vitorm.File.MsTest\Vitorm.File.MsTest.csproj", "{42E0FE60-9E3B-4B59-A69E-E50A20C89D6D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vitorm.File.TableToDir.MsTest", "test\Vitorm.File.TableToDir.MsTest\Vitorm.File.TableToDir.MsTest.csproj", "{9680663A-153D-4A9A-AEEA-B19FC87387B2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vitorm.File.Data.MsTest", "test\Vitorm.File.Data.MsTest\Vitorm.File.Data.MsTest.csproj", "{EB69697B-0CDB-4A28-AACF-22C31137DDE9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vitorm.File.TableToFile.Data.MsTest", "test\Vitorm.File.TableToFile.Data.MsTest\Vitorm.File.TableToFile.Data.MsTest.csproj", "{8E09B825-1A18-4396-A511-36C223F89929}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vitorm.File.TableToFile.MsTest", "test\Vitorm.File.TableToFile.MsTest\Vitorm.File.TableToFile.MsTest.csproj", "{06FAF2EB-B9B4-48FE-BDC6-A23EF641810A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vitorm.File.TableToDir.Data.MsTest", "test\Vitorm.File.TableToDir.Data.MsTest\Vitorm.File.TableToDir.Data.MsTest.csproj", "{320C7A91-D550-45BE-AE91-88C048D66BC9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vitorm.File.RowMapToFile.Data.MsTest", "test\Vitorm.File.RowMapToFile.Data.MsTest\Vitorm.File.RowMapToFile.Data.MsTest.csproj", "{40485AE4-63B6-4343-96D1-368A260A369F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vitorm.File.RowMapToFile.MsTest", "test\Vitorm.File.RowMapToFile.MsTest\Vitorm.File.RowMapToFile.MsTest.csproj", "{ADAFA427-7133-4D5F-90A0-874D9338D4AF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,22 +41,42 @@ Global
 		{7AC01F47-AD5A-4B61-9F05-38094C1EF23B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7AC01F47-AD5A-4B61-9F05-38094C1EF23B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7AC01F47-AD5A-4B61-9F05-38094C1EF23B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42E0FE60-9E3B-4B59-A69E-E50A20C89D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42E0FE60-9E3B-4B59-A69E-E50A20C89D6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42E0FE60-9E3B-4B59-A69E-E50A20C89D6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42E0FE60-9E3B-4B59-A69E-E50A20C89D6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB69697B-0CDB-4A28-AACF-22C31137DDE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB69697B-0CDB-4A28-AACF-22C31137DDE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB69697B-0CDB-4A28-AACF-22C31137DDE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB69697B-0CDB-4A28-AACF-22C31137DDE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9680663A-153D-4A9A-AEEA-B19FC87387B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9680663A-153D-4A9A-AEEA-B19FC87387B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9680663A-153D-4A9A-AEEA-B19FC87387B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9680663A-153D-4A9A-AEEA-B19FC87387B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E09B825-1A18-4396-A511-36C223F89929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E09B825-1A18-4396-A511-36C223F89929}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E09B825-1A18-4396-A511-36C223F89929}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E09B825-1A18-4396-A511-36C223F89929}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06FAF2EB-B9B4-48FE-BDC6-A23EF641810A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06FAF2EB-B9B4-48FE-BDC6-A23EF641810A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06FAF2EB-B9B4-48FE-BDC6-A23EF641810A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06FAF2EB-B9B4-48FE-BDC6-A23EF641810A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{320C7A91-D550-45BE-AE91-88C048D66BC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{320C7A91-D550-45BE-AE91-88C048D66BC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{320C7A91-D550-45BE-AE91-88C048D66BC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{320C7A91-D550-45BE-AE91-88C048D66BC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40485AE4-63B6-4343-96D1-368A260A369F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40485AE4-63B6-4343-96D1-368A260A369F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40485AE4-63B6-4343-96D1-368A260A369F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40485AE4-63B6-4343-96D1-368A260A369F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADAFA427-7133-4D5F-90A0-874D9338D4AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADAFA427-7133-4D5F-90A0-874D9338D4AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADAFA427-7133-4D5F-90A0-874D9338D4AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADAFA427-7133-4D5F-90A0-874D9338D4AF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{7AC01F47-AD5A-4B61-9F05-38094C1EF23B} = {05176905-A2A5-4015-9F04-2904506C902F}
-		{42E0FE60-9E3B-4B59-A69E-E50A20C89D6D} = {7904FE51-04FF-4477-8E3A-CC340389EE32}
-		{EB69697B-0CDB-4A28-AACF-22C31137DDE9} = {7904FE51-04FF-4477-8E3A-CC340389EE32}
+		{9680663A-153D-4A9A-AEEA-B19FC87387B2} = {7904FE51-04FF-4477-8E3A-CC340389EE32}
+		{8E09B825-1A18-4396-A511-36C223F89929} = {7904FE51-04FF-4477-8E3A-CC340389EE32}
+		{06FAF2EB-B9B4-48FE-BDC6-A23EF641810A} = {7904FE51-04FF-4477-8E3A-CC340389EE32}
+		{320C7A91-D550-45BE-AE91-88C048D66BC9} = {7904FE51-04FF-4477-8E3A-CC340389EE32}
+		{40485AE4-63B6-4343-96D1-368A260A369F} = {7904FE51-04FF-4477-8E3A-CC340389EE32}
+		{ADAFA427-7133-4D5F-90A0-874D9338D4AF} = {7904FE51-04FF-4477-8E3A-CC340389EE32}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C7DA16E3-9949-49FA-B0B4-F830636DE60F}

doc/ReleaseNotes.md

@@ -1 +1,7 @@
 # Vitorm.File ReleaseNotes
+
+-----------------------
+# 2.2.0
+- support mode : TableToFile(default), RowMapToFile , TableToDir
+
+

src/Vitorm.File/DbConfig.cs

@@ -42,9 +42,9 @@ namespace Vitorm.File
         {
             var _connectionString = Path.Combine(Path.GetDirectoryName(connectionString), databaseName);
 
-            return new DbConfig(_connectionString);
+            return new DbConfig(_connectionString, mode);
         }
 
-        internal string dbHashCode => connectionString.GetHashCode().ToString();
+        internal string dbHashCode => (connectionString + (mode ?? "TableToFile")).GetHashCode().ToString();
     }
 }

src/Vitorm.File/DbContext.cs

@@ -14,6 +14,9 @@ namespace Vitorm.File
         public DbContext(string connectionString) : this(new DbConfig(connectionString))
         {
         }
+        public DbContext(string connectionString, string mode) : this(new DbConfig(connectionString, mode))
+        {
+        }
 
 
         #region Transaction

src/Vitorm.File/DbSetConstructor.cs

@@ -19,7 +19,7 @@ namespace Vitorm.File
         {
             // TableToFile(default), TableToDir , RowMapToFile
             if (dbContext.dbConfig.mode == "TableToDir") return new DbSet_TableToDir<Entity, EntityKey>(dbContext, entityDescriptor);
-            if (dbContext.dbConfig.mode == "TableMapToFile") return new DbSet_RowMapToFile<Entity, EntityKey>(dbContext, entityDescriptor);
+            if (dbContext.dbConfig.mode == "RowMapToFile") return new DbSet_RowMapToFile<Entity, EntityKey>(dbContext, entityDescriptor);
 
             return new DbSet_TableToFile<Entity, EntityKey>(dbContext, entityDescriptor);
         }

test/Vitorm.File.RowMapToFile.Data.MsTest/Vitorm.File.RowMapToFile.Data.MsTest.csproj

@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="..\..\src\Versions.props" />
+
+    <PropertyGroup>
+        <test>MSTest</test>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+        <RootNamespace>Vitorm.MsTest</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+
+        <PackageReference Include="Vitorm.Data" Version="$(Vitorm_Version)"  />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\Vitorm.File\Vitorm.File.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\Vitorm.File.TableToFile.Data.MsTest\CommonTest\*.cs" Link="CommonTest\%(RecursiveDir)%(FileName)%(Extension)" />
+    </ItemGroup>
+    
+    <ItemGroup>
+        <None Update="appsettings.json">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
+</Project>

test/Vitorm.File.RowMapToFile.Data.MsTest/appsettings.json

@@ -0,0 +1,12 @@
+{
+  "Vitorm": {
+    "Data": [
+      {
+        "provider": "File",
+        "mode": "RowMapToFile",
+        "namespace": "Vitorm.MsTest",
+        "connectionString": "Data/db_orm"
+      }
+    ]
+  }
+}

test/Vitorm.File.RowMapToFile.MsTest/Vitorm.File.RowMapToFile.MsTest.csproj

@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <test>MSTest</test>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+        <RootNamespace>Vitorm.MsTest</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\Vitorm.File\Vitorm.File.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\Vitorm.File.TableToFile.MsTest\CommonTest\*.cs" Link="CommonTest\%(RecursiveDir)%(FileName)%(Extension)" />
+        <Compile Include="..\Vitorm.File.TableToFile.MsTest\DataSource.cs" Link="DataSource.cs" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Update="appsettings.json">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
+</Project>

test/Vitorm.File.RowMapToFile.MsTest/appsettings.json

@@ -0,0 +1,12 @@
+{
+  "Vitorm": {
+    "Data": [
+      {
+        "provider": "File",
+        "mode": "RowMapToFile",
+        "namespace": "Vitorm.MsTest",
+        "connectionString": "Data/db_orm"
+      }
+    ]
+  }
+}

test/Vitorm.File.TableToDir.Data.MsTest/Vitorm.File.TableToDir.Data.MsTest.csproj

@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="..\..\src\Versions.props" />
+
+    <PropertyGroup>
+        <test>MSTest</test>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+        <RootNamespace>Vitorm.MsTest</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+
+        <PackageReference Include="Vitorm.Data" Version="$(Vitorm_Version)"  />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\Vitorm.File\Vitorm.File.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\Vitorm.File.TableToFile.Data.MsTest\CommonTest\*.cs" Link="CommonTest\%(RecursiveDir)%(FileName)%(Extension)" />
+    </ItemGroup>
+    
+    <ItemGroup>
+        <None Update="appsettings.json">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
+</Project>

test/Vitorm.File.Data.MsTest/appsettings.json → test/Vitorm.File.TableToDir.Data.MsTest/appsettings.json

@@ -3,6 +3,7 @@
     "Data": [
       {
         "provider": "File",
+        "mode": "TableToDir",
         "namespace": "Vitorm.MsTest",
         "connectionString": "Data/db_orm"
       }

test/Vitorm.File.TableToDir.MsTest/Vitorm.File.TableToDir.MsTest.csproj

@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <test>MSTest</test>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+        <RootNamespace>Vitorm.MsTest</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\Vitorm.File\Vitorm.File.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\Vitorm.File.TableToFile.MsTest\CommonTest\*.cs" Link="CommonTest\%(RecursiveDir)%(FileName)%(Extension)" />
+        <Compile Include="..\Vitorm.File.TableToFile.MsTest\DataSource.cs" Link="DataSource.cs" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Update="appsettings.json">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
+</Project>

test/Vitorm.File.TableToDir.MsTest/appsettings.json

@@ -0,0 +1,12 @@
+{
+  "Vitorm": {
+    "Data": [
+      {
+        "provider": "File",
+        "mode": "TableToDir",
+        "namespace": "Vitorm.MsTest",
+        "connectionString": "Data/db_orm"
+      }
+    ]
+  }
+}

test/Vitorm.File.TableToFile.Data.MsTest/appsettings.json

@@ -0,0 +1,12 @@
+{
+  "Vitorm": {
+    "Data": [
+      {
+        "provider": "File",
+        "mode": "TableToFile",
+        "namespace": "Vitorm.MsTest",
+        "connectionString": "Data/db_orm"
+      }
+    ]
+  }
+}

test/Vitorm.File.MsTest/DataSource.cs → test/Vitorm.File.TableToFile.MsTest/DataSource.cs

@@ -1,5 +1,7 @@
 namespace Vitorm.MsTest
 {
+    using Vit.Core.Util.ConfigurationManager;
+
     using DbContext = Vitorm.File.DbContext;
 
     [System.ComponentModel.DataAnnotations.Schema.Table("User")]
@@ -59,10 +61,10 @@
         public static DbContext CreateDbContextForWriting(bool autoInit = true) => CreateDbContext(autoInit);
         public static DbContext CreateDbContext(bool autoInit = true)
         {
-            var guid = Guid.NewGuid().ToString();
-            var filePath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Data", $"{guid}");
+            string connectionString = Appsettings.json.GetStringByPath("Vitorm.Data[0].connectionString");
+            string mode = Appsettings.json.GetStringByPath("Vitorm.Data[0].mode");
 
-            var dbContext = new Vitorm.File.DbContext(filePath);
+            var dbContext = new Vitorm.File.DbContext(connectionString, mode);
 
             if (autoInit)
                 InitDbContext(dbContext);

test/Vitorm.File.MsTest/Vitorm.File.MsTest.csproj → test/Vitorm.File.TableToFile.MsTest/Vitorm.File.TableToFile.MsTest.csproj

@@ -14,15 +14,19 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
         <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
         <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+    </ItemGroup>
 
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\Vitorm.File\Vitorm.File.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Vitorm.File\Vitorm.File.csproj" />
+        <None Update="appsettings.json">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
     </ItemGroup>
 
 </Project>

test/Vitorm.File.TableToFile.MsTest/appsettings.json

@@ -0,0 +1,12 @@
+{
+  "Vitorm": {
+    "Data": [
+      {
+        "provider": "File",
+        "mode": "TableToFile",
+        "namespace": "Vitorm.MsTest",
+        "connectionString": "Data/db_orm"
+      }
+    ]
+  }
+}