Lupus, Miguel, or Uma:
Can someone approve this patch please?
Here is the ChangeLog entry:
2004-10-30 Daniel Morgan <[EMAIL PROTECTED]>
Retrofit changes from HEAD to mono-1-0 release
2004-10-21 Daniel Morgan <[EMAIL PROTECTED]>
* SqlSharpCli.cs: removed obsolete providers (Mono.Data.MySql,
Mono.Data.PostgreSqlClient, Mono.Data.DB2Client),
added provider for FirebirdSql.Data.Firebird, fixed
loading of external providers so they work with
Mono having a GAC
* README: added connection string for Firebird SQL
and removed old stuff
? diff.txt
Index: ChangeLog
===================================================================
RCS file: /cvs/public/mcs/tools/SqlSharp/ChangeLog,v
retrieving revision 1.15
diff -u -r1.15 ChangeLog
--- ChangeLog 9 Jun 2004 08:08:03 -0000 1.15
+++ ChangeLog 31 Oct 2004 01:25:05 -0000
@@ -1,3 +1,18 @@
+2004-10-30 Daniel Morgan <[EMAIL PROTECTED]>
+
+ Retrofit changes from HEAD to mono-1-0 release
+
+ 2004-10-21 Daniel Morgan <[EMAIL PROTECTED]>
+
+ * SqlSharpCli.cs: removed obsolete providers (Mono.Data.MySql,
+ Mono.Data.PostgreSqlClient, Mono.Data.DB2Client),
+ added provider for FirebirdSql.Data.Firebird, fixed
+ loading of external providers so they work with
+ Mono having a GAC
+
+ * README: added connection string for Firebird SQL
+ and removed old stuff
+
2004-06-09 Raja R Harinath <[EMAIL PROTECTED]>
* Makefile (HAS_TEST): Remove.
Index: README
===================================================================
RCS file: /cvs/public/mcs/tools/SqlSharp/README,v
retrieving revision 1.5
diff -u -r1.5 README
--- README 20 Jan 2003 23:14:46 -0000 1.5
+++ README 31 Oct 2004 01:25:05 -0000
@@ -1,7 +1,7 @@
-SQL# CLI - SQL Sharp Command Line Interface
-===========================================
+Mono SQL Query - Command Line Interface
+=======================================
-Running SQL# CLI on Mono:
+Running SQL Query on Mono:
mono sqlsharp.exe
Use this tool to test connection strings and enter SQL queries
@@ -36,12 +36,10 @@
Microsoft SQL Server via System.Data.SqlClient or Mono.Data.TdsClient provider:
SQL# \ConnectionString Server=DANPC;Database=pubs;User
ID=danmorg;Password=freetds
- PostgreSQL via Mono.Data.PostgreSqlClient provider:
- SQL# \ConnectionString
host=localhost;dbname=test;user=postgres;pass=fun2db
- or
+ PostgreSQL via Npgsql provider:
SQL# \ConnectionString Server=localhost;Database=test;User
ID=postgres;Password=fun2db
- MySQL via Mono.Data.MySql provider:
+ MySQL via ByteFX.Data.MySqlClient provider:
SQL# \ConnectionString Server=localhost;Database=test;User
ID=mysql;Password=
ODBC via System.Data.Odbc provider using a DSN named "MSSQLDSN" I set up
@@ -58,33 +56,25 @@
Oracle via System.Data.OracleClient
SQL# \ConnectionString Data Source=testdb;User ID=scott;Password=tiger
-
- IBM DB2 Universal Database via Mono.Data.DB2Client
- SQL# \ConnectionString DSN=sample;User ID=db2admin;Password=mysecret
-
- Npgsql (.NET PostgreSQL) from
http://gborg.postgresql.org/project/npgsql/projdisplay.php
- SQL# \ConnectionString Server=localhost;Database=test;User
ID=postgres;Password=fun2db
-
- MySQLNet (ByteFX MySQL) from http://sourceforge.net/projects/mysqlnet/
- SQL# \ConnectionString Server=localhost;Database=test;User
ID=mysql;Password=
+
+ FirebirdSql via FirebirdSql.Data.Firebird (not included with Mono)
+ SQL# \ConnectionString
Database=C:\FIREBIRD\EXAMPLES\EMPLOYEE.FDB;User=SYSDBA;Password=masterkey;Dialect=3;Server=localhost
+
\Provider to set the Provider:
Provider Name Namespace Assembly
=========== ============= ========================== ==========================
- OleDb OLE DB System.Data.OleDb System.Data
+ OleDb OLE DB System.Data.OleDb System.Data
SqlClient MS SQL 7/2000 System.Data.SqlClient System.Data
Odbc ODBC System.Data.Odbc System.Data
- ----------- ------------- -------------------------- --------------------------
- MySql MySQL Mono.Data.MySql Mono.Data.MySql
- PostgreSql PostgreSQL Mono.Data.PostgreSqlClient Mono.Data.PostgreSqlClient
Sqlite SQL Lite Mono.Data.SqliteClient Mono.Data.SqliteClient
Sybase Sybase Mono.Data.SybaseClient Mono.Data.SybaseClient
Tds TDS Generic Mono.Data.TdsClient Mono.Data.TdsClient
Oracle Oracle 8i System.Data.OracleClient System.Data.OracleClient
- ----------- ------------- -------------------------- --------------------------
- Npgsql NET Postgres Npgsql Npgsql
- MySQLNet ByteFX MySQL ByteFX.Data.MySQLClient ByteFX.Data
+ PostgreSql NET Postgres Npgsql Npgsql
+ MySql ByteFX MySQL ByteFX.Data.MySqlClient ByteFX.Data
+ Firebird Firebird FirebirdSql.Data.Firebird FirebirdSql.Data.Firebird
Example: to set the provider for MySQL:
SQL# \provider mysql
Index: SqlSharpCli.cs
===================================================================
RCS file: /cvs/public/mcs/tools/SqlSharp/SqlSharpCli.cs,v
retrieving revision 1.22
diff -u -r1.22 SqlSharpCli.cs
--- SqlSharpCli.cs 28 Sep 2003 10:49:50 -0000 1.22
+++ SqlSharpCli.cs 31 Oct 2004 01:25:05 -0000
@@ -1,30 +1,15 @@
//
-// SqlSharpCli.cs - main driver for SQL# Command Line Interface
+// SqlSharpCli.cs - main driver for Mono SQL Query Command Line Interface
// found in mcs/tools/SqlSharp
//
-// SQL# is a SQL query tool allowing to enter queries and get
-// back results displayed to the console, to an html file, or
-// an xml file. SQL non-query commands and aggregates can be
-// can be entered too.
-//
-// Can be used to test the various data providers in Mono
-// and data providers external to Mono.
-//
-// There is a GTK# version of SQL#
-// found in mcs/tools/SqlSharp/gui/gtk-sharp
-//
// This program is included in Mono and is licenced under the GPL.
// http://www.fsf.org/licenses/gpl.html
//
// For more information about Mono,
-// visit http://www.go-mono.com/
+// visit http://www.mono-project.com/
//
-// To build SqlSharpCli.cs on Linux:
-// $ mcs SqlSharpCli.cs -r System.Data.dll
-//
-// To build SqlSharpCli.exe on Windows:
-// $ mono c:/cygwin/home/someuser/mono/install/bin/mcs.exe \
-// SqlSharpCli.cs -r System.Data.dll
+// To build SqlSharpCli.cs
+// $ mcs SqlSharpCli.cs /r:System.Data.dll
//
// To run with mono:
// $ mono SqlSharpCli.exe
@@ -36,9 +21,9 @@
// $ cat commands.txt | mono SqlSharpCli.exe > results.txt
//
// Author:
-// Daniel Morgan <[EMAIL PROTECTED]>
+// Daniel Morgan <[EMAIL PROTECTED]>
//
-// (C)Copyright 2002 Daniel Morgan
+// (C)Copyright 2002-2004 Daniel Morgan
//
using System;
@@ -686,9 +671,6 @@
DbDataAdapter adapter = null;
switch(provider) {
- case "ODBC":
- //adapter = (DbDataAdapter) new OdbcDataAdapter ();
- break;
case "OLEDB":
adapter = (DbDataAdapter) new OleDbDataAdapter ();
break;
@@ -734,8 +716,8 @@
Console.WriteLine(@"Type: \Q to quit");
Console.WriteLine(@" \ConnectionString to set the
ConnectionString");
Console.WriteLine(@" \Provider to set the Provider:");
- Console.WriteLine(@"
{OleDb,SqlClient,MySql,MySqlNet,Odbc,DB2,");
- Console.WriteLine(@"
Oracle,PostgreSql,Npgsql,Sqlite,Sybase,Tds)");
+ Console.WriteLine(@"
{OleDb,SqlClient,MySql,Odbc,DB2,");
+ Console.WriteLine(@"
Oracle,PostgreSql,Sqlite,Sybase,Tds)");
Console.WriteLine(@" \Open to open the connection");
Console.WriteLine(@" \Close to close the connection");
Console.WriteLine(@" \e to execute SQL query (SELECT)");
@@ -750,8 +732,8 @@
Console.WriteLine(@"Type: \Q to quit");
Console.WriteLine(@" \ConnectionString to set the
ConnectionString");
Console.WriteLine(@" \Provider to set the Provider:");
- Console.WriteLine(@"
{OleDb,SqlClient,MySql,MySqlNet,Odbc,MSODBC,DB2,");
- Console.WriteLine(@"
Oracle,PostgreSql,Npgsql,Sqlite,Sybase,Tds}");
+ Console.WriteLine(@"
{OleDb,SqlClient,MySql,Odbc,MSODBC,");
+ Console.WriteLine(@"
Oracle,PostgreSql,Sqlite,Sybase,Tds}");
Console.WriteLine(@" \Open to open the connection");
Console.WriteLine(@" \Close to close the connection");
Console.WriteLine(@" \e to execute SQL query (SELECT)");
@@ -885,25 +867,16 @@
case "ORACLE":
extp = new string[3] {
"\\loadextprovider",
-
"System.Data.OracleClient",
+
@"System.Data.OracleClient, Version=1.0.5000.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089",
"System.Data.OracleClient.OracleConnection"};
SetupExternalProvider(extp);
UseParameters = false;
UseSimpleReader = false;
break;
- case "DB2":
- extp = new string[3] {
-
"\\loadextprovider",
-
"Mono.Data.DB2Client",
-
"Mono.Data.DB2Client.DB2ClientConnection"};
- SetupExternalProvider(extp);
- UseParameters = false;
- UseSimpleReader = true;
- break;
case "TDS":
extp = new string[3] {
"\\loadextprovider",
-
"Mono.Data.TdsClient",
+
@"Mono.Data.TdsClient, Version=1.0.5000.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756",
"Mono.Data.TdsClient.TdsConnection"};
SetupExternalProvider(extp);
UseParameters = false;
@@ -912,35 +885,27 @@
case "SYBASE":
extp = new string[3] {
"\\loadextprovider",
-
"Mono.Data.SybaseClient",
+
@"Mono.Data.SybaseClient, Version=1.0.5000.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756",
"Mono.Data.SybaseClient.SybaseConnection"};
SetupExternalProvider(extp);
UseParameters = false;
UseSimpleReader = false;
break;
case "MYSQL":
- extp = new string[3] {
-
"\\loadextprovider",
- "Mono.Data.MySql",
-
"Mono.Data.MySql.MySqlConnection"};
- SetupExternalProvider(extp);
- UseParameters = false;
- UseSimpleReader = false;
- break;
case "MYSQLNET":
extp = new string[3] {
"\\loadextprovider",
- "ByteFX.Data",
-
"ByteFX.Data.MySQLClient.MySQLConnection"};
+ @"ByteFX.Data,
Version=0.7.6.1, Culture=neutral, PublicKeyToken=0738eb9f132ed756",
+
"ByteFX.Data.MySqlClient.MySqlConnection"};
SetupExternalProvider(extp);
UseParameters = false;
UseSimpleReader = false;
break;
case "SQLITE":
extp = new string[3] {
-
"\\loadextprovider",
-
"Mono.Data.SqliteClient",
-
"Mono.Data.SqliteClient.SqliteConnection"};
+
"\\loadextprovider",
+
@"Mono.Data.SqliteClient, Version=1.0.5000.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756",
+
"Mono.Data.SqliteClient.SqliteConnection"};
SetupExternalProvider(extp);
UseParameters = false;
UseSimpleReader = true;
@@ -950,20 +915,20 @@
UseSimpleReader = false;
provider = parm;
break;
- case "ODBC":
+ case "ODBC": // for MS NET 1.1 and above
extp = new string[3] {
-
"\\loadextprovider",
-
"System.Data",
-
"System.Data.Odbc.OdbcConnection"};
+
"\\loadextprovider",
+ @"System.Data,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+
"System.Data.Odbc.OdbcConnection"};
SetupExternalProvider(extp);
UseParameters = false;
UseSimpleReader = false;
break;
- case "MSODBC":
+ case "MSODBC": // for MS NET 1.0
extp = new string[3] {
-
"\\loadextprovider",
-
@"Microsoft.Data.Odbc, Culture=neutral, PublicKeyToken=b77a5c561934e089,
Version=1.0.3300.0",
-
"Microsoft.Data.Odbc.OdbcConnection"};
+
"\\loadextprovider",
+
@"Microsoft.Data.Odbc, Culture=neutral, PublicKeyToken=b77a5c561934e089,
Version=1.0.3300.0",
+
"Microsoft.Data.Odbc.OdbcConnection"};
SetupExternalProvider(extp);
UseParameters = false;
UseSimpleReader = false;
@@ -973,19 +938,20 @@
UseSimpleReader = true;
provider = parm;
break;
- case "POSTGRESQL":
+ case "FIREBIRD":
extp = new string[3] {
-
"\\loadextprovider",
-
"Mono.Data.PostgreSqlClient",
-
"Mono.Data.PostgreSqlClient.PgSqlConnection"};
+
"\\loadextprovider",
+
@"FirebirdSql.Data.Firebird, Version=1.6.3.0, Culture=neutral,
PublicKeyToken=e1b4f92304d7b12f",
+
"FirebirdSql.Data.Firebird.FbConnection"};
SetupExternalProvider(extp);
UseParameters = false;
UseSimpleReader = false;
break;
+ case "POSTGRESQL":
case "NPGSQL":
extp = new string[3] {
"\\loadextprovider",
- "Npgsql",
+ @"Npgsql,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7",
"Npgsql.NpgsqlConnection"};
SetupExternalProvider(extp);
UseParameters = false;
