| List: | Commits | « Previous MessageNext Message » | |
| From: | rburnett | Date: | January 11 2007 11:16pm |
| Subject: | Connector/NET commit: r549 - in branches/1.0: . TestSuite mysqlclient | ||
| View as plain text | |||
Modified: branches/1.0/Client.build branches/1.0/TestSuite/BlobTests.cs branches/1.0/TestSuite/CommandBuilderTests.cs branches/1.0/TestSuite/CommandTests.cs branches/1.0/TestSuite/ConnectionTests.cs branches/1.0/TestSuite/DataAdapterTests.cs branches/1.0/TestSuite/DataReaderTests.cs branches/1.0/TestSuite/DataTypeTests.cs branches/1.0/TestSuite/DateTimeTests.cs branches/1.0/TestSuite/ParameterTests.cs branches/1.0/TestSuite/StoredProcedure.cs branches/1.0/TestSuite/Syntax.cs branches/1.0/mysqlclient/command.cs Log: Client.build - changed the core compilation task to only generate the C# docs file when the .net-1.1 target was being used. This silenced alot of mono warnings. The other changes were to add some silly code that will mark some variables as used for the mono compiler. The .NET compiler doesn't need this as it recognizes the variables as being used. Modified: branches/1.0/Client.build =================================================================== --- branches/1.0/Client.build 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/Client.build 2007-01-11 22:16:15 UTC (rev 549) @@ -40,15 +40,16 @@ <!-- core managed driver target --> <target name="client" description="Core client target"> - <property name="nunit-lib" value="${nunit.dir}/bin"/> <property name="nant.settings.currentframework" value="${framework}"/> <property name="outdir" value="mysqlclient/bin/${framework}/${buildType}"/> - + <mkdir dir="${outdir}" failonerror="false"/> <resgen input="mysqlclient/Resources.resx" output="mysqlclient/Resources.resources"/> + <csc output="${outdir}/MySql.Data.dll" target="library" define="${defines}" debug="${debug}" optimize="${opt}" - doc="${outdir}/MySql.Data.xml"> + doc="${outdir}/MySql.Data.xml" + if="${property::get-value('framework') == 'net-1.1'}"> <arg value="/nowarn:0679"/> <resources prefix="MySql.Data.MySqlClient" dynamicprefix="false"> <include name="mysqlclient/Resources.resources"/> @@ -59,6 +60,19 @@ </references> <sources refid="Source"/> </csc> + <csc output="${outdir}/MySql.Data.dll" target="library" + define="${defines}" debug="${debug}" optimize="${opt}" + unless="${property::get-value('framework') == 'net-1.1'}"> + <arg value="/nowarn:0679"/> + <resources prefix="MySql.Data.MySqlClient" dynamicprefix="false"> + <include name="mysqlclient/Resources.resources"/> + </resources> + <references> + <include name="System.Data.dll"/> + <include name="System.Drawing.dll"/> + </references> + <sources refid="Source"/> + </csc> <csc output="${outdir}/MySql.Data.Tests.dll" target="library" debug="${debug}" define="${defines}" optimize="${opt}"> <arg value="/nowarn:0679"/> <sources> @@ -76,6 +90,7 @@ <!-- core managed driver target 1.0 --> <target name="net-1.0" description="1.0 .NET target"> <property name="nunit.dir" value="${nunit1.dir}"/> + <property name="nunit-lib" value="${nunit.dir}/bin"/> <property name="framework" value="net-1.0"/> <call target="client"/> </target> @@ -83,6 +98,7 @@ <!-- core managed driver target 1.1 --> <target name="net-1.1" description="1.1 .NET target"> <property name="nunit.dir" value="${nunit1.dir}"/> + <property name="nunit-lib" value="${nunit.dir}/bin"/> <property name="framework" value="net-1.1"/> <call target="client"/> </target> @@ -90,6 +106,7 @@ <!-- core managed driver target 2.0 --> <target name="net-2.0" description="2.0 .NET target"> <property name="nunit.dir" value="${nunit2.dir}"/> + <property name="nunit-lib" value="${nunit.dir}/bin"/> <property name="framework" value="net-2.0"/> <if test="${string::get-length(defines) > 0}"> <property name="defines" value="${defines},"/> @@ -99,8 +116,8 @@ </target> <!-- core managed driver target mono 1.0 --> - <target name="mono-1.0" description="Mono 1.0 Target"> - <property name="nunit-lib" value="${framework::get-assembly-directory('mono-1.0')}"/> + <target name="mono-1.0" description="Mono 1.0 Target"> + <property name="nunit-lib" value="${framework::get-assembly-directory('mono-1.0')}"/> <property name="framework" value="mono-1.0"/> <call target="client"/> </target> Modified: branches/1.0/TestSuite/BlobTests.cs =================================================================== --- branches/1.0/TestSuite/BlobTests.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/TestSuite/BlobTests.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -272,6 +272,7 @@ { MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); // keep mono happy DataTable dt = new DataTable(); da.Fill(dt); Modified: branches/1.0/TestSuite/CommandBuilderTests.cs =================================================================== --- branches/1.0/TestSuite/CommandBuilderTests.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/TestSuite/CommandBuilderTests.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -55,6 +55,7 @@ { MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); // keep mono happy DataTable dt = new DataTable(); da.Fill(dt); @@ -87,6 +88,7 @@ MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da, true); + cb.ToString(); DataTable dt = new DataTable(); da.Fill(dt); @@ -189,6 +191,7 @@ MySqlDataAdapter da = new MySqlDataAdapter( String.Format("SELECT id, name FROM {0}.test", databases[0]), conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); DataSet ds = new DataSet(); da.Fill(ds); @@ -241,6 +244,7 @@ da.FillSchema(ds, SchemaType.Source, "test"); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); DataTable dt = new DataTable(); da.Fill(dt); dt.Rows[0]["id"] = 2; @@ -268,6 +272,7 @@ "name VARCHAR(100), PRIMARY KEY(id))"); MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); DataTable dt = new DataTable(); da.Fill(dt); Modified: branches/1.0/TestSuite/CommandTests.cs =================================================================== --- branches/1.0/TestSuite/CommandTests.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/TestSuite/CommandTests.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -366,7 +366,7 @@ MySqlCommand cmd = new MySqlCommand("SELECT * FROM test", conn); try { - object o = cmd.ExecuteScalar(); + cmd.ExecuteScalar(); } catch (Exception) { Modified: branches/1.0/TestSuite/ConnectionTests.cs =================================================================== --- branches/1.0/TestSuite/ConnectionTests.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/TestSuite/ConnectionTests.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -173,8 +173,6 @@ { try { - string connStr = conn.ConnectionString; - // connect with no db string connStr2 = GetConnectionString(false); MySqlConnection c = new MySqlConnection(connStr2); Modified: branches/1.0/TestSuite/DataAdapterTests.cs =================================================================== --- branches/1.0/TestSuite/DataAdapterTests.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/TestSuite/DataAdapterTests.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -90,6 +90,7 @@ MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); // keep mono happy DataTable dt = new DataTable(); da.Fill(dt); @@ -363,7 +364,8 @@ MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); - DataSet ds = new DataSet(); + cb.ToString(); + DataSet ds = new DataSet(); da.Fill(ds); Assert.AreEqual(1, ds.Tables[0].Rows[0]["id"]); DataRow row = ds.Tables[0].NewRow(); @@ -545,6 +547,7 @@ MySqlConnection c = new MySqlConnection(GetConnectionString(true)); MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", c); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); Assert.IsTrue(c.State == ConnectionState.Closed); DataTable dt = new DataTable(); da.Fill(dt); Modified: branches/1.0/TestSuite/DataReaderTests.cs =================================================================== --- branches/1.0/TestSuite/DataReaderTests.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/TestSuite/DataReaderTests.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -825,7 +825,7 @@ { reader = cmd.ExecuteReader(); reader.Read(); - string s = reader.GetString(reader.GetOrdinal("Sub_part")); + reader.GetString(reader.GetOrdinal("Sub_part")); Assert.Fail("We should not get here"); } catch (System.Data.SqlTypes.SqlNullValueException) Modified: branches/1.0/TestSuite/DataTypeTests.cs =================================================================== --- branches/1.0/TestSuite/DataTypeTests.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/TestSuite/DataTypeTests.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -531,6 +531,7 @@ MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); // keep mono happy DataTable dt = new DataTable(); da.Fill(dt); DataRow row = dt.NewRow(); @@ -674,6 +675,7 @@ MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); // keep mono happy DataTable dt = new DataTable(); da.Fill(dt); Modified: branches/1.0/TestSuite/DateTimeTests.cs =================================================================== --- branches/1.0/TestSuite/DateTimeTests.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/TestSuite/DateTimeTests.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -194,6 +194,7 @@ DataTable dt = new DataTable(); MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", c); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); // keep mono happy da.Fill(dt); dt.Rows[0]["id"] = 2; DataRow row = dt.NewRow(); @@ -233,6 +234,7 @@ c.Open(); MySqlDataAdapter da = new MySqlDataAdapter("SELECT id, dt FROM Test", c); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); // keep mono happy DataTable dt = new DataTable(); dt.Columns.Add(new DataColumn("id", typeof(int))); @@ -448,6 +450,7 @@ MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", c); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); + cb.ToString(); // keep mono happy DataTable dt = new DataTable(); try { Modified: branches/1.0/TestSuite/ParameterTests.cs =================================================================== --- branches/1.0/TestSuite/ParameterTests.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/TestSuite/ParameterTests.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -191,7 +191,6 @@ { try { - IDbConnection conn2 = (IDbConnection)conn; IDbCommand cmd = conn.CreateCommand(); IDbDataParameter prm = cmd.CreateParameter(); prm.DbType = DbType.Int64; Modified: branches/1.0/TestSuite/StoredProcedure.cs =================================================================== --- branches/1.0/TestSuite/StoredProcedure.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/TestSuite/StoredProcedure.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -530,7 +530,6 @@ MySqlCommand cmd = new MySqlCommand("spTest", conn); cmd.CommandType = CommandType.StoredProcedure; - MySqlDataAdapter da = new MySqlDataAdapter(cmd); MySqlCommandBuilder.DeriveParameters(cmd); Assert.AreEqual(9, cmd.Parameters.Count); @@ -575,7 +574,6 @@ cmd.CommandText = "spTest"; cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.Clear(); - da = new MySqlDataAdapter(cmd); MySqlCommandBuilder.DeriveParameters(cmd); Assert.AreEqual(0, cmd.Parameters.Count); } @@ -593,7 +591,6 @@ MySqlCommand cmd = new MySqlCommand("fnTest", conn); cmd.CommandType = CommandType.StoredProcedure; - MySqlDataAdapter da = new MySqlDataAdapter(cmd); MySqlCommandBuilder.DeriveParameters(cmd); Assert.AreEqual(2, cmd.Parameters.Count); Modified: branches/1.0/TestSuite/Syntax.cs =================================================================== --- branches/1.0/TestSuite/Syntax.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/TestSuite/Syntax.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -425,7 +425,7 @@ MySqlCommand cmd = new MySqlCommand("SELEKT NOW() as theTime", conn); try { - object o = cmd.ExecuteScalar(); + cmd.ExecuteScalar(); } catch (MySqlException ex) { Modified: branches/1.0/mysqlclient/command.cs =================================================================== --- branches/1.0/mysqlclient/command.cs 2007-01-11 20:18:19 UTC (rev 548) +++ branches/1.0/mysqlclient/command.cs 2007-01-11 22:16:15 UTC (rev 549) @@ -364,7 +364,7 @@ if (mex.IsFatal) connection.Terminate(); throw; } - catch (Exception ex) + catch (Exception) { connection.Terminate(); throw;
| Thread | ||
|---|---|---|
| • Connector/NET commit: r549 - in branches/1.0: . TestSuite mysqlclient | rburnett | 11 Jan |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.745 sec. using MySQL 5.1.14-beta-log