Lupus, Miguel, or Uma:
Can someone approve this patch please?
I ran this to get the diff:
cvs -z3 diff -uN -r mono-1-0 > diff.txt
I had used this to checkout:
cvs checkout -r mono-1-0 mono mcs
Here is the ChangeLog entry:
2004-10-30 Daniel Morgan <[EMAIL PROTECTED]>
Retrofit changes from HEAD to mono-1-0 release
2004-10-22 Daniel Morgan <[EMAIL PROTECTED]>
* Mono.Data/.cvsignore
* Mono.Data/AssemblyInfo.cs
* Mono.Data/Makefile
* Mono.Data/Mono.Data.dll.sources: added files
for build of Mono.Data.dll
This assembly includes the ProviderFactory
* Makefile: added Mono.Data.dll to the build
* Mono.Data/app.config: added providers and
removed obsolete providers to app settings xml file
? diff.txt
? corlib/SecurityDB.db
? corlib/SecurityDB.idx
? corlib/SecurityDB.raw
Index: ChangeLog
===================================================================
RCS file: /cvs/public/mcs/class/ChangeLog,v
retrieving revision 1.51
diff -u -r1.51 ChangeLog
--- ChangeLog 24 Jun 2004 14:43:35 -0000 1.51
+++ ChangeLog 31 Oct 2004 02:54:53 -0000
@@ -1,3 +1,20 @@
+2004-10-30 Daniel Morgan <[EMAIL PROTECTED]>
+
+ Retrofit changes from HEAD to mono-1-0 release
+
+ 2004-10-22 Daniel Morgan <[EMAIL PROTECTED]>
+
+ * Mono.Data/.cvsignore
+ * Mono.Data/AssemblyInfo.cs
+ * Mono.Data/Makefile
+ * Mono.Data/Mono.Data.dll.sources: added files
+ for build of Mono.Data.dll
+ This assembly includes the ProviderFactory
+
+ * Makefile: added Mono.Data.dll to the build
+ * Mono.Data/app.config: added providers and
+ removed obsolete providers to app settings xml file
+
2004-06-24 Raja R Harinath <[EMAIL PROTECTED]>
* IBM.Data.DB2/Makefile: Disable for 'net_2_0'.
Index: Makefile
===================================================================
RCS file: /cvs/public/mcs/class/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile 23 Jun 2004 09:58:18 -0000 1.22
+++ Makefile 31 Oct 2004 02:54:53 -0000
@@ -16,6 +16,7 @@
Mono.Data.Tds \
System.Security \
System.Data \
+ Mono.Data \
Mono.GetOptions \
System.Web \
System.Web.Services \
Index: Mono.Data/.cvsignore
===================================================================
RCS file: Mono.Data/.cvsignore
diff -N Mono.Data/.cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Mono.Data/.cvsignore 31 Oct 2004 02:54:54 -0000
@@ -0,0 +1,3 @@
+.makefrag
+.response
+library-deps.stamp
Index: Mono.Data/AssemblyInfo.cs
===================================================================
RCS file: Mono.Data/AssemblyInfo.cs
diff -N Mono.Data/AssemblyInfo.cs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Mono.Data/AssemblyInfo.cs 31 Oct 2004 02:54:54 -0000
@@ -0,0 +1,37 @@
+//
+// AssemblyInfo.cs
+//
+// Author:
+// Andreas Nahr ([EMAIL PROTECTED])
+//
+// (C) 2003 Ximian, Inc. http://www.ximian.com
+// (C) 2004 Novell (http://www.novell.com)
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+#if (NET_1_0)
+ [assembly: AssemblyVersion ("1.0.3300.0")]
+#elif (NET_2_0)
+ [assembly: AssemblyVersion ("2.0.3600.0")]
+#elif (NET_1_1)
+ [assembly: AssemblyVersion ("1.0.5000.0")]
+#endif
+
+/* TODO COMPLETE INFORMATION
+
+[assembly: AssemblyTitle ("")]
+[assembly: AssemblyDescription ("")]
+
+[assembly: CLSCompliant (true)]
+[assembly: AssemblyFileVersion ("0.0.0.1")]
+
+[assembly: ComVisible (false)]
+
+*/
+
+[assembly: AssemblyDelaySign (true)]
+[assembly: AssemblyKeyFile ("../mono.pub")]
+
Index: Mono.Data/Makefile
===================================================================
RCS file: Mono.Data/Makefile
diff -N Mono.Data/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Mono.Data/Makefile 31 Oct 2004 02:54:54 -0000
@@ -0,0 +1,10 @@
+thisdir = class/Mono.Data
+SUBDIRS =
+include ../../build/rules.make
+
+LIBRARY = Mono.Data.dll
+LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll \
+ /r:System.Data.dll
+NO_TEST = yes
+
+include ../../build/library.make
Index: Mono.Data/Mono.Data.dll.sources
===================================================================
RCS file: Mono.Data/Mono.Data.dll.sources
diff -N Mono.Data/Mono.Data.dll.sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Mono.Data/Mono.Data.dll.sources 31 Oct 2004 02:54:54 -0000
@@ -0,0 +1,6 @@
+AssemblyInfo.cs
+DataTools.cs
+Provider.cs
+ProviderCollection.cs
+ProviderFactory.cs
+ProviderSectionHandler.cs
Index: Mono.Data/app.config
===================================================================
RCS file: /cvs/public/mcs/class/Mono.Data/app.config,v
retrieving revision 1.3
diff -u -r1.3 app.config
--- Mono.Data/app.config 18 Nov 2002 05:01:58 -0000 1.3
+++ Mono.Data/app.config 31 Oct 2004 02:54:54 -0000
@@ -6,7 +6,11 @@
</sectionGroup>
</configSections>
<appSettings>
- <add key="PubsConnStr"
value="factory=System.Data.SqlClient;server=speedy;database=pubs;uid=sa;pwd=" />
+ <add key="PubsConnStr"
value="factory=System.Data.SqlClient;server=speedy;database=pubs;uid=sa;pwd=mypassword"
/>
+ <add key="OraConnStr" value="factory=System.Data.OracleClient;data
source=testdb;user id=scott;password=tiger" />
+ <add key="PgConnStr"
value="factory=Npgsql;Server=localhost;Database=monotest;User
ID=monotest;Password=monotest" />
+ <add key="MyConnStr"
value="factory=ByteFX.Data.MySqlClient;Database=test" />
+ <add key="FireConnStr"
value="factory=FirebirdSql.Data.Firebird;Database=E:\FIREBIRD\EXAMPLES\EMPLOYEE.FDB;User=SYSDBA;Password=masterkey;Dialect=3;Server=localhost"
/>
</appSettings>
<mono.data>
<providers>
@@ -29,42 +33,57 @@
connection="System.Data.Odbc.OdbcConnection"
adapter="System.Data.Odbc.OdbcDataAdapter"
command="System.Data.Odbc.OdbcCommand"
- assembly="odbc"
+ assembly="System.Data, Version=1.0.3300.0,
Culture=neutral, PublicKeyToken=b77a5c561934e089"
description="ODBC" />
<provider
name="Mono.Data.TdsClient"
connection="Mono.Data.TdsClient.TdsConnection"
adapter="Mono.Data.TdsClient.TdsDataAdapter"
command="Mono.Data.TdsClient.TdsCommand"
- assembly="Mono.Data.TdsClient"
+ assembly="Mono.Data.TdsClient, Version=1.0.5000.0,
Culture=neutral, PublicKeyToken=0738eb9f132ed756"
description="TDS Generic" />
- <provider name="Mono.Data.MySql"
- connection="Mono.Data.MySql.MySqlConnection"
- adapter="Mono.Data.MySql.MySqlDataAdapter"
- command="Mono.Data.MySql.MySqlCommand"
- assembly="Mono.Data.MySql"
+ <provider
+ name="ByteFX.Data.MySqlClient"
+ connection="ByteFX.Data.MySqlClient.MySqlConnection"
+ adapter="ByteFX.Data.MySqlClient.MySqlDataAdapter"
+ command="ByteFX.Data.MySqlClient.MySqlCommand"
+ assembly="ByteFX.Data, Version=0.7.6.1,
Culture=neutral, PublicKeyToken=0738eb9f132ed756"
description="MySQL" />
<provider
- name="Mono.Data.PostgreSqlClient"
-
connection="Mono.Data.PostgreSqlClient.PgSqlConnection"
- adapter="Mono.Data.PostgreSqlClient.PgSqlDataAdapter"
- command="Mono.Data.PostgreSqlClient.PgSqlCommand"
- assembly="Mono.Data.PostgreSqlClient"
+ name="Npgsql"
+ connection="Npgsql.NpgsqlConnection"
+ adapter="Npgsql.NpgsqlDataAdapter"
+ command="Npgsql.NpgsqlCommand"
+ assembly="Npgsql, Version=1.0.5000.0, Culture=neutral,
PublicKeyToken=5d8b90d52f46fda7"
description="PostgreSQL" />
<provider
name="Mono.Data.SqliteClient"
connection="Mono.Data.SqliteClient.SqliteConnection"
adapter="Mono.Data.SqliteClient.SqliteDataAdapter"
command="Mono.Data.SqliteClient.SqliteCommand"
- assembly="Mono.Data.SqliteClient"
+ assembly="Mono.Data.SqliteClient, Version=1.0.5000.0,
Culture=neutral, PublicKeyToken=0738eb9f132ed756"
description="SQL Lite" />
<provider
name="Mono.Data.SybaseClient"
connection="Mono.Data.SybaseClient.SybaseConnection"
adapter="Mono.Data.SybaseClient.SybaseDataAdapter"
command="Mono.Data.SybaseClient.SybaseCommand"
- assembly="Mono.Data.SybaseClient"
+ assembly="Mono.Data.SybaseClient, Version=1.0.5000.0,
Culture=neutral, PublicKeyToken=0738eb9f132ed756"
description="Sybase" />
+ <provider
+ name="FirebirdSql.Data.Firebird"
+ connection="FirebirdSql.Data.Firebird.FbConnection"
+ adapter="FirebirdSql.Data.Firebird.FbDataAdapter"
+ command="FirebirdSql.Data.Firebird.FbCommand"
+ assembly="FirebirdSql.Data.Firebird, Version=1.6.3.0,
Culture=neutral, PublicKeyToken=e1b4f92304d7b12f"
+ description="Firebird" />
+ <provider
+ name="IBM.Data.DB2"
+ connection="IBM.Data.DB2.DB2Connection"
+ adapter="IBM.Data.DB2.DB2DataAdapter"
+ command="IBM.Data.DB2.DB2Command"
+ assembly="IBM.Data.DB2, Version=1.0.1728.9997,
Culture=neutral, PublicKeyToken=7c307b91aa13d208"
+ description="IBM DB2 Universal Database" />
</providers>
</mono.data>
</configuration>
Index: Mono.Data/test/test.cs
===================================================================
RCS file: /cvs/public/mcs/class/Mono.Data/test/test.cs,v
retrieving revision 1.2
diff -u -r1.2 test.cs
--- Mono.Data/test/test.cs 18 Nov 2002 05:01:58 -0000 1.2
+++ Mono.Data/test/test.cs 31 Oct 2004 02:54:54 -0000
@@ -1,6 +1,5 @@
using System;
using System.Data;
-using System.Data.SqlClient;
using Mono.Data;
namespace testclient
Index: Mono.Data/test/test.exe.config
===================================================================
RCS file: /cvs/public/mcs/class/Mono.Data/test/test.exe.config,v
retrieving revision 1.2
diff -u -r1.2 test.exe.config
--- Mono.Data/test/test.exe.config 18 Nov 2002 05:01:58 -0000 1.2
+++ Mono.Data/test/test.exe.config 31 Oct 2004 02:54:54 -0000
@@ -6,7 +6,11 @@
</sectionGroup>
</configSections>
<appSettings>
- <add key="PubsConnStr"
value="factory=System.Data.SqlClient;server=speedy;database=pubs;uid=sa;pwd=" />
+ <add key="PubsConnStr"
value="factory=System.Data.SqlClient;server=speedy;database=pubs;uid=sa;pwd=mypassword"
/>
+ <add key="OraConnStr" value="factory=System.Data.OracleClient;data
source=testdb;user id=scott;password=tiger" />
+ <add key="PgConnStr"
value="factory=Npgsql;Server=localhost;Database=monotest;User
ID=monotest;Password=monotest" />
+ <add key="MyConnStr"
value="factory=ByteFX.Data.MySqlClient;Database=test" />
+ <add key="FireConnStr"
value="factory=FirebirdSql.Data.Firebird;Database=E:\FIREBIRD\EXAMPLES\EMPLOYEE.FDB;User=SYSDBA;Password=masterkey;Dialect=3;Server=localhost"
/>
</appSettings>
<mono.data>
<providers>
@@ -29,42 +33,57 @@
connection="System.Data.Odbc.OdbcConnection"
adapter="System.Data.Odbc.OdbcDataAdapter"
command="System.Data.Odbc.OdbcCommand"
- assembly="odbc"
+ assembly="System.Data, Version=1.0.3300.0,
Culture=neutral, PublicKeyToken=b77a5c561934e089"
description="ODBC" />
<provider
name="Mono.Data.TdsClient"
connection="Mono.Data.TdsClient.TdsConnection"
adapter="Mono.Data.TdsClient.TdsDataAdapter"
command="Mono.Data.TdsClient.TdsCommand"
- assembly="Mono.Data.TdsClient"
+ assembly="Mono.Data.TdsClient, Version=1.0.5000.0,
Culture=neutral, PublicKeyToken=0738eb9f132ed756"
description="TDS Generic" />
- <provider name="Mono.Data.MySql"
- connection="Mono.Data.MySql.MySqlConnection"
- adapter="Mono.Data.MySql.MySqlDataAdapter"
- command="Mono.Data.MySql.MySqlCommand"
- assembly="Mono.Data.MySql"
+ <provider
+ name="ByteFX.Data.MySqlClient"
+ connection="ByteFX.Data.MySqlClient.MySqlConnection"
+ adapter="ByteFX.Data.MySqlClient.MySqlDataAdapter"
+ command="ByteFX.Data.MySqlClient.MySqlCommand"
+ assembly="ByteFX.Data, Version=0.7.6.1,
Culture=neutral, PublicKeyToken=0738eb9f132ed756"
description="MySQL" />
<provider
- name="Mono.Data.PostgreSqlClient"
-
connection="Mono.Data.PostgreSqlClient.PgSqlConnection"
- adapter="Mono.Data.PostgreSqlClient.PgSqlDataAdapter"
- command="Mono.Data.PostgreSqlClient.PgSqlCommand"
- assembly="Mono.Data.PostgreSqlClient"
+ name="Npgsql"
+ connection="Npgsql.NpgsqlConnection"
+ adapter="Npgsql.NpgsqlDataAdapter"
+ command="Npgsql.NpgsqlCommand"
+ assembly="Npgsql, Version=1.0.5000.0, Culture=neutral,
PublicKeyToken=5d8b90d52f46fda7"
description="PostgreSQL" />
<provider
name="Mono.Data.SqliteClient"
connection="Mono.Data.SqliteClient.SqliteConnection"
adapter="Mono.Data.SqliteClient.SqliteDataAdapter"
command="Mono.Data.SqliteClient.SqliteCommand"
- assembly="Mono.Data.SqliteClient"
+ assembly="Mono.Data.SqliteClient, Version=1.0.5000.0,
Culture=neutral, PublicKeyToken=0738eb9f132ed756"
description="SQL Lite" />
<provider
name="Mono.Data.SybaseClient"
connection="Mono.Data.SybaseClient.SybaseConnection"
adapter="Mono.Data.SybaseClient.SybaseDataAdapter"
command="Mono.Data.SybaseClient.SybaseCommand"
- assembly="Mono.Data.SybaseClient"
+ assembly="Mono.Data.SybaseClient, Version=1.0.5000.0,
Culture=neutral, PublicKeyToken=0738eb9f132ed756"
description="Sybase" />
+ <provider
+ name="FirebirdSql.Data.Firebird"
+ connection="FirebirdSql.Data.Firebird.FbConnection"
+ adapter="FirebirdSql.Data.Firebird.FbDataAdapter"
+ command="FirebirdSql.Data.Firebird.FbCommand"
+ assembly="FirebirdSql.Data.Firebird, Version=1.6.3.0,
Culture=neutral, PublicKeyToken=e1b4f92304d7b12f"
+ description="Firebird" />
+ <provider
+ name="IBM.Data.DB2"
+ connection="IBM.Data.DB2.DB2Connection"
+ adapter="IBM.Data.DB2.DB2DataAdapter"
+ command="IBM.Data.DB2.DB2Command"
+ assembly="IBM.Data.DB2, Version=1.0.1728.9997,
Culture=neutral, PublicKeyToken=7c307b91aa13d208"
+ description="IBM DB2 Universal Database" />
</providers>
</mono.data>
</configuration>
