diff options
| author | Konstantin Triger <kostat@mono-cvs.ximian.com> | 2006-05-09 16:40:04 +0400 |
|---|---|---|
| committer | Konstantin Triger <kostat@mono-cvs.ximian.com> | 2006-05-09 16:40:04 +0400 |
| commit | 598f80589cbb4f5322901fb776beb4a6cef1a773 (patch) | |
| tree | 2d134db211fd57359ee331f1897d22b8021e41c4 /mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm | |
| parent | 1f6fe9b2737ae9c86277da18e5823408fa8095a2 (diff) | |
fix GetOleDbSchemaTable for OleDbSchemaGuid.Tables
svn path=/branches/mainsoft/gh1.7/mcs/; revision=60440
Diffstat (limited to 'mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm')
2 files changed, 11 insertions, 3 deletions
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/ChangeLog b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/ChangeLog new file mode 100644 index 00000000000..4a5d584ed12 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/ChangeLog @@ -0,0 +1,3 @@ +2006-05-09 Konstantin Triger <kostat@mainsoft.com> + + * OleDbConnection_GetOleDbSchemaTable.cs: in Oracle Database maps to Schema.
\ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_GetOleDbSchemaTable.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_GetOleDbSchemaTable.cs index e11714cd7ae..2e605d1586d 100755 --- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_GetOleDbSchemaTable.cs +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_GetOleDbSchemaTable.cs @@ -62,7 +62,13 @@ public class OleDbConnection_GetOleDbSchemaTable : ADONetTesterClass try { BeginCase("Check table is not null"); - dt = con.GetOleDbSchemaTable(OleDbSchemaGuid.Tables,new object[] {null,null,null,"TABLE"}); + string catalog = null; + string schema = null; + if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle) + catalog = "GHTDB"; + else + schema = "GHTDB"; + dt = con.GetOleDbSchemaTable(OleDbSchemaGuid.Tables,new object[] {catalog,schema,null,"TABLE"}); Compare(dt == null,false); } catch(Exception ex) {exp = ex;} @@ -90,8 +96,7 @@ public class OleDbConnection_GetOleDbSchemaTable : ADONetTesterClass try { BeginCase("Table Customers"); - int expected = (ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle) ? 1 : 2; // in Oracle return a value of 2 instead of 1. ????? - Compare(dt.Select("TABLE_NAME='Customers'").Length ,expected ); + Compare(dt.Select("TABLE_NAME='Customers'").Length ,1 ); } catch(Exception ex) {exp = ex;} finally {EndCase(exp); exp = null;} |