how-to
/
EntityFrameworkCore.Jet
mirror of https://github.com/bubibubi/EntityFrameworkCore.Jet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bubibubi/EntityFrameworkCore.Jet

Browse Source
pull/139/head
Christopher Jolly 3 years ago
parent 61b277d11c 256163dcf7
commit 6230db2803
9 changed files with 211 additions and 30 deletions
Show Stats Download Patch File Download Diff File

6
src/Directory.Build.props
Unescape Escape View File

@ -15,6 +15,12 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.Versioning.SupportedOSPlatform">
<_Parameter1>windows</_Parameter1>
</AssemblyAttribute>
</ItemGroup>
<!-- TODO: Enable for 5.0
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" PrivateAssets="All" />

4
src/EFCore.Jet.Data/DbConnectionStringBuilderExtensions.cs
Unescape Escape View File

@ -21,14 +21,14 @@ namespace EntityFrameworkCore.Jet.Data
IsOdbc(builder))
{
return builder.TryGetValue("DRIVER", out var value)
? (string)value
? ((string)value).TrimStart('{').TrimEnd('}')
: null;
}
return builder.TryGetValue("Provider", out var oleDbValue)
? (string)oleDbValue
: builder.TryGetValue("DRIVER", out var odbcValue)
? (string)odbcValue
? ((string)odbcValue).TrimStart('{').TrimEnd('}')
: null;
}

2
src/EFCore.Jet.Data/EFCore.Jet.Data.csproj
Unescape Escape View File

@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Jet/ACE data provider for .NET used by EntityFramworkCore.Jet (Microsoft Access MDB/ACCDB files).</Description>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Platforms>AnyCPU;x86;x64</Platforms>
<AssemblyName>EntityFrameworkCore.Jet.Data</AssemblyName>
<RootNamespace>EntityFrameworkCore.Jet.Data</RootNamespace>

88
src/EFCore.Jet.Data/JetConnectionStringBuilder.cs
Unescape Escape View File

@ -0,0 +1,88 @@
using System;
using System.Data.Common;
namespace EntityFrameworkCore.Jet.Data
{
public class JetConnectionStringBuilder : DbConnectionStringBuilder
{
private readonly DbConnectionStringBuilder _innerBuilder;
public JetConnectionStringBuilder() : this(JetConfiguration.DefaultDataAccessProviderType)
{
}
public JetConnectionStringBuilder(DataAccessProviderType providerType)
{
ProviderType = providerType;
_innerBuilder = this;
}
internal JetConnectionStringBuilder(DbProviderFactory innerFactory)
{
ProviderType = JetConnection.GetDataAccessProviderType(innerFactory);
_innerBuilder = innerFactory.CreateConnectionStringBuilder() ?? throw new InvalidOperationException($"CreateConnectionStringBuilder() returned null for {innerFactory}");
}
public DataAccessProviderType ProviderType { get; }
public string? Provider
{
get => _innerBuilder.GetProvider(ProviderType);
set
{
_innerBuilder.SetProvider(value!, ProviderType);
ConnectionString = _innerBuilder.ConnectionString;
}
}
public string? DataSource
{
get => _innerBuilder.GetDataSource(ProviderType);
set
{
_innerBuilder.SetDataSource(value!, ProviderType);
ConnectionString = _innerBuilder.ConnectionString;
}
}
public string? UserId
{
get => _innerBuilder.GetUserId(ProviderType);
set
{
_innerBuilder.SetUserId(value!, ProviderType);
ConnectionString = _innerBuilder.ConnectionString;
}
}
public string? Password
{
get => _innerBuilder.GetPassword(ProviderType);
set
{
_innerBuilder.SetPassword(value!, ProviderType);
ConnectionString = _innerBuilder.ConnectionString;
}
}
public string? SystemDatabase
{
get => _innerBuilder.GetSystemDatabase(ProviderType);
set
{
_innerBuilder.SetSystemDatabase(value!, ProviderType);
ConnectionString = _innerBuilder.ConnectionString;
}
}
public string? DatabasePassword
{
get => _innerBuilder.GetDatabasePassword(ProviderType);
set
{
_innerBuilder.SetDatabasePassword(value!, ProviderType);
ConnectionString = _innerBuilder.ConnectionString;
}
}
}
}

2
src/EFCore.Jet.Data/JetFactory.cs
Unescape Escape View File

