Skip to content

Commit 0e40b48

Browse files
ThatRendleThatRendle
committed
Merging from Github
2 parents b9da611 + dd0e464 commit 0e40b48

5 files changed

Lines changed: 867 additions & 834 deletions

File tree

‎Simple.Data.Ado/Simple.Data.Ado.csproj‎

Lines changed: 174 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -1,175 +1,175 @@
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)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>Simple.Data.Ado</RootNamespace>
12-
<AssemblyName>Simple.Data.Ado</AssemblyName>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<CodeAnalysisRuleSet>SecurityRules.ruleset</CodeAnalysisRuleSet>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Mono|AnyCPU' ">
34-
<DebugType>pdbonly</DebugType>
35-
<Optimize>true</Optimize>
36-
<OutputPath>bin\Release\</OutputPath>
37-
<DefineConstants>TRACE</DefineConstants>
38-
<ErrorReport>prompt</ErrorReport>
39-
<WarningLevel>4</WarningLevel>
40-
</PropertyGroup>
41-
<ItemGroup>
42-
<Reference Include="System" />
43-
<Reference Include="System.ComponentModel.Composition" />
44-
<Reference Include="System.Configuration" />
45-
<Reference Include="System.Core" />
46-
<Reference Include="System.Xml.Linq" />
47-
<Reference Include="System.Data.DataSetExtensions" />
48-
<Reference Include="Microsoft.CSharp" />
49-
<Reference Include="System.Data" />
50-
<Reference Include="System.Xml" />
51-
</ItemGroup>
52-
<ItemGroup>
53-
<Compile Include="..\CommonAssemblyInfo.cs">
54-
<Link>CommonAssemblyInfo.cs</Link>
55-
</Compile>
56-
<Compile Include="AdoAdapter.cs" />
57-
<Compile Include="AdoAdapter.IAdapterWithRelation.cs" />
58-
<Compile Include="AdoAdapter.IAdapterWithTransactions.cs" />
59-
<Compile Include="AdoAdapterException.cs" />
60-
<Compile Include="AdoAdapterFinder.cs" />
61-
<Compile Include="AdoAdapterGetter.cs" />
62-
<Compile Include="AdoAdapterInserter.cs" />
63-
<Compile Include="AdoAdapterQueryRunner.cs" />
64-
<Compile Include="AdoAdapterRelatedFinder.cs" />
65-
<Compile Include="AdoAdapterTransaction.cs" />
66-
<Compile Include="AdoAdapterUpserter.cs" />
67-
<Compile Include="AdoOptions.cs" />
68-
<Compile Include="BulkInserter.cs" />
69-
<Compile Include="BulkInserterHelper.cs" />
70-
<Compile Include="BulkInserterTransactionHelper.cs" />
71-
<Compile Include="BulkUpdater.cs" />
72-
<Compile Include="CommandBuilder.cs" />
73-
<Compile Include="CommandHelper.cs" />
74-
<Compile Include="CommandTemplate.cs" />
75-
<Compile Include="ConnectionEx.cs" />
76-
<Compile Include="ConnectionScope.cs" />
77-
<Compile Include="DatabaseObservable.cs" />
78-
<Compile Include="DataParameterCollectionEx.cs" />
79-
<Compile Include="DataReaderEnumerable.cs" />
80-
<Compile Include="DataReaderExtensions.cs" />
81-
<Compile Include="DataReaderMultipleEnumerator.cs" />
82-
<Compile Include="DataRecordExtensions.cs" />
83-
<Compile Include="DbCommandExtensions.cs" />
84-
<Compile Include="DbConnectionEx.cs" />
85-
<Compile Include="DbConnectionExtensions.cs" />
86-
<Compile Include="DelegatingConnectionBase1.cs" />
87-
<Compile Include="DeleteHelper.cs" />
88-
<Compile Include="DictionaryExtensions.cs" />
89-
<Compile Include="EagerLoadingEnumerable.cs" />
90-
<Compile Include="EventHandlerEx.cs" />
91-
<Compile Include="ExpressionFormatter.cs" />
92-
<Compile Include="ExpressionFormatterBase.cs" />
93-
<Compile Include="ExpressionHasher.cs" />
94-
<Compile Include="FindHelper.cs" />
95-
<Compile Include="FunctionNameConverter.cs" />
96-
<Compile Include="GenericDbParameterFactory.cs" />
97-
<Compile Include="HomogenizedDictionaryIndex.cs" />
98-
<Compile Include="IBulkInserter.cs" />
99-
<Compile Include="IBulkUpdater.cs" />
100-
<Compile Include="ICommandBuilder.cs" />
101-
<Compile Include="IConnectionProvider.cs" />
102-
<Compile Include="ICustomInserter.cs" />
103-
<Compile Include="ICustomQueryBuilder.cs" />
104-
<Compile Include="IDbParameterFactory.cs" />
105-
<Compile Include="IExpressionFormatter.cs" />
106-
<Compile Include="IFunctionNameConverter.cs" />
107-
<Compile Include="IObservableQueryRunner.cs" />
108-
<Compile Include="IQueryPager.cs" />
109-
<Compile Include="ISchemaGetter.cs" />
110-
<Compile Include="ISqlOptimizer.cs" />
111-
<Compile Include="Joiner.cs" />
112-
<Compile Include="ListExtensions.cs" />
113-
<Compile Include="OptimizedDictionary.cs" />
114-
<Compile Include="OptimizedDictionaryIndex.cs" />
115-
<Compile Include="OptimizedDictionary2.cs" />
116-
<Compile Include="AdoOptimizingDelegateFactory.cs" />
117-
<Compile Include="ParameterTemplate.cs" />
118-
<Compile Include="ProcedureExecutor.cs" />
119-
<Compile Include="Properties\AssemblyInfo.cs" />
120-
<Compile Include="Properties\Settings.Designer.cs">
121-
<AutoGen>True</AutoGen>
122-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
123-
<DependentUpon>Settings.settings</DependentUpon>
124-
</Compile>
125-
<Compile Include="ProviderAssemblyAttributeBase.cs" />
126-
<Compile Include="ProviderHelper.cs" />
127-
<Compile Include="QueryBuilder.cs" />
128-
<Compile Include="QueryBuilderBase.cs" />
129-
<Compile Include="SimpleReferenceFormatter.cs" />
130-
<Compile Include="SchemaResolutionException.cs" />
131-
<Compile Include="Schema\AmbiguousObjectNameException.cs" />
132-
<Compile Include="Schema\Column.cs" />
133-
<Compile Include="Schema\ColumnCollection.cs" />
134-
<Compile Include="Schema\DatabaseSchema.cs" />
135-
<Compile Include="Schema\ForeignKey.cs" />
136-
<Compile Include="Schema\ForeignKeyCollection.cs" />
137-
<Compile Include="Schema\ISchemaProvider.cs" />
138-
<Compile Include="Schema\Key.cs" />
139-
<Compile Include="Schema\Parameter.cs" />
140-
<Compile Include="Schema\Procedure.cs" />
141-
<Compile Include="Schema\ProcedureCollection.cs" />
142-
<Compile Include="Schema\Table.cs" />
143-
<Compile Include="Schema\TableCollection.cs" />
144-
<Compile Include="Schema\TableJoin.cs" />
145-
<Compile Include="Schema\TableType.cs" />
146-
<Compile Include="ObjectName.cs" />
147-
<Compile Include="SubDictionary.cs" />
148-
<Compile Include="TraceHelper.cs" />
149-
<Compile Include="TupleExtensions.cs" />
150-
<Compile Include="TypeHelper.cs" />
151-
<Compile Include="UpdateHelper.cs" />
152-
</ItemGroup>
153-
<ItemGroup>
154-
<ProjectReference Include="..\Simple.Data\Simple.Data.csproj">
155-
<Project>{148CEE80-2E84-4ABD-B5AB-20415B2BBD21}</Project>
156-
<Name>Simple.Data</Name>
157-
</ProjectReference>
158-
</ItemGroup>
159-
<ItemGroup>
160-
<Compile Include="AdoAdapter.IAdapterWithFunctions.cs" />
161-
<None Include="app.config" />
162-
<None Include="Properties\Settings.settings">
163-
<Generator>SettingsSingleFileGenerator</Generator>
164-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
165-
</None>
166-
</ItemGroup>
167-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
168-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
169-
Other similar extension points exist, see Microsoft.Common.targets.
170-
<Target Name="BeforeBuild">
171-
</Target>
172-
<Target Name="AfterBuild">
173-
</Target>
174-
-->
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)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>Simple.Data.Ado</RootNamespace>
12+
<AssemblyName>Simple.Data.Ado</AssemblyName>
13+
<FileAlignment>512</FileAlignment>
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<DebugSymbols>true</DebugSymbols>
17+
<DebugType>full</DebugType>
18+
<Optimize>false</Optimize>
19+
<OutputPath>bin\Debug\</OutputPath>
20+
<DefineConstants>DEBUG;TRACE</DefineConstants>
21+
<ErrorReport>prompt</ErrorReport>
22+
<WarningLevel>4</WarningLevel>
23+
<CodeAnalysisRuleSet>SecurityRules.ruleset</CodeAnalysisRuleSet>
24+
</PropertyGroup>
25+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26+
<DebugType>pdbonly</DebugType>
27+
<Optimize>true</Optimize>
28+
<OutputPath>bin\Release\</OutputPath>
29+
<DefineConstants>TRACE</DefineConstants>
30+
<ErrorReport>prompt</ErrorReport>
31+
<WarningLevel>4</WarningLevel>
32+
</PropertyGroup>
33+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Mono|AnyCPU' ">
34+
<DebugType>pdbonly</DebugType>
35+
<Optimize>true</Optimize>
36+
<OutputPath>bin\Release\</OutputPath>
37+
<DefineConstants>TRACE</DefineConstants>
38+
<ErrorReport>prompt</ErrorReport>
39+
<WarningLevel>4</WarningLevel>
40+
</PropertyGroup>
41+
<ItemGroup>
42+
<Reference Include="System" />
43+
<Reference Include="System.ComponentModel.Composition" />
44+
<Reference Include="System.Configuration" />
45+
<Reference Include="System.Core" />
46+
<Reference Include="System.Xml.Linq" />
47+
<Reference Include="System.Data.DataSetExtensions" />
48+
<Reference Include="Microsoft.CSharp" />
49+
<Reference Include="System.Data" />
50+
<Reference Include="System.Xml" />
51+
</ItemGroup>
52+
<ItemGroup>
53+
<Compile Include="..\CommonAssemblyInfo.cs">
54+
<Link>CommonAssemblyInfo.cs</Link>
55+
</Compile>
56+
<Compile Include="AdoAdapter.cs" />
57+
<Compile Include="AdoAdapter.IAdapterWithRelation.cs" />
58+
<Compile Include="AdoAdapter.IAdapterWithTransactions.cs" />
59+
<Compile Include="AdoAdapterException.cs" />
60+
<Compile Include="AdoAdapterFinder.cs" />
61+
<Compile Include="AdoAdapterGetter.cs" />
62+
<Compile Include="AdoAdapterInserter.cs" />
63+
<Compile Include="AdoAdapterQueryRunner.cs" />
64+
<Compile Include="AdoAdapterRelatedFinder.cs" />
65+
<Compile Include="AdoAdapterTransaction.cs" />
66+
<Compile Include="AdoAdapterUpserter.cs" />
67+
<Compile Include="AdoOptions.cs" />
68+
<Compile Include="BulkInserter.cs" />
69+
<Compile Include="BulkInserterHelper.cs" />
70+
<Compile Include="BulkInserterTransactionHelper.cs" />
71+
<Compile Include="BulkUpdater.cs" />
72+
<Compile Include="CommandBuilder.cs" />
73+
<Compile Include="CommandHelper.cs" />
74+
<Compile Include="CommandTemplate.cs" />
75+
<Compile Include="ConnectionEx.cs" />
76+
<Compile Include="ConnectionScope.cs" />
77+
<Compile Include="DatabaseObservable.cs" />
78+
<Compile Include="DataParameterCollectionEx.cs" />
79+
<Compile Include="DataReaderEnumerable.cs" />
80+
<Compile Include="DataReaderExtensions.cs" />
81+
<Compile Include="DataReaderMultipleEnumerator.cs" />
82+
<Compile Include="DataRecordExtensions.cs" />
83+
<Compile Include="DbCommandExtensions.cs" />
84+
<Compile Include="DbConnectionEx.cs" />
85+
<Compile Include="DbConnectionExtensions.cs" />
86+
<Compile Include="DelegatingConnectionBase1.cs" />
87+
<Compile Include="DeleteHelper.cs" />
88+
<Compile Include="DictionaryExtensions.cs" />
89+
<Compile Include="EagerLoadingEnumerable.cs" />
90+
<Compile Include="EventHandlerEx.cs" />
91+
<Compile Include="ExpressionFormatter.cs" />
92+
<Compile Include="ExpressionFormatterBase.cs" />
93+
<Compile Include="ExpressionHasher.cs" />
94+
<Compile Include="FindHelper.cs" />
95+
<Compile Include="FunctionNameConverter.cs" />
96+
<Compile Include="GenericDbParameterFactory.cs" />
97+
<Compile Include="HomogenizedDictionaryIndex.cs" />
98+
<Compile Include="IBulkInserter.cs" />
99+
<Compile Include="IBulkUpdater.cs" />
100+
<Compile Include="ICommandBuilder.cs" />
101+
<Compile Include="IConnectionProvider.cs" />
102+
<Compile Include="ICustomInserter.cs" />
103+
<Compile Include="ICustomQueryBuilder.cs" />
104+
<Compile Include="IDbParameterFactory.cs" />
105+
<Compile Include="IExpressionFormatter.cs" />
106+
<Compile Include="IFunctionNameConverter.cs" />
107+
<Compile Include="IObservableQueryRunner.cs" />
108+
<Compile Include="IQueryPager.cs" />
109+
<Compile Include="ISchemaGetter.cs" />
110+
<Compile Include="ISqlOptimizer.cs" />
111+
<Compile Include="Joiner.cs" />
112+
<Compile Include="ListExtensions.cs" />
113+
<Compile Include="OptimizedDictionary.cs" />
114+
<Compile Include="OptimizedDictionaryIndex.cs" />
115+
<Compile Include="OptimizedDictionary2.cs" />
116+
<Compile Include="AdoOptimizingDelegateFactory.cs" />
117+
<Compile Include="ParameterTemplate.cs" />
118+
<Compile Include="ProcedureExecutor.cs" />
119+
<Compile Include="Properties\AssemblyInfo.cs" />
120+
<Compile Include="Properties\Settings.Designer.cs">
121+
<AutoGen>True</AutoGen>
122+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
123+
<DependentUpon>Settings.settings</DependentUpon>
124+
</Compile>
125+
<Compile Include="ProviderAssemblyAttributeBase.cs" />
126+
<Compile Include="ProviderHelper.cs" />
127+
<Compile Include="QueryBuilder.cs" />
128+
<Compile Include="QueryBuilderBase.cs" />
129+
<Compile Include="SimpleReferenceFormatter.cs" />
130+
<Compile Include="SchemaResolutionException.cs" />
131+
<Compile Include="Schema\AmbiguousObjectNameException.cs" />
132+
<Compile Include="Schema\Column.cs" />
133+
<Compile Include="Schema\ColumnCollection.cs" />
134+
<Compile Include="Schema\DatabaseSchema.cs" />
135+
<Compile Include="Schema\ForeignKey.cs" />
136+
<Compile Include="Schema\ForeignKeyCollection.cs" />
137+
<Compile Include="Schema\ISchemaProvider.cs" />
138+
<Compile Include="Schema\Key.cs" />
139+
<Compile Include="Schema\Parameter.cs" />
140+
<Compile Include="Schema\Procedure.cs" />
141+
<Compile Include="Schema\ProcedureCollection.cs" />
142+
<Compile Include="Schema\Table.cs" />
143+
<Compile Include="Schema\TableCollection.cs" />
144+
<Compile Include="Schema\TableJoin.cs" />
145+
<Compile Include="Schema\TableType.cs" />
146+
<Compile Include="ObjectName.cs" />
147+
<Compile Include="SubDictionary.cs" />
148+
<Compile Include="TraceHelper.cs" />
149+
<Compile Include="TupleExtensions.cs" />
150+
<Compile Include="TypeHelper.cs" />
151+
<Compile Include="UpdateHelper.cs" />
152+
</ItemGroup>
153+
<ItemGroup>
154+
<ProjectReference Include="..\Simple.Data\Simple.Data.csproj">
155+
<Project>{148CEE80-2E84-4ABD-B5AB-20415B2BBD21}</Project>
156+
<Name>Simple.Data</Name>
157+
</ProjectReference>
158+
</ItemGroup>
159+
<ItemGroup>
160+
<Compile Include="AdoAdapter.IAdapterWithFunctions.cs" />
161+
<None Include="app.config" />
162+
<None Include="Properties\Settings.settings">
163+
<Generator>SettingsSingleFileGenerator</Generator>
164+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
165+
</None>
166+
</ItemGroup>
167+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
168+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
169+
Other similar extension points exist, see Microsoft.Common.targets.
170+
<Target Name="BeforeBuild">
171+
</Target>
172+
<Target Name="AfterBuild">
173+
</Target>
174+
-->
175175
</Project>

