NH-3807 - Guard on all uses of GetSchemaTable, including use of dbm2dll and implementations of ITableMetaData.

Author: ngbrown

src/NHibernate/Cfg/Configuration.cs

@@ -23,7 +23,6 @@
 using NHibernate.Impl;
 using NHibernate.Mapping;
 using NHibernate.Proxy;
-using NHibernate.Tool.hbm2ddl;
 using NHibernate.Type;
 using NHibernate.Util;
 using Array = System.Array;
@@ -37,6 +36,10 @@
 using System.Security;
 #endif
 
+#if FEATURE_DATA_GETSCHEMATABLE
+using NHibernate.Tool.hbm2ddl;
+#endif
+
 namespace NHibernate.Cfg
 {
 	/// <summary>
@@ -2307,6 +2310,7 @@ private static T[] AppendListeners<T>(T[] existing, T[] listenersToAdd)
 			return list.ToArray();
 		}
 
+#if FEATURE_DATA_GETSCHEMATABLE
 		///<summary>
 		/// Generate DDL for altering tables
 		///</summary>
@@ -2431,6 +2435,7 @@ public void ValidateSchema(Dialect.Dialect dialect, DatabaseMetadata databaseMet
 				}
 			}
 		}
+#endif
 
 		private IEnumerable<IPersistentIdentifierGenerator> IterateGenerators(Dialect.Dialect dialect)
 		{

src/NHibernate/Dialect/Dialect.cs

@@ -426,10 +426,12 @@ public virtual bool SupportsNotNullUnique
 			get { return true; }
 		}
 
+#if FEATURE_DATA_GETSCHEMATABLE
 		public virtual IDataBaseSchema GetDataBaseSchema(DbConnection connection)
 		{
 			throw new NotSupportedException();
 		}
+#endif
 
 		#endregion
 
@@ -2276,4 +2278,4 @@ public virtual ISQLExceptionConverter BuildSQLExceptionConverter()
 			return new SQLStateConverter(ViolatedConstraintNameExtracter);
 		}
 	}
-}
+}

src/NHibernate/Dialect/FirebirdDialect.cs

@@ -188,10 +188,12 @@ public override SqlString Render(IList args, ISessionFactoryImplementor factory)
 			}
 		}
 
+#if FEATURE_DATA_GETSCHEMATABLE
 		public override IDataBaseSchema GetDataBaseSchema(DbConnection connection)
 		{
 			return new FirebirdDataBaseSchema(connection);
 		}
+#endif
 
 		public override string QuerySequencesString
 		{
@@ -426,4 +428,4 @@ private static bool IsUnallowedDecimal(DbType dbType, int precision)
 			return dbType == DbType.Decimal && precision > MAX_DECIMAL_PRECISION;
 		}
 	}
-}
+}

src/NHibernate/Dialect/MsSql2000Dialect.cs

@@ -483,10 +483,12 @@ public override bool SupportsCircularCascadeDeleteConstraints
 			}
 		}
 
+#if FEATURE_DATA_GETSCHEMATABLE
 		public override IDataBaseSchema GetDataBaseSchema(DbConnection connection)
 		{
 			return new MsSqlDataBaseSchema(connection);
 		}
+#endif
 
 		public override bool SupportsUnionAll
 		{

src/NHibernate/Dialect/MsSqlCeDialect.cs

@@ -124,10 +124,12 @@ public override bool SupportsLimitOffset
 			get { return false; }
 		}
 
+#if FEATURE_DATA_GETSCHEMATABLE
 		public override IDataBaseSchema GetDataBaseSchema(DbConnection connection)
 		{
 			return new MsSqlCeDataBaseSchema(connection);
 		}
+#endif
 
 		public override SqlString GetLimitString(SqlString querySqlString, SqlString offset, SqlString limit)
 		{
@@ -203,4 +205,4 @@ public override long TimestampResolutionInTicks
 			}
 		}
 	}
-}
+}

src/NHibernate/Dialect/MySQLDialect.cs

@@ -234,10 +234,12 @@ public override bool SupportsLimit
 			get { return true; }
 		}
 
+#if FEATURE_DATA_GETSCHEMATABLE
 		public override IDataBaseSchema GetDataBaseSchema(DbConnection connection)
 		{
 			return new MySQLDataBaseSchema(connection);
 		}
+#endif
 
 		public override bool SupportsSubSelects
 		{
@@ -387,4 +389,4 @@ public override long TimestampResolutionInTicks
 			}
 		}
 	}
-}
+}

src/NHibernate/Dialect/Oracle8iDialect.cs

@@ -449,10 +449,12 @@ public override bool SupportsCurrentTimestampSelection
 			get { return true; }
 		}
 
+#if FEATURE_DATA_GETSCHEMATABLE
 		public override IDataBaseSchema GetDataBaseSchema(DbConnection connection)
 		{
 			return new OracleDataBaseSchema(connection);
 		}
+#endif
 
 		public override long TimestampResolutionInTicks
 		{
@@ -536,4 +538,4 @@ public SqlString Render(IList args, ISessionFactoryImplementor factory)
 
 		#endregion
 	}
-}
+}

src/NHibernate/Dialect/PostgreSQLDialect.cs

@@ -229,11 +229,13 @@ public override string SelectGUIDString
 		{
 			get { return "select uuid_generate_v4()"; }
 		}
-		
+
+#if FEATURE_DATA_GETSCHEMATABLE
 		public override IDataBaseSchema GetDataBaseSchema(DbConnection connection)
 		{
 			return new PostgreSQLDataBaseMetadata(connection);
 		}
+#endif
 
 		public override long TimestampResolutionInTicks
 		{

src/NHibernate/Dialect/SQLiteDialect.cs

@@ -125,10 +125,12 @@ protected virtual void RegisterDefaultProperties()
 			DefaultProperties[Cfg.Environment.QuerySubstitutions] = "true 1, false 0, yes 'Y', no 'N'";
 		}
 
+#if FEATURE_DATA_GETSCHEMATABLE
 		public override Schema.IDataBaseSchema GetDataBaseSchema(DbConnection connection)
 		{
 			return new Schema.SQLiteDataBaseMetaData(connection);
 		}
+#endif
 
 		public override string AddColumnString
 		{
@@ -344,4 +346,4 @@ protected override bool CastingIsRequired(string sqlType)
 			}
 		}
 	}
-}
+}

src/NHibernate/Dialect/Schema/AbstractDataBaseSchema.cs

@@ -1,3 +1,5 @@
+#if FEATURE_DATA_GETSCHEMATABLE
+
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
@@ -109,4 +111,6 @@ protected virtual string ForeignKeysSchemaName
 
 		#endregion
 	}
-}
+}
+
+#endif