@ -82,7 +82,7 @@ namespace EntityFrameworkCore.Jet.Data
public override DbConnectionStringBuilder CreateConnectionStringBuilder()
=> InnerFactory == null
? throw new InvalidOperationException(Messages.CannotCallJetProviderFactoryMethodOnSingletonInstance(nameof(CreateConnectionStringBuilder)))
: InnerFactory.CreateConnectionStringBuilder();
: new JetConnectionStringBuilder(InnerFactory);
/// <summary>
/// Returns a new instance of the provider's class that implements the <see cref="T:System.Data.Common.DbDataAdapter" /> class.

2
src/EFCore.Jet.Odbc/EFCore.Jet.Odbc.csproj
Unescape Escape View File

@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Explicit ODBC support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>EntityFrameworkCore.Jet.Odbc</AssemblyName>
<RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
<PackageTags>$(PackageTags);ODBC;System.Data.Odbc</PackageTags>

2
src/EFCore.Jet.OleDb/EFCore.Jet.OleDb.csproj
Unescape Escape View File

@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Explicit OLE DB support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>EntityFrameworkCore.Jet.OleDb</AssemblyName>
<RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
<PackageTags>$(PackageTags);OLE DB;OLEDB;System.Data.OleDb</PackageTags>

2
src/EFCore.Jet/EFCore.Jet.csproj
Unescape Escape View File

@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
<AssemblyName>EntityFrameworkCore.Jet</AssemblyName>
<Platforms>AnyCPU;x86;x64</Platforms>

