Skip to content

NH-3978 - Extract IDatabaseMetadata from DatabaseMetadata #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/NHibernate/Cfg/Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2317,7 +2317,7 @@ private static T[] AppendListeners<T>(T[] existing, T[] listenersToAdd)
/// Generate DDL for altering tables
///</summary>
/// <seealso cref="NHibernate.Tool.hbm2ddl.SchemaUpdate"/>
public string[] GenerateSchemaUpdateScript(Dialect.Dialect dialect, DatabaseMetadata databaseMetadata)
public string[] GenerateSchemaUpdateScript(Dialect.Dialect dialect, IDatabaseMetadata databaseMetadata)
{
SecondPassCompile();

Expand Down Expand Up @@ -2397,7 +2397,7 @@ public string[] GenerateSchemaUpdateScript(Dialect.Dialect dialect, DatabaseMeta
return script.ToArray();
}

public void ValidateSchema(Dialect.Dialect dialect, DatabaseMetadata databaseMetadata)
public void ValidateSchema(Dialect.Dialect dialect, IDatabaseMetadata databaseMetadata)
{
SecondPassCompile();

Expand Down
1 change: 1 addition & 0 deletions src/NHibernate/NHibernate.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
<Compile Include="Connection\DriverConnectionProvider.cs" />
<Compile Include="Connection\IConnectionProvider.cs" />
<Compile Include="Connection\UserSuppliedConnectionProvider.cs" />
<Compile Include="Tool\hbm2ddl\IDatabaseMetadata.cs" />
<Compile Include="Util\DelegateHelper.cs" />
<Compile Include="Dialect\BitwiseFunctionOperation.cs" />
<Compile Include="Dialect\DB2Dialect.cs" />
Expand Down
2 changes: 1 addition & 1 deletion src/NHibernate/Tool/hbm2ddl/DatabaseMetadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace NHibernate.Tool.hbm2ddl
{
public class DatabaseMetadata
public class DatabaseMetadata : IDatabaseMetadata
{
private static readonly IInternalLogger log = LoggerProvider.LoggerFor(typeof (DatabaseMetadata));

Expand Down
11 changes: 11 additions & 0 deletions src/NHibernate/Tool/hbm2ddl/IDatabaseMetadata.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using NHibernate.Dialect.Schema;

namespace NHibernate.Tool.hbm2ddl
{
public interface IDatabaseMetadata
{
ITableMetadata GetTableMetadata(string name, string schema, string catalog, bool isQuoted);
bool IsSequence(object key);
bool IsTable(object key);
}
}