Skip to content

Commit 96eb30e

Browse files
committed
Merge dict-query branch
2 parents 846929a + 01cd70a commit 96eb30e

312 files changed

Lines changed: 27430 additions & 84667 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,10 @@ apply_config.bat
2020
NDependOut
2121
*.dotCover
2222
*_mm_cache.bin
23+
<<<<<<< HEAD
2324
Simple.Data.sln.DotSettings.user
2425
Simple.Data/Simple.Data.idc
26+
=======
27+
*.idc
28+
Simple.Data.sln.DotSettings.user
29+
>>>>>>> dict-query

AutoTest.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<configuration>
3-
<mm-GraphProvider>BUILTINDARK</mm-GraphProvider>
4-
<ShouldIgnoreTestAssembly>
5-
<Assembly>Simple.Data.Sql*.dll</Assembly>
6-
</ShouldIgnoreTestAssembly>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<mm-GraphProvider>BUILTINDARK</mm-GraphProvider>
4+
<ShouldIgnoreTestAssembly>
5+
<Assembly>Simple.Data.Sql*.dll</Assembly>
6+
</ShouldIgnoreTestAssembly>
77
</configuration>

ProfilingApp/App.config

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
2-
<configuration>
3-
<configSections>
4-
</configSections>
5-
<connectionStrings>
6-
<add name="ProfilingApp.Properties.Settings.ConnectionString"
7-
connectionString="Data Source=.;Initial Catalog=SimpleDataProfiling;Integrated Security=true"
8-
providerName="System.Data.SqlClient" />
9-
</connectionStrings>
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<configSections>
4+
</configSections>
5+
<connectionStrings>
6+
<add name="ProfilingApp.Properties.Settings.ConnectionString"
7+
connectionString="Data Source=.;Initial Catalog=SimpleDataProfiling;Integrated Security=true"
8+
providerName="System.Data.SqlClient" />
9+
</connectionStrings>
1010
</configuration>