133
test/EFCore.Jet.Data.Tests/ConnectionStringTest.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using System.Data.Odbc;
using System.Data.OleDb;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace EntityFrameworkCore.Jet.Data.Tests
@ -6,42 +7,128 @@ namespace EntityFrameworkCore.Jet.Data.Tests
[TestClass]
public class ConnectionStringTest
{
[TestMethod]
public void Escape_double_quoted_connection_string()
[DataTestMethod]
[DataRow(DataAccessProviderType.Odbc)]
[DataRow(DataAccessProviderType.OleDb)]
public void Escape_double_quoted_connection_string(DataAccessProviderType providerType)
{
var expectedDatabaseName = "Joe's \"Recipes\" Database.accdb";
var escapedDatabaseName = expectedDatabaseName.Replace("\"", "\"\"");
var connectionString = Helpers.DataAccessProviderFactory is OdbcFactory
var connectionString = providerType == DataAccessProviderType.Odbc
? $"DBQ=\"{escapedDatabaseName}\""
: $"Data Source=\"{escapedDatabaseName}\"";
var csb = Helpers.DataAccessProviderFactory.CreateConnectionStringBuilder();
csb.ConnectionString = connectionString;
var actualDatabaseName = csb.GetDataSource();
Assert.AreEqual(expectedDatabaseName, actualDatabaseName);
var csb = new JetConnectionStringBuilder(providerType) { ConnectionString = connectionString };
Assert.AreEqual(expectedDatabaseName, csb.DataSource);
}
[TestMethod]
public void Escape_single_quoted_connection_string()
[DataTestMethod]
[DataRow(DataAccessProviderType.Odbc)]
[DataRow(DataAccessProviderType.OleDb)]
public void Escape_single_quoted_connection_string(DataAccessProviderType providerType)
{
var expectedDatabaseName = "Joe's \"Recipes\" Database.accdb";
var escapedDatabaseName = expectedDatabaseName.Replace("'", "''");
var connectionString = Helpers.DataAccessProviderFactory is OdbcFactory
var connectionString = providerType == DataAccessProviderType.Odbc
? $"DBQ='{escapedDatabaseName}'"
: $"Data Source='{escapedDatabaseName}'";
using var connection = new JetConnection(connectionString, Helpers.DataAccessProviderFactory);
var csb = Helpers.DataAccessProviderFactory.CreateConnectionStringBuilder();
csb.ConnectionString = connectionString;
var actualDatabaseName = csb.GetDataSource();
Assert.AreEqual(expectedDatabaseName, actualDatabaseName);
var csb = new JetConnectionStringBuilder(providerType) { ConnectionString = connectionString };
Assert.AreEqual(expectedDatabaseName, csb.DataSource);
}
[TestMethod]
public void Odbc_read_connection_string_with_all_properties()
{
const string connectionString = @"driver={Microsoft Access Driver (*.mdb, *.accdb)};dbq=C:\myFolder\myAccessFile.accdb;uid=Admin;pwd=hunter2;systemdb=SysDb";
var csb = new JetConnectionStringBuilder(DataAccessProviderType.Odbc) { ConnectionString = connectionString };
Assert.AreEqual(csb.Provider, @"Microsoft Access Driver (*.mdb, *.accdb)");
Assert.AreEqual(csb.DataSource, @"C:\myFolder\myAccessFile.accdb");
Assert.AreEqual(csb.UserId, "Admin");
Assert.AreEqual(csb.Password, "hunter2");
Assert.AreEqual(csb.SystemDatabase, "SysDb");
Assert.IsNull(csb.DatabasePassword);
}
[TestMethod]
public void Odbc_connection_string_with_all_properties()
{
var csb = new JetConnectionStringBuilder(DataAccessProviderType.Odbc)
{
Provider = "Microsoft Access Driver (*.mdb, *.accdb)",
DataSource = @"C:\myFolder\myAccessFile.accdb",
UserId = "Admin",
Password = "hunter2",
SystemDatabase = "SysDb",
DatabasePassword = "DbPwd",
};
Assert.AreEqual(@"driver=""{Microsoft Access Driver (*.mdb, *.accdb)}"";dbq=C:\myFolder\myAccessFile.accdb;uid=Admin;pwd=DbPwd;systemdb=SysDb", csb.ConnectionString);
}
[TestMethod]
public void Odbc_connection_string_with_all_properties_from_factory()
{
var csb = new JetConnection(OdbcFactory.Instance).JetFactory.CreateConnectionStringBuilder() as JetConnectionStringBuilder;
Assert.IsNotNull(csb);
csb.Provider = "Microsoft Access Driver (*.mdb, *.accdb)";
csb.DataSource = @"C:\myFolder\myAccessFile.accdb";
csb.UserId = "Admin";
csb.Password = "hunter2";
csb.SystemDatabase = "SysDb";
csb.DatabasePassword = "DbPwd";
Assert.AreEqual(@"driver=""{Microsoft Access Driver (*.mdb, *.accdb)}"";dbq=C:\myFolder\myAccessFile.accdb;uid=Admin;pwd=DbPwd;systemdb=SysDb", csb.ConnectionString);
}
[TestMethod]
public void OleDb_read_connection_string_with_all_properties()
{
const string connectionString = @"Provider=Microsoft.ACE.OLEDB.12.0;Data Source=C:\myFolder\myAccessFile.accdb;User ID=Admin;Password=hunter2;Jet OLEDB:System Database=SysDb;Jet OLEDB:Database Password=DbPwd";
var csb = new JetConnectionStringBuilder(DataAccessProviderType.OleDb) { ConnectionString = connectionString };
Assert.AreEqual(csb.Provider, "Microsoft.ACE.OLEDB.12.0");
Assert.AreEqual(csb.DataSource, @"C:\myFolder\myAccessFile.accdb");
Assert.AreEqual(csb.UserId, "Admin");
Assert.AreEqual(csb.Password, "hunter2");
Assert.AreEqual(csb.SystemDatabase, "SysDb");
Assert.AreEqual(csb.DatabasePassword, "DbPwd");
}
[TestMethod]
public void OleDb_connection_string_with_all_properties()
{
var csb = new JetConnectionStringBuilder(DataAccessProviderType.OleDb)
{
Provider = "Microsoft.ACE.OLEDB.12.0",
DataSource = @"C:\myFolder\myAccessFile.accdb",
UserId = "Admin",
Password = "hunter2",
SystemDatabase = "SysDb",
DatabasePassword = "DbPwd",
};
Assert.AreEqual(@"provider=Microsoft.ACE.OLEDB.12.0;data source=C:\myFolder\myAccessFile.accdb;user id=Admin;password=hunter2;jet oledb:system database=SysDb;jet oledb:database password=DbPwd", csb.ConnectionString);
}
[TestMethod]
public void OleDb_connection_string_with_all_properties_from_factory()
{
var csb = new JetConnection(OleDbFactory.Instance).JetFactory.CreateConnectionStringBuilder() as JetConnectionStringBuilder;
Assert.IsNotNull(csb);
csb.Provider = "Microsoft.ACE.OLEDB.12.0";
csb.DataSource = @"C:\myFolder\myAccessFile.accdb";
csb.UserId = "Admin";
csb.Password = "hunter2";
csb.SystemDatabase = "SysDb";
csb.DatabasePassword = "DbPwd";
Assert.AreEqual(@"provider=Microsoft.ACE.OLEDB.12.0;data source=C:\myFolder\myAccessFile.accdb;password=hunter2;user id=Admin;jet oledb:system database=SysDb;jet oledb:database password=DbPwd", csb.ConnectionString);
}
}
}
Write Preview
Loading…
Cancel
Save