diff --git a/README.md b/README.md index 02468b5..97cf2c1 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,15 @@ A wrapper around the standard IDb classes. -[![Build status](https://ci.appveyor.com/api/projects/status/lswhc16rx6ehs0qp?svg=true)](https://ci.appveyor.com/project/mrstebo/databaseconnections) +[![Build status](https://ci.appveyor.com/api/projects/status/9qmvvyd47633cqik/branch/master?svg=true)](https://ci.appveyor.com/project/mrstebo/databaseconnections-48e8b/branch/master) [![NuGet](https://img.shields.io/nuget/v/DatabaseConnections.svg)](https://www.nuget.org/packages/DatabaseConnections/) [![Coverage Status](https://coveralls.io/repos/github/ekmsystems/DatabaseConnections/badge.svg)](https://coveralls.io/github/ekmsystems/DatabaseConnections) -## Database Implementations +The base implementation has wrappers around: + +- `OleDbConnection` -### DatabaseConnections.OleDb [![NuGet](https://img.shields.io/nuget/v/DatabaseConnections.OleDb.svg)](https://www.nuget.org/packages/DatabaseConnections.OleDb/) +## Database Implementations ### DatabaseConnections.Postgres [![NuGet](https://img.shields.io/nuget/v/DatabaseConnections.Postgres.svg)](https://www.nuget.org/packages/DatabaseConnections.Postgres/) diff --git a/appveyor.yml b/appveyor.yml index d06822b..04cbf22 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,8 +33,6 @@ after_build: - cmd: >- nuget pack src\DatabaseConnections\DatabaseConnections.csproj -IncludeReferencedProjects -Build -Version "%GitVersion_NuGetVersion%" -Prop "target=%CONFIGURATION%" - nuget pack src\DatabaseConnections.OleDb\DatabaseConnections.OleDb.csproj -IncludeReferencedProjects -Build -Version "%GitVersion_NuGetVersion%" -Prop "target=%CONFIGURATION%" - nuget pack src\DatabaseConnections.Postgres\DatabaseConnections.Postgres.csproj -IncludeReferencedProjects -Build -Version "%GitVersion_NuGetVersion%" -Prop "target=%CONFIGURATION%" nuget pack src\DatabaseConnections.SQLite\DatabaseConnections.SQLite.csproj -IncludeReferencedProjects -Build -Version "%GitVersion_NuGetVersion%" -Prop "target=%CONFIGURATION%" @@ -48,7 +46,7 @@ test_script: -register:user -filter:"+[*]* -[*]*Wrapper -[*.Tests]*" -target:"tools\NUnit.ConsoleRunner.3.6.1\tools\nunit3-console.exe" - -targetargs:"/domain:single src\DatabaseConnections.Tests\bin\$env:CONFIGURATION\DatabaseConnections.Tests.dll src\DatabaseConnections.OleDb.Tests\bin\$env:CONFIGURATION\DatabaseConnections.OleDb.Tests.dll src\DatabaseConnections.Postgres.Tests\bin\$env:CONFIGURATION\DatabaseConnections.Postgres.Tests.dll src\DatabaseConnections.SQLite.Tests\bin\$env:CONFIGURATION\DatabaseConnections.SQLite.Tests.dll" + -targetargs:"/domain:single src\DatabaseConnections.Tests\bin\$env:CONFIGURATION\DatabaseConnections.Tests.dll src\DatabaseConnections.Postgres.Tests\bin\$env:CONFIGURATION\DatabaseConnections.Postgres.Tests.dll src\DatabaseConnections.SQLite.Tests\bin\$env:CONFIGURATION\DatabaseConnections.SQLite.Tests.dll" -output:opencoverCoverage.xml $coveralls = (Resolve-Path "tools/coveralls.net.*/tools/csmacnz.coveralls.exe").ToString() diff --git a/src/DatabaseConnections.OleDb.Tests/DatabaseConnections.OleDb.Tests.csproj b/src/DatabaseConnections.OleDb.Tests/DatabaseConnections.OleDb.Tests.csproj deleted file mode 100644 index d228b39..0000000 --- a/src/DatabaseConnections.OleDb.Tests/DatabaseConnections.OleDb.Tests.csproj +++ /dev/null @@ -1,101 +0,0 @@ - - - - Debug - AnyCPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5} - Library - Properties - DatabaseConnections.OleDb.Tests - DatabaseConnections.OleDb.Tests - v4.5 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll - True - - - ..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll - True - - - - - - - - - - - - - - - - - - - - - - {5c615f7f-d944-44fd-8e1c-32eace0ca7ad} - DatabaseConnections.OleDb - - - {51acb565-bbcf-4f72-a00d-27bd1f356274} - DatabaseConnections - - - - - - - False - - - False - - - False - - - False - - - - - - - - \ No newline at end of file diff --git a/src/DatabaseConnections.OleDb.Tests/Properties/AssemblyInfo.cs b/src/DatabaseConnections.OleDb.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 05c246c..0000000 --- a/src/DatabaseConnections.OleDb.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("DatabaseConnections.OleDb.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DatabaseConnections.OleDb.Tests")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("7505ee85-1fa6-47fa-85f6-c23fc1be2aa5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/DatabaseConnections.OleDb.Tests/packages.config b/src/DatabaseConnections.OleDb.Tests/packages.config deleted file mode 100644 index 47f3645..0000000 --- a/src/DatabaseConnections.OleDb.Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/DatabaseConnections.OleDb/DatabaseConnections.OleDb.csproj b/src/DatabaseConnections.OleDb/DatabaseConnections.OleDb.csproj deleted file mode 100644 index ffc45a3..0000000 --- a/src/DatabaseConnections.OleDb/DatabaseConnections.OleDb.csproj +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Debug - AnyCPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD} - Library - Properties - DatabaseConnections.OleDb - DatabaseConnections.OleDb - v3.5 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - {51acb565-bbcf-4f72-a00d-27bd1f356274} - DatabaseConnections - - - - - \ No newline at end of file diff --git a/src/DatabaseConnections.OleDb/DatabaseConnections.OleDb.nuspec b/src/DatabaseConnections.OleDb/DatabaseConnections.OleDb.nuspec deleted file mode 100644 index 683c64f..0000000 --- a/src/DatabaseConnections.OleDb/DatabaseConnections.OleDb.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - https://github.com/ekmsystems/DatabaseConnections - https://github.com/ekmsystems/DatabaseConnections/blob/master/LICENSE - false - $description$ - - - database connections idbconnection oledb - - diff --git a/src/DatabaseConnections.OleDb/Properties/AssemblyInfo.cs b/src/DatabaseConnections.OleDb/Properties/AssemblyInfo.cs deleted file mode 100644 index 6116ffc..0000000 --- a/src/DatabaseConnections.OleDb/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("DatabaseConnections.OleDb")] -[assembly: AssemblyDescription("A wrapper around the standard IDb classes.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("mrstebo, ekmsystems")] -[assembly: AssemblyProduct("DatabaseConnections.OleDb")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5c615f7f-d944-44fd-8e1c-32eace0ca7ad")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: InternalsVisibleTo("DatabaseConnections.OleDb.Tests")] diff --git a/src/DatabaseConnections.Tests/DatabaseConnections.Tests.csproj b/src/DatabaseConnections.Tests/DatabaseConnections.Tests.csproj index e8add99..255fdd5 100644 --- a/src/DatabaseConnections.Tests/DatabaseConnections.Tests.csproj +++ b/src/DatabaseConnections.Tests/DatabaseConnections.Tests.csproj @@ -162,6 +162,7 @@ + diff --git a/src/DatabaseConnections.OleDb.Tests/OleDbDatabaseTests.cs b/src/DatabaseConnections.Tests/OleDb/OleDbDatabaseTests.cs similarity index 100% rename from src/DatabaseConnections.OleDb.Tests/OleDbDatabaseTests.cs rename to src/DatabaseConnections.Tests/OleDb/OleDbDatabaseTests.cs diff --git a/src/DatabaseConnections.sln b/src/DatabaseConnections.sln index f2627aa..7f8c65f 100644 --- a/src/DatabaseConnections.sln +++ b/src/DatabaseConnections.sln @@ -9,10 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseConnections.Tests", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{4D6C70C5-E64F-40FB-B317-A06B063F4B46}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseConnections.OleDb", "DatabaseConnections.OleDb\DatabaseConnections.OleDb.csproj", "{5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseConnections.OleDb.Tests", "DatabaseConnections.OleDb.Tests\DatabaseConnections.OleDb.Tests.csproj", "{7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseConnections.SQLite", "DatabaseConnections.SQLite\DatabaseConnections.SQLite.csproj", "{E30A7882-E4B2-4DB7-B638-F46F95AC809B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseConnections.SQLite.Tests", "DatabaseConnections.SQLite.Tests\DatabaseConnections.SQLite.Tests.csproj", "{FCB180D8-A240-41E8-9BF5-9D1E7537CF21}" @@ -85,54 +81,6 @@ Global {9B0ECD25-AB98-424B-AB8B-A96E5DF612A5}.Test|x64.Build.0 = Test|x64 {9B0ECD25-AB98-424B-AB8B-A96E5DF612A5}.Test|x86.ActiveCfg = Test|x86 {9B0ECD25-AB98-424B-AB8B-A96E5DF612A5}.Test|x86.Build.0 = Test|x86 - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Debug|x64.ActiveCfg = Debug|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Debug|x64.Build.0 = Debug|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Debug|x86.ActiveCfg = Debug|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Debug|x86.Build.0 = Debug|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Release|Any CPU.Build.0 = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Release|x64.ActiveCfg = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Release|x64.Build.0 = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Release|x86.ActiveCfg = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Release|x86.Build.0 = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.TeamCity|Any CPU.ActiveCfg = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.TeamCity|Any CPU.Build.0 = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.TeamCity|x64.ActiveCfg = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.TeamCity|x64.Build.0 = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.TeamCity|x86.ActiveCfg = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.TeamCity|x86.Build.0 = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Test|Any CPU.ActiveCfg = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Test|Any CPU.Build.0 = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Test|x64.ActiveCfg = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Test|x64.Build.0 = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Test|x86.ActiveCfg = Release|Any CPU - {5C615F7F-D944-44FD-8E1C-32EACE0CA7AD}.Test|x86.Build.0 = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Debug|x64.ActiveCfg = Debug|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Debug|x64.Build.0 = Debug|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Debug|x86.ActiveCfg = Debug|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Debug|x86.Build.0 = Debug|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Release|Any CPU.Build.0 = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Release|x64.ActiveCfg = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Release|x64.Build.0 = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Release|x86.ActiveCfg = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Release|x86.Build.0 = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.TeamCity|Any CPU.ActiveCfg = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.TeamCity|Any CPU.Build.0 = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.TeamCity|x64.ActiveCfg = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.TeamCity|x64.Build.0 = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.TeamCity|x86.ActiveCfg = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.TeamCity|x86.Build.0 = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Test|Any CPU.ActiveCfg = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Test|Any CPU.Build.0 = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Test|x64.ActiveCfg = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Test|x64.Build.0 = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Test|x86.ActiveCfg = Release|Any CPU - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5}.Test|x86.Build.0 = Release|Any CPU {E30A7882-E4B2-4DB7-B638-F46F95AC809B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E30A7882-E4B2-4DB7-B638-F46F95AC809B}.Debug|Any CPU.Build.0 = Debug|Any CPU {E30A7882-E4B2-4DB7-B638-F46F95AC809B}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -235,7 +183,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {9B0ECD25-AB98-424B-AB8B-A96E5DF612A5} = {4D6C70C5-E64F-40FB-B317-A06B063F4B46} - {7505EE85-1FA6-47FA-85F6-C23FC1BE2AA5} = {4D6C70C5-E64F-40FB-B317-A06B063F4B46} {FCB180D8-A240-41E8-9BF5-9D1E7537CF21} = {4D6C70C5-E64F-40FB-B317-A06B063F4B46} {A4DE461A-6C5B-4CD4-AFC6-5362EE144A1F} = {4D6C70C5-E64F-40FB-B317-A06B063F4B46} EndGlobalSection diff --git a/src/DatabaseConnections/DatabaseConnections.csproj b/src/DatabaseConnections/DatabaseConnections.csproj index aea82c1..f448c0d 100644 --- a/src/DatabaseConnections/DatabaseConnections.csproj +++ b/src/DatabaseConnections/DatabaseConnections.csproj @@ -137,6 +137,8 @@ + + diff --git a/src/DatabaseConnections.OleDb/OleDbConnectionWrapper.cs b/src/DatabaseConnections/OleDb/OleDbConnectionWrapper.cs similarity index 100% rename from src/DatabaseConnections.OleDb/OleDbConnectionWrapper.cs rename to src/DatabaseConnections/OleDb/OleDbConnectionWrapper.cs diff --git a/src/DatabaseConnections.OleDb/OleDbDatabase.cs b/src/DatabaseConnections/OleDb/OleDbDatabase.cs similarity index 100% rename from src/DatabaseConnections.OleDb/OleDbDatabase.cs rename to src/DatabaseConnections/OleDb/OleDbDatabase.cs