Modified:
trunk/CHANGES
trunk/Driver/MySql.Data.csproj
trunk/Driver/Source/Field.cs
trunk/README
trunk/Release Notes.txt
trunk/TestSuite/MySql.Data.Tests.csproj
trunk/TestSuite/Source/BaseTest.cs
trunk/TestSuite/Source/DataTypeTests.cs
trunk/TestSuite/Source/PreparedStatements.cs
Log:
MySql.Data.csproj - removed SocketStream
Field.cs - changed how we decide if a field is a blob
README & Release notes - updated version #
Mysql.Data.Tests.csproj - updated nunit used.
BaseTests.cs - changed protocol=tcp to protocol=sockets in connection string.
DataTypeTests.cs - added test for checking the output of "SHOW COLUMNS"
PreparedStatements.cs - Added check to make sure this test only happens on mysql 5.0 or later.
Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2007-06-11 22:27:40 UTC (rev 757)
+++ trunk/CHANGES 2007-06-14 16:31:04 UTC (rev 758)
@@ -1,4 +1,4 @@
-Version 5.1.2
+Version 5.1.2 - 6/12/2007
- Fixed integration with the Website Administration Tool. Before this fix, the test link
was visible but did not work and user management did not work.
- Reintroduced code to properly return field values as byte[] when the binary flag is present.
Modified: trunk/Driver/MySql.Data.csproj
===================================================================
--- trunk/Driver/MySql.Data.csproj 2007-06-11 22:27:40 UTC (rev 757)
+++ trunk/Driver/MySql.Data.csproj 2007-06-14 16:31:04 UTC (rev 758)
@@ -133,7 +133,6 @@
<Compile Include="Source\common\Platform.cs" />
<Compile Include="Source\common\SHA1.cs" />
<Compile Include="Source\common\SharedMemoryStream.cs" />
- <Compile Include="Source\common\SocketStream.cs" />
<Compile Include="Source\common\StreamCreator.cs" />
<Compile Include="Source\common\Version.cs" />
<Compile Include="Source\common\WinCE.cs" />
Modified: trunk/Driver/Source/Field.cs
===================================================================
--- trunk/Driver/Source/Field.cs 2007-06-11 22:27:40 UTC (rev 757)
+++ trunk/Driver/Source/Field.cs 2007-06-14 16:31:04 UTC (rev 758)
@@ -143,7 +143,13 @@
public bool IsBlob
{
- get { return (colFlags & ColumnFlags.BLOB) > 0; }
+ get
+ {
+ return (mySqlDbType >= MySqlDbType.TinyBlob &&
+ mySqlDbType <= MySqlDbType.Blob) ||
+ (mySqlDbType >= MySqlDbType.TinyText &&
+ mySqlDbType <= MySqlDbType.Text);
+ }
}
public bool IsBinary
Modified: trunk/README
===================================================================
--- trunk/README 2007-06-11 22:27:40 UTC (rev 757)
+++ trunk/README 2007-06-14 16:31:04 UTC (rev 758)
@@ -1,4 +1,4 @@
-MySQL Connector/Net 5.1.1
+MySQL Connector/Net 5.1.2
MySQL AB's ADO.Net Driver for MySQL
Copyright (c) 2004-2007 MySQL AB
Modified: trunk/Release Notes.txt
===================================================================
--- trunk/Release Notes.txt 2007-06-11 22:27:40 UTC (rev 757)
+++ trunk/Release Notes.txt 2007-06-14 16:31:04 UTC (rev 758)
@@ -14,4 +14,9 @@
MySqlDataReader.GetString(). Please let us know how this issue affects you. We
are evaluating adding a connection option to make the past behavior available.
+Known Issues
+------------
+1. Creating a procedure with the name StoredProcedure1 will cause any future attempts
+ to create a stored procedure to fail.
+
Modified: trunk/TestSuite/MySql.Data.Tests.csproj
===================================================================
--- trunk/TestSuite/MySql.Data.Tests.csproj 2007-06-11 22:27:40 UTC (rev 757)
+++ trunk/TestSuite/MySql.Data.Tests.csproj 2007-06-14 16:31:04 UTC (rev 758)
@@ -32,7 +32,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.4.0.2, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
+ <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Data" />
Modified: trunk/TestSuite/Source/BaseTest.cs
===================================================================
--- trunk/TestSuite/Source/BaseTest.cs 2007-06-11 22:27:40 UTC (rev 757)
+++ trunk/TestSuite/Source/BaseTest.cs 2007-06-14 16:31:04 UTC (rev 758)
@@ -110,7 +110,7 @@
protected virtual string GetConnectionInfo()
{
- return String.Format("protocol=tcp;port={0}", port);
+ return String.Format("protocol=sockets;port={0}", port);
}
protected string GetConnectionString(bool includedb)
Modified: trunk/TestSuite/Source/DataTypeTests.cs
===================================================================
--- trunk/TestSuite/Source/DataTypeTests.cs 2007-06-11 22:27:40 UTC (rev 757)
+++ trunk/TestSuite/Source/DataTypeTests.cs 2007-06-14 16:31:04 UTC (rev 758)
@@ -774,5 +774,24 @@
Assert.AreEqual(typeof(byte[]), dt.Columns[3].DataType);
Assert.AreEqual(typeof(byte[]), dt.Columns[4].DataType);
}
+
+ [Test]
+ public void ShowColumns()
+ {
+ if (version < new Version(5, 0)) return;
+
+ MySqlDataAdapter da = new MySqlDataAdapter(
+ @"SELECT TRIM(TRAILING ' unsigned' FROM
+ TRIM(TRAILING ' zerofill' FROM COLUMN_TYPE)) AS MYSQL_TYPE,
+ IF(COLUMN_DEFAULT IS NULL, NULL,
+ IF(ASCII(COLUMN_DEFAULT) = 1 OR COLUMN_DEFAULT = '1', 1, 0))
+ AS TRUE_DEFAULT FROM INFORMATION_SCHEMA.COLUMNS
+ WHERE TABLE_SCHEMA='test' AND TABLE_NAME='test'", conn);
+ DataTable dt = new DataTable();
+ da.Fill(dt);
+
+ Assert.AreEqual(typeof(string), dt.Columns[0].DataType);
+ Assert.AreEqual(typeof(Int64), dt.Columns[1].DataType);
+ }
}
}
Modified: trunk/TestSuite/Source/PreparedStatements.cs
===================================================================
--- trunk/TestSuite/Source/PreparedStatements.cs 2007-06-11 22:27:40 UTC (rev 757)
+++ trunk/TestSuite/Source/PreparedStatements.cs 2007-06-14 16:31:04 UTC (rev 758)
@@ -752,6 +752,8 @@
[Test]
public void ClosingCommandsProperly()
{
+ if (version < new Version(5, 0)) return;
+
execSQL("DROP TABLE IF EXISTS test");
execSQL("CREATE TABLE test (id INT, name VARCHAR(50))");
| Thread |
|---|
| • Connector/NET commit: r758 - in trunk: . Driver Driver/Source TestSuite TestSuite/Source | rburnett | 14 Jun |
