From: Date: May 20 2008 5:15pm
Subject: Connector/NET commit: r1299 - in branches/5.2: . MySql.Web/Providers MySql.Web/Providers/Properties MySql.Web/Providers/Source MySql.Web/Tests
List-Archive: http://lists.mysql.com/commits/46866
X-Bug: 36444
Message-Id: <200805201515.m4KFFBgM022692@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   branches/5.2/CHANGES
   branches/5.2/MySql.Web/Providers/MySql.Web.csproj
   branches/5.2/MySql.Web/Providers/Properties/Resources.resx
   branches/5.2/MySql.Web/Providers/Source/SchemaManager.cs
   branches/5.2/MySql.Web/Tests/BaseTest.cs
   branches/5.2/MySql.Web/Tests/SchemaTests.cs
Log:
- Fixed problem where some tables that support the web providers used the latin1
  character set instead of the database default.  (bug #36444) 

Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES	2008-05-15 22:15:25 UTC (rev 1298)
+++ branches/5.2/CHANGES	2008-05-20 15:15:11 UTC (rev 1299)
@@ -1,6 +1,8 @@
 Version 5.2.3
 - Increased the speed of MySqlDataReader.GetOrdinal dramatically by using a couple
   of hashes for lookups
+- Fixed problem where some tables that support the web providers used the latin1
+  character set instead of the database default.  (bug #36444) 
   
 Version 5.2.2 - 
 - Fixed profile provider that would throw an exception if you were updating

Modified: branches/5.2/MySql.Web/Providers/MySql.Web.csproj
===================================================================
--- branches/5.2/MySql.Web/Providers/MySql.Web.csproj	2008-05-15 22:15:25 UTC (rev 1298)
+++ branches/5.2/MySql.Web/Providers/MySql.Web.csproj	2008-05-20 15:15:11 UTC (rev 1299)
@@ -72,7 +72,8 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\schema1.sql" />
+    <None Include="Properties\schema1.sql" />
+    <None Include="Properties\schema4.sql" />
     <None Include="Properties\schema2.sql" />
     <None Include="Properties\schema3.sql" />
   </ItemGroup>

Modified: branches/5.2/MySql.Web/Providers/Properties/Resources.resx
===================================================================
--- branches/5.2/MySql.Web/Providers/Properties/Resources.resx	2008-05-15 22:15:25 UTC (rev 1298)
+++ branches/5.2/MySql.Web/Providers/Properties/Resources.resx	2008-05-20 15:15:11 UTC (rev 1299)
@@ -229,4 +229,7 @@
   <data name="PasswordQuestionInvalid" xml:space="preserve">
     <value>Password question supplied is invalid.</value>
   </data>
+  <data name="schema4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>schema4.sql;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>
\ No newline at end of file

Modified: branches/5.2/MySql.Web/Providers/Source/SchemaManager.cs
===================================================================
--- branches/5.2/MySql.Web/Providers/Source/SchemaManager.cs	2008-05-15 22:15:25 UTC (rev 1298)
+++ branches/5.2/MySql.Web/Providers/Source/SchemaManager.cs	2008-05-20 15:15:11 UTC (rev 1299)
@@ -39,7 +39,7 @@
     /// </summary>
     public static class SchemaManager
     {
-        private const int schemaVersion = 3;
+        private const int schemaVersion = 4;
 
         /// <summary>
         /// Gets the most recent version of the schema.

Modified: branches/5.2/MySql.Web/Tests/BaseTest.cs
===================================================================
--- branches/5.2/MySql.Web/Tests/BaseTest.cs	2008-05-15 22:15:25 UTC (rev 1298)
+++ branches/5.2/MySql.Web/Tests/BaseTest.cs	2008-05-20 15:15:11 UTC (rev 1299)
@@ -77,25 +77,14 @@
 			ConfigurationManager.RefreshSection("system.web/membership");
 		}
 
-        [TestFixtureSetUp]
-        public override void FixtureSetup()
-        {
-            base.FixtureSetup();
-            for (int ver = 1; ver <= SchemaManager.Version; ver++)
-                LoadSchema(ver);
-        }
-
         public override void Setup()
         {
            base.Setup();
-           execSQL("TRUNCATE TABLE my_aspnet_Applications");
-           execSQL("TRUNCATE TABLE my_aspnet_Membership");
-           execSQL("TRUNCATE TABLE my_aspnet_Profiles");
-           execSQL("TRUNCATE TABLE my_aspnet_Roles");
-           execSQL("TRUNCATE TABLE my_aspnet_Users");
-           execSQL("TRUNCATE TABLE my_aspnet_UsersInRoles");
-       }
 
+           for (int ver = 1; ver <= SchemaManager.Version; ver++)
+               LoadSchema(ver);
+        }
+
         protected void LoadSchema(int version)
         {
             if (version < 1) return;

Modified: branches/5.2/MySql.Web/Tests/SchemaTests.cs
===================================================================
--- branches/5.2/MySql.Web/Tests/SchemaTests.cs	2008-05-15 22:15:25 UTC (rev 1298)
+++ branches/5.2/MySql.Web/Tests/SchemaTests.cs	2008-05-20 15:15:11 UTC (rev 1299)
@@ -129,16 +129,28 @@
             }
         }
 
+        /// <summary>
+        /// Bug #36444 'autogenerateschema' produces tables with 'random' collations 
+        /// </summary>
         [Test]
         public void CurrentSchema()
         {
+            execSQL("set character_set_database=utf8");
+
             LoadSchema(1);
             LoadSchema(2);
             LoadSchema(3);
+            LoadSchema(4);
 
             MySqlCommand cmd = new MySqlCommand("SELECT * FROM my_aspnet_SchemaVersion", conn);
             object ver = cmd.ExecuteScalar();
-            Assert.AreEqual(3, ver);
+            Assert.AreEqual(4, ver);
+
+            MySqlDataAdapter da = new MySqlDataAdapter("SHOW CREATE TABLE my_aspnet_membership", conn);
+            DataTable dt = new DataTable();
+            da.Fill(dt);
+            string createSql = dt.Rows[0][1].ToString();
+            Assert.IsTrue(createSql.IndexOf("CHARSET=utf8") != -1);
         }
 
         [Test]