‎Simple.Data.InMemoryTest/InMemoryTests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ public void TestFindAllByPartialName()
9090
{
9191
Database.UseMockAdapter(new InMemoryAdapter());
9292
var db = Database.Open();
93-
db.Test.Insert(Id: 1, Name: "Alice");
94-
db.Test.Insert(Id: 2, Name: "Bob");
95-
db.Test.Insert(Id: 2, Name: "Clive");
96-
List<dynamic> records = db.Test.FindAll(db.Test.Name.Like("A%")).ToList();
93+
db.MySchema.Test.Insert(Id: 1, Name: "Alice");
94+
db.MySchema.Test.Insert(Id: 2, Name: "Bob");
95+
db.MySchema.Test.Insert(Id: 2, Name: "Clive");
96+
List<dynamic> records = db.MySchema.Test.FindAll(db.MySchema.Test.Name.Like("A%")).ToList();
9797
Assert.IsNotNull(records);
9898
Assert.AreEqual(1, records.Count);
9999
}
@@ -103,10 +103,10 @@ public void TestFindAllByExcludedPartialName()
103103
{
104104
Database.UseMockAdapter(new InMemoryAdapter());
105105
var db = Database.Open();
106-
db.Test.Insert(Id: 1, Name: "Alice");
107-
db.Test.Insert(Id: 2, Name: "Bob");
108-
db.Test.Insert(Id: 2, Name: "Clive");
109-
List<dynamic> records = db.Test.FindAll(db.Test.Name.NotLike("A%")).ToList();
106+
db.MySchema.Test.Insert(Id: 1, Name: "Alice");
107+
db.MySchema.Test.Insert(Id: 2, Name: "Bob");
108+
db.MySchema.Test.Insert(Id: 2, Name: "Clive");
109+
List<dynamic> records = db.MySchema.Test.FindAll(db.MySchema.Test.Name.NotLike("A%")).ToList();
110110
Assert.IsNotNull(records);
111111
Assert.AreEqual(2, records.Count);
112112
}

0 commit comments

Comments
 (0)