ProfilingApp/FindAllByTask.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
namespace ProfilingApp
2-
{
3-
using System;
4-
using Simple.Data;
5-
6-
class FindAllByTask : IProfileTask
7-
{
8-
public void Run()
9-
{
10-
for (int i = 1; i < 101; i++)
11-
{
12-
GetPostAndPrintTitle(i);
13-
}
14-
}
15-
16-
private static void GetPostAndPrintTitle(int i)
17-
{
18-
var post = Database.OpenConnection(Properties.Settings.Default.ConnectionString).Posts.FindAllById(i).FirstOrDefault();
19-
Console.WriteLine(post.Title);
20-
}
21-
}
1+
namespace ProfilingApp
2+
{
3+
using System;
4+
using Simple.Data;
5+
6+
class FindAllByTask : IProfileTask
7+
{
8+
public void Run()
9+
{
10+
for (int i = 1; i < 101; i++)
11+
{
12+
GetPostAndPrintTitle(i);
13+
}
14+
}
15+
16+
private static void GetPostAndPrintTitle(int i)
17+
{
18+
var post = Database.OpenConnection(Properties.Settings.Default.ConnectionString).Posts.FindAllById(i).FirstOrDefault();
19+
Console.WriteLine(post.Title);
20+
}
21+
}
2222
}

ProfilingApp/FindByTask.cs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
6-
namespace ProfilingApp
7-
{
8-
using Simple.Data;
9-
10-
class FindByTask : IProfileTask
11-
{
12-
public void Run()
13-
{
14-
for (int i = 1; i < 101; i++)
15-
{
16-
GetPostAndPrintTitle(i);
17-
}
18-
}
19-
20-
private static void GetPostAndPrintTitle(int i)
21-
{
22-
var post = Database.OpenConnection(Properties.Settings.Default.ConnectionString).Posts.FindById(i);
23-
Console.WriteLine(post.Title);
24-
}
25-
}
26-
}
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
6+
namespace ProfilingApp
7+
{
8+
using Simple.Data;
9+
10+
class FindByTask : IProfileTask
11+
{
12+
public void Run()
13+
{
14+
for (int i = 1; i < 101; i++)
15+
{
16+
GetPostAndPrintTitle(i);
17+
}
18+
}
19+
20+
private static void GetPostAndPrintTitle(int i)
21+
{
22+
var post = Database.OpenConnection(Properties.Settings.Default.ConnectionString).Posts.FindById(i);
23+
Console.WriteLine(post.Title);
24+
}
25+
}
26+
}

ProfilingApp/IProfileTask.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
namespace ProfilingApp
2-
{
3-
interface IProfileTask
4-
{
5-
void Run();
6-
}
1+
namespace ProfilingApp
2+
{
3+
interface IProfileTask
4+
{
5+
void Run();
6+
}
77
}

ProfilingApp/ProfilingApp.csproj

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,102 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{9AAF3008-8033-4A26-93D2-97928E7801E9}</ProjectGuid>
9-
<OutputType>Exe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>ProfilingApp</RootNamespace>
12-
<AssemblyName>ProfilingApp</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15-
<FileAlignment>512</FileAlignment>
16-
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
18-
<PlatformTarget>x86</PlatformTarget>
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
28-
<PlatformTarget>x86</PlatformTarget>
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="System" />
38-
<Reference Include="System.Core" />
39-
<Reference Include="System.Xml.Linq" />
40-
<Reference Include="System.Data.DataSetExtensions" />
41-
<Reference Include="Microsoft.CSharp" />
42-
<Reference Include="System.Data" />
43-
<Reference Include="System.Xml" />
44-
</ItemGroup>
45-
<ItemGroup>
46-
<Compile Include="FindAllByTask.cs" />
47-
<Compile Include="FindByTask.cs" />
48-
<Compile Include="IProfileTask.cs" />
49-
<Compile Include="Program.cs" />
50-
<Compile Include="Properties\AssemblyInfo.cs" />
51-
<Compile Include="Properties\Resources.Designer.cs">
52-
<AutoGen>True</AutoGen>
53-
<DesignTime>True</DesignTime>
54-
<DependentUpon>Resources.resx</DependentUpon>
55-
</Compile>
56-
<Compile Include="Properties\Settings.Designer.cs">
57-
<AutoGen>True</AutoGen>
58-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
59-
<DependentUpon>Settings.settings</DependentUpon>
60-
</Compile>
61-
<Compile Include="QueryWithCountTask.cs" />
62-
</ItemGroup>
63-
<ItemGroup>
64-
<ProjectReference Include="..\Simple.Data.Ado\Simple.Data.Ado.csproj">
65-
<Project>{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}</Project>
66-
<Name>Simple.Data.Ado</Name>
67-
</ProjectReference>
68-
<ProjectReference Include="..\Simple.Data.SqlServer\Simple.Data.SqlServer.csproj">
69-
<Project>{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}</Project>
70-
<Name>Simple.Data.SqlServer</Name>
71-
</ProjectReference>
72-
<ProjectReference Include="..\Simple.Data\Simple.Data.csproj">
73-
<Project>{148CEE80-2E84-4ABD-B5AB-20415B2BBD21}</Project>
74-
<Name>Simple.Data</Name>
75-
</ProjectReference>
76-
</ItemGroup>
77-
<ItemGroup>
78-
<None Include="App.config" />
79-
<None Include="Properties\Settings.settings">
80-
<Generator>SettingsSingleFileGenerator</Generator>
81-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
82-
</None>
83-
</ItemGroup>
84-
<ItemGroup>
85-
<EmbeddedResource Include="Properties\Resources.resx">
86-
<Generator>ResXFileCodeGenerator</Generator>
87-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
88-
</EmbeddedResource>
89-
</ItemGroup>
90-
<ItemGroup />
91-
<ItemGroup>
92-
<None Include="Resources\DatabaseResetSql.txt" />
93-
</ItemGroup>
94-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
95-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
96-
Other similar extension points exist, see Microsoft.Common.targets.
97-
<Target Name="BeforeBuild">
98-
</Target>
99-
<Target Name="AfterBuild">
100-
</Target>
101-
-->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{9AAF3008-8033-4A26-93D2-97928E7801E9}</ProjectGuid>
9+
<OutputType>Exe</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>ProfilingApp</RootNamespace>
12+
<AssemblyName>ProfilingApp</AssemblyName>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15+
<FileAlignment>512</FileAlignment>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
18+
<PlatformTarget>x86</PlatformTarget>
19+
<DebugSymbols>true</DebugSymbols>
20+
<DebugType>full</DebugType>
21+
<Optimize>false</Optimize>
22+
<OutputPath>bin\Debug\</OutputPath>
23+
<DefineConstants>DEBUG;TRACE</DefineConstants>
24+
<ErrorReport>prompt</ErrorReport>
25+
<WarningLevel>4</WarningLevel>
26+
</PropertyGroup>
27+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
28+
<PlatformTarget>x86</PlatformTarget>
29+
<DebugType>pdbonly</DebugType>
30+
<Optimize>true</Optimize>
31+
<OutputPath>bin\Release\</OutputPath>
32+
<DefineConstants>TRACE</DefineConstants>
33+
<ErrorReport>prompt</ErrorReport>
34+
<WarningLevel>4</WarningLevel>
35+
</PropertyGroup>
36+
<ItemGroup>
37+
<Reference Include="System" />
38+
<Reference Include="System.Core" />
39+
<Reference Include="System.Xml.Linq" />
40+
<Reference Include="System.Data.DataSetExtensions" />
41+
<Reference Include="Microsoft.CSharp" />
42+
<Reference Include="System.Data" />
43+
<Reference Include="System.Xml" />
44+
</ItemGroup>
45+
<ItemGroup>
46+
<Compile Include="FindAllByTask.cs" />
47+
<Compile Include="FindByTask.cs" />
48+
<Compile Include="IProfileTask.cs" />
49+
<Compile Include="Program.cs" />
50+
<Compile Include="Properties\AssemblyInfo.cs" />
51+
<Compile Include="Properties\Resources.Designer.cs">
52+
<AutoGen>True</AutoGen>
53+
<DesignTime>True</DesignTime>
54+
<DependentUpon>Resources.resx</DependentUpon>
55+
</Compile>
56+
<Compile Include="Properties\Settings.Designer.cs">
57+
<AutoGen>True</AutoGen>
58+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
59+
<DependentUpon>Settings.settings</DependentUpon>
60+
</Compile>
61+
<Compile Include="QueryWithCountTask.cs" />
62+
</ItemGroup>
63+
<ItemGroup>
64+
<ProjectReference Include="..\Simple.Data.Ado\Simple.Data.Ado.csproj">
65+
<Project>{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}</Project>
66+
<Name>Simple.Data.Ado</Name>
67+
</ProjectReference>
68+
<ProjectReference Include="..\Simple.Data.SqlServer\Simple.Data.SqlServer.csproj">
69+
<Project>{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}</Project>
70+
<Name>Simple.Data.SqlServer</Name>
71+
</ProjectReference>
72+
<ProjectReference Include="..\Simple.Data\Simple.Data.csproj">
73+
<Project>{148CEE80-2E84-4ABD-B5AB-20415B2BBD21}</Project>
74+
<Name>Simple.Data</Name>
75+
</ProjectReference>
76+
</ItemGroup>
77+
<ItemGroup>
78+
<None Include="App.config" />
79+
<None Include="Properties\Settings.settings">
80+
<Generator>SettingsSingleFileGenerator</Generator>
81+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
82+
</None>
83+
</ItemGroup>
84+
<ItemGroup>
85+
<EmbeddedResource Include="Properties\Resources.resx">
86+
<Generator>ResXFileCodeGenerator</Generator>
87+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
88+
</EmbeddedResource>
89+
</ItemGroup>
90+
<ItemGroup />
91+
<ItemGroup>
92+
<None Include="Resources\DatabaseResetSql.txt" />
93+
</ItemGroup>
94+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
95+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
96+
Other similar extension points exist, see Microsoft.Common.targets.
97+
<Target Name="BeforeBuild">
98+
</Target>
99+
<Target Name="AfterBuild">
100+
</Target>
101+
-->
102102
</Project>

0 commit comments

Comments
 (0)