From c333ee37ad4b042175d8dbff0c26c75d216e4ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrea=20Knez=20Kara=C4=8Di=C4=87?= Date: Sun, 4 Dec 2016 19:58:06 +0100 Subject: [PATCH] Extracting IDatabaseMetadata drom DatabaseMetadata --- src/NHibernate/Cfg/Configuration.cs | 4 ++-- src/NHibernate/NHibernate.csproj | 3 ++- src/NHibernate/Tool/hbm2ddl/DatabaseMetadata.cs | 3 +-- src/NHibernate/Tool/hbm2ddl/IDatabaseMetadata.cs | 11 +++++++++++ 4 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/NHibernate/Tool/hbm2ddl/IDatabaseMetadata.cs diff --git a/src/NHibernate/Cfg/Configuration.cs b/src/NHibernate/Cfg/Configuration.cs index 81f63f4fdf1..d042599f730 100644 --- a/src/NHibernate/Cfg/Configuration.cs +++ b/src/NHibernate/Cfg/Configuration.cs @@ -2319,7 +2319,7 @@ private static T[] AppendListeners(T[] existing, T[] listenersToAdd) /// Generate DDL for altering tables /// /// - public string[] GenerateSchemaUpdateScript(Dialect.Dialect dialect, DatabaseMetadata databaseMetadata) + public string[] GenerateSchemaUpdateScript(Dialect.Dialect dialect, IDatabaseMetadata databaseMetadata) { SecondPassCompile(); @@ -2399,7 +2399,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(); diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj index 4c07150826f..164f11370e9 100644 --- a/src/NHibernate/NHibernate.csproj +++ b/src/NHibernate/NHibernate.csproj @@ -143,6 +143,7 @@ + @@ -1823,4 +1824,4 @@ - + \ No newline at end of file diff --git a/src/NHibernate/Tool/hbm2ddl/DatabaseMetadata.cs b/src/NHibernate/Tool/hbm2ddl/DatabaseMetadata.cs index e7f6cebb88c..e70653a53f0 100644 --- a/src/NHibernate/Tool/hbm2ddl/DatabaseMetadata.cs +++ b/src/NHibernate/Tool/hbm2ddl/DatabaseMetadata.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Data; using System.Data.Common; @@ -11,7 +10,7 @@ namespace NHibernate.Tool.hbm2ddl { - public class DatabaseMetadata + public class DatabaseMetadata : IDatabaseMetadata { private static readonly IInternalLogger log = LoggerProvider.LoggerFor(typeof (DatabaseMetadata)); diff --git a/src/NHibernate/Tool/hbm2ddl/IDatabaseMetadata.cs b/src/NHibernate/Tool/hbm2ddl/IDatabaseMetadata.cs new file mode 100644 index 00000000000..1f17b2bbbaf --- /dev/null +++ b/src/NHibernate/Tool/hbm2ddl/IDatabaseMetadata.cs @@ -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); + } +}