Author: anagappan
Date: 2007-09-11 02:36:17 -0400 (Tue, 11 Sep 2007)
New Revision: 85619
Modified:
trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcConnectionStringBuilder.cs
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
Log:
2007-09-11 AMC <[EMAIL PROTECTED]>
* OdbcDataReader.cs (GetPrimaryKeys): ODBC data reader can now
properly handle "no-primary-keys" situation. Fixes bug # 82560.
2007-09-11 Nagappan A <[EMAIL PROTECTED]>
* OdbcConnectionStringBuilder.cs: Fixed Dsn DisplayName attribute.
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog 2007-09-11
04:09:29 UTC (rev 85618)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog 2007-09-11
06:36:17 UTC (rev 85619)
@@ -1,3 +1,12 @@
+2007-09-11 AMC <[EMAIL PROTECTED]>
+
+ * OdbcDataReader.cs (GetPrimaryKeys): ODBC data reader can now
+ properly handle "no-primary-keys" situation. Fixes bug # 82560.
+
+2007-09-11 Nagappan A <[EMAIL PROTECTED]>
+
+ * OdbcConnectionStringBuilder.cs: Fixed Dsn DisplayName attribute.
+
2007-08-13 Nagappan A <[EMAIL PROTECTED]>
* OdbcMetaDataColumnNames.cs: Added new class.
Modified:
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcConnectionStringBuilder.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/OdbcConnectionStringBuilder.cs
2007-09-11 04:09:29 UTC (rev 85618)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/OdbcConnectionStringBuilder.cs
2007-09-11 06:36:17 UTC (rev 85619)
@@ -133,7 +133,7 @@
}
}
- [DisplayNameAttribute ("Driver")]
+ [DisplayName ("Driver")]
[RefreshProperties (RefreshProperties.All)]
public string Driver {
get {
@@ -157,7 +157,7 @@
}
}
- [DisplayNameAttribute ("Driver")]
+ [DisplayName ("Dsn")]
[RefreshProperties (RefreshProperties.All)]
public string Dsn {
get {
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
2007-09-11 04:09:29 UTC (rev 85618)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
2007-09-11 06:36:17 UTC (rev 85619)
@@ -957,6 +957,8 @@
} catch (OdbcException) {
}
}
+ if (keys == null)
+ return null;
keys.Sort ();
return (string []) keys.ToArray (typeof (string));
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches