From: <fab...@us...> - 2009-02-04 20:10:32
|
Revision: 4041 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4041&view=rev Author: fabiomaulo Date: 2009-02-04 20:10:30 +0000 (Wed, 04 Feb 2009) Log Message: ----------- Fixed OracleMetaData for SchemaUpdate and SchemaValidation Modified Paths: -------------- trunk/nhibernate/src/NHibernate/Dialect/Schema/OracleMetaData.cs Modified: trunk/nhibernate/src/NHibernate/Dialect/Schema/OracleMetaData.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Dialect/Schema/OracleMetaData.cs 2009-02-04 17:52:02 UTC (rev 4040) +++ trunk/nhibernate/src/NHibernate/Dialect/Schema/OracleMetaData.cs 2009-02-04 20:10:30 UTC (rev 4041) @@ -12,6 +12,46 @@ { return new OracleTableMetadata(rs, this, extras); } + + public override bool StoresUpperCaseIdentifiers + { + get { return true; } + } + + public override DataTable GetTables(string catalog, string schemaPattern, string tableNamePattern, string[] types) + { + string owner = string.IsNullOrEmpty(schemaPattern) ? null : schemaPattern; + var restrictions = new[] { owner, tableNamePattern }; + return Connection.GetSchema("Tables", restrictions); + } + + public override DataTable GetColumns(string catalog, string schemaPattern, string tableNamePattern, string columnNamePattern) + { + string owner = string.IsNullOrEmpty(schemaPattern) ? null : schemaPattern; + var restrictions = new[] { owner, tableNamePattern, columnNamePattern }; + return Connection.GetSchema("Columns", restrictions); + } + + public override DataTable GetIndexColumns(string catalog, string schemaPattern, string tableName, string indexName) + { + string owner = string.IsNullOrEmpty(schemaPattern) ? null : schemaPattern; + var restrictions = new[] { owner, indexName, null, tableName, null }; + return Connection.GetSchema("IndexColumns", restrictions); + } + + public override DataTable GetIndexInfo(string catalog, string schemaPattern, string tableName) + { + string owner = string.IsNullOrEmpty(schemaPattern) ? null : schemaPattern; + var restrictions = new[] { owner, null, null, tableName }; + return Connection.GetSchema("Indexes", restrictions); + } + + public override DataTable GetForeignKeys(string catalog, string schema, string table) + { + string owner = string.IsNullOrEmpty(schema) ? null : schema; + var restrictions = new[] { owner, table, null }; + return Connection.GetSchema("ForeignKeys", restrictions); + } } public class OracleTableMetadata : AbstractTableMetadata @@ -28,7 +68,7 @@ protected override string GetConstraintName(DataRow rs) { - return Convert.ToString(rs["FOREIGN_KEY_CONSTRIANT_NAME"]); + return Convert.ToString(rs["FOREIGN_KEY_CONSTRAINT_NAME"]); } protected override string GetColumnName(DataRow rs) @@ -92,7 +132,7 @@ public OracleForeignKeyMetadata(DataRow rs) : base(rs) { - Name = Convert.ToString(rs["FOREIGN_KEY_CONSTRIANT_NAME"]); + Name = Convert.ToString(rs["FOREIGN_KEY_CONSTRAINT_NAME"]); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |