Skip to content

Commit

Permalink
Merging from Github
Browse files Browse the repository at this point in the history
  • Loading branch information
@markrendle
markrendle committed Jan 25, 2013
2 parents b9da611 + dd0e464 commit 0e40b48
Show file tree
Hide file tree
Showing 5 changed files with 867 additions and 834 deletions.
348 changes: 174 additions & 174 deletions Simple.Data.Ado/Simple.Data.Ado.csproj
View file
@@ -1,175 +1,175 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Simple.Data.Ado</RootNamespace>
<AssemblyName>Simple.Data.Ado</AssemblyName>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>SecurityRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Mono|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="AdoAdapter.cs" />
<Compile Include="AdoAdapter.IAdapterWithRelation.cs" />
<Compile Include="AdoAdapter.IAdapterWithTransactions.cs" />
<Compile Include="AdoAdapterException.cs" />
<Compile Include="AdoAdapterFinder.cs" />
<Compile Include="AdoAdapterGetter.cs" />
<Compile Include="AdoAdapterInserter.cs" />
<Compile Include="AdoAdapterQueryRunner.cs" />
<Compile Include="AdoAdapterRelatedFinder.cs" />
<Compile Include="AdoAdapterTransaction.cs" />
<Compile Include="AdoAdapterUpserter.cs" />
<Compile Include="AdoOptions.cs" />
<Compile Include="BulkInserter.cs" />
<Compile Include="BulkInserterHelper.cs" />
<Compile Include="BulkInserterTransactionHelper.cs" />
<Compile Include="BulkUpdater.cs" />
<Compile Include="CommandBuilder.cs" />
<Compile Include="CommandHelper.cs" />
<Compile Include="CommandTemplate.cs" />
<Compile Include="ConnectionEx.cs" />
<Compile Include="ConnectionScope.cs" />
<Compile Include="DatabaseObservable.cs" />
<Compile Include="DataParameterCollectionEx.cs" />
<Compile Include="DataReaderEnumerable.cs" />
<Compile Include="DataReaderExtensions.cs" />
<Compile Include="DataReaderMultipleEnumerator.cs" />
<Compile Include="DataRecordExtensions.cs" />
<Compile Include="DbCommandExtensions.cs" />
<Compile Include="DbConnectionEx.cs" />
<Compile Include="DbConnectionExtensions.cs" />
<Compile Include="DelegatingConnectionBase1.cs" />
<Compile Include="DeleteHelper.cs" />
<Compile Include="DictionaryExtensions.cs" />
<Compile Include="EagerLoadingEnumerable.cs" />
<Compile Include="EventHandlerEx.cs" />
<Compile Include="ExpressionFormatter.cs" />
<Compile Include="ExpressionFormatterBase.cs" />
<Compile Include="ExpressionHasher.cs" />
<Compile Include="FindHelper.cs" />
<Compile Include="FunctionNameConverter.cs" />
<Compile Include="GenericDbParameterFactory.cs" />
<Compile Include="HomogenizedDictionaryIndex.cs" />
<Compile Include="IBulkInserter.cs" />
<Compile Include="IBulkUpdater.cs" />
<Compile Include="ICommandBuilder.cs" />
<Compile Include="IConnectionProvider.cs" />
<Compile Include="ICustomInserter.cs" />
<Compile Include="ICustomQueryBuilder.cs" />
<Compile Include="IDbParameterFactory.cs" />
<Compile Include="IExpressionFormatter.cs" />
<Compile Include="IFunctionNameConverter.cs" />
<Compile Include="IObservableQueryRunner.cs" />
<Compile Include="IQueryPager.cs" />
<Compile Include="ISchemaGetter.cs" />
<Compile Include="ISqlOptimizer.cs" />
<Compile Include="Joiner.cs" />
<Compile Include="ListExtensions.cs" />
<Compile Include="OptimizedDictionary.cs" />
<Compile Include="OptimizedDictionaryIndex.cs" />
<Compile Include="OptimizedDictionary2.cs" />
<Compile Include="AdoOptimizingDelegateFactory.cs" />
<Compile Include="ParameterTemplate.cs" />
<Compile Include="ProcedureExecutor.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Include="ProviderAssemblyAttributeBase.cs" />
<Compile Include="ProviderHelper.cs" />
<Compile Include="QueryBuilder.cs" />
<Compile Include="QueryBuilderBase.cs" />
<Compile Include="SimpleReferenceFormatter.cs" />
<Compile Include="SchemaResolutionException.cs" />
<Compile Include="Schema\AmbiguousObjectNameException.cs" />
<Compile Include="Schema\Column.cs" />
<Compile Include="Schema\ColumnCollection.cs" />
<Compile Include="Schema\DatabaseSchema.cs" />
<Compile Include="Schema\ForeignKey.cs" />
<Compile Include="Schema\ForeignKeyCollection.cs" />
<Compile Include="Schema\ISchemaProvider.cs" />
<Compile Include="Schema\Key.cs" />
<Compile Include="Schema\Parameter.cs" />
<Compile Include="Schema\Procedure.cs" />
<Compile Include="Schema\ProcedureCollection.cs" />
<Compile Include="Schema\Table.cs" />
<Compile Include="Schema\TableCollection.cs" />
<Compile Include="Schema\TableJoin.cs" />
<Compile Include="Schema\TableType.cs" />
<Compile Include="ObjectName.cs" />
<Compile Include="SubDictionary.cs" />
<Compile Include="TraceHelper.cs" />
<Compile Include="TupleExtensions.cs" />
<Compile Include="TypeHelper.cs" />
<Compile Include="UpdateHelper.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Simple.Data\Simple.Data.csproj">
<Project>{148CEE80-2E84-4ABD-B5AB-20415B2BBD21}</Project>
<Name>Simple.Data</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="AdoAdapter.IAdapterWithFunctions.cs" />
<None Include="app.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Simple.Data.Ado</RootNamespace>
<AssemblyName>Simple.Data.Ado</AssemblyName>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>SecurityRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Mono|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="AdoAdapter.cs" />
<Compile Include="AdoAdapter.IAdapterWithRelation.cs" />
<Compile Include="AdoAdapter.IAdapterWithTransactions.cs" />
<Compile Include="AdoAdapterException.cs" />
<Compile Include="AdoAdapterFinder.cs" />
<Compile Include="AdoAdapterGetter.cs" />
<Compile Include="AdoAdapterInserter.cs" />
<Compile Include="AdoAdapterQueryRunner.cs" />
<Compile Include="AdoAdapterRelatedFinder.cs" />
<Compile Include="AdoAdapterTransaction.cs" />
<Compile Include="AdoAdapterUpserter.cs" />
<Compile Include="AdoOptions.cs" />
<Compile Include="BulkInserter.cs" />
<Compile Include="BulkInserterHelper.cs" />
<Compile Include="BulkInserterTransactionHelper.cs" />
<Compile Include="BulkUpdater.cs" />
<Compile Include="CommandBuilder.cs" />
<Compile Include="CommandHelper.cs" />
<Compile Include="CommandTemplate.cs" />
<Compile Include="ConnectionEx.cs" />
<Compile Include="ConnectionScope.cs" />
<Compile Include="DatabaseObservable.cs" />
<Compile Include="DataParameterCollectionEx.cs" />
<Compile Include="DataReaderEnumerable.cs" />
<Compile Include="DataReaderExtensions.cs" />
<Compile Include="DataReaderMultipleEnumerator.cs" />
<Compile Include="DataRecordExtensions.cs" />
<Compile Include="DbCommandExtensions.cs" />
<Compile Include="DbConnectionEx.cs" />
<Compile Include="DbConnectionExtensions.cs" />
<Compile Include="DelegatingConnectionBase1.cs" />
<Compile Include="DeleteHelper.cs" />
<Compile Include="DictionaryExtensions.cs" />
<Compile Include="EagerLoadingEnumerable.cs" />
<Compile Include="EventHandlerEx.cs" />
<Compile Include="ExpressionFormatter.cs" />
<Compile Include="ExpressionFormatterBase.cs" />
<Compile Include="ExpressionHasher.cs" />
<Compile Include="FindHelper.cs" />
<Compile Include="FunctionNameConverter.cs" />
<Compile Include="GenericDbParameterFactory.cs" />
<Compile Include="HomogenizedDictionaryIndex.cs" />
<Compile Include="IBulkInserter.cs" />
<Compile Include="IBulkUpdater.cs" />
<Compile Include="ICommandBuilder.cs" />
<Compile Include="IConnectionProvider.cs" />
<Compile Include="ICustomInserter.cs" />
<Compile Include="ICustomQueryBuilder.cs" />
<Compile Include="IDbParameterFactory.cs" />
<Compile Include="IExpressionFormatter.cs" />
<Compile Include="IFunctionNameConverter.cs" />
<Compile Include="IObservableQueryRunner.cs" />
<Compile Include="IQueryPager.cs" />
<Compile Include="ISchemaGetter.cs" />
<Compile Include="ISqlOptimizer.cs" />
<Compile Include="Joiner.cs" />
<Compile Include="ListExtensions.cs" />
<Compile Include="OptimizedDictionary.cs" />
<Compile Include="OptimizedDictionaryIndex.cs" />
<Compile Include="OptimizedDictionary2.cs" />
<Compile Include="AdoOptimizingDelegateFactory.cs" />
<Compile Include="ParameterTemplate.cs" />
<Compile Include="ProcedureExecutor.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Include="ProviderAssemblyAttributeBase.cs" />
<Compile Include="ProviderHelper.cs" />
<Compile Include="QueryBuilder.cs" />
<Compile Include="QueryBuilderBase.cs" />
<Compile Include="SimpleReferenceFormatter.cs" />
<Compile Include="SchemaResolutionException.cs" />
<Compile Include="Schema\AmbiguousObjectNameException.cs" />
<Compile Include="Schema\Column.cs" />
<Compile Include="Schema\ColumnCollection.cs" />
<Compile Include="Schema\DatabaseSchema.cs" />
<Compile Include="Schema\ForeignKey.cs" />
<Compile Include="Schema\ForeignKeyCollection.cs" />
<Compile Include="Schema\ISchemaProvider.cs" />
<Compile Include="Schema\Key.cs" />
<Compile Include="Schema\Parameter.cs" />
<Compile Include="Schema\Procedure.cs" />
<Compile Include="Schema\ProcedureCollection.cs" />
<Compile Include="Schema\Table.cs" />
<Compile Include="Schema\TableCollection.cs" />
<Compile Include="Schema\TableJoin.cs" />
<Compile Include="Schema\TableType.cs" />
<Compile Include="ObjectName.cs" />
<Compile Include="SubDictionary.cs" />
<Compile Include="TraceHelper.cs" />
<Compile Include="TupleExtensions.cs" />
<Compile Include="TypeHelper.cs" />
<Compile Include="UpdateHelper.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Simple.Data\Simple.Data.csproj">
<Project>{148CEE80-2E84-4ABD-B5AB-20415B2BBD21}</Project>
<Name>Simple.Data</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="AdoAdapter.IAdapterWithFunctions.cs" />
<None Include="app.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
16 changes: 8 additions & 8 deletions Simple.Data.InMemoryTest/InMemoryTests.cs
View file
Expand Up @@ -90,10 +90,10 @@ public void TestFindAllByPartialName()
{
Database.UseMockAdapter(new InMemoryAdapter());
var db = Database.Open();
db.Test.Insert(Id: 1, Name: "Alice");
db.Test.Insert(Id: 2, Name: "Bob");
db.Test.Insert(Id: 2, Name: "Clive");
List<dynamic> records = db.Test.FindAll(db.Test.Name.Like("A%")).ToList();
db.MySchema.Test.Insert(Id: 1, Name: "Alice");
db.MySchema.Test.Insert(Id: 2, Name: "Bob");
db.MySchema.Test.Insert(Id: 2, Name: "Clive");
List<dynamic> records = db.MySchema.Test.FindAll(db.MySchema.Test.Name.Like("A%")).ToList();
Assert.IsNotNull(records);
Assert.AreEqual(1, records.Count);
}
Expand All @@ -103,10 +103,10 @@ public void TestFindAllByExcludedPartialName()
{
Database.UseMockAdapter(new InMemoryAdapter());
var db = Database.Open();
db.Test.Insert(Id: 1, Name: "Alice");
db.Test.Insert(Id: 2, Name: "Bob");
db.Test.Insert(Id: 2, Name: "Clive");
List<dynamic> records = db.Test.FindAll(db.Test.Name.NotLike("A%")).ToList();
db.MySchema.Test.Insert(Id: 1, Name: "Alice");
db.MySchema.Test.Insert(Id: 2, Name: "Bob");
db.MySchema.Test.Insert(Id: 2, Name: "Clive");
List<dynamic> records = db.MySchema.Test.FindAll(db.MySchema.Test.Name.NotLike("A%")).ToList();
Assert.IsNotNull(records);
Assert.AreEqual(2, records.Count);
}
Expand Down

0 comments on commit 0e40b48

Please sign in to comment.