| List: | Commits | « Previous MessageNext Message » | |
| From: | rburnett | Date: | December 12 2006 4:13am |
| Subject: | Connector/NET commit: r492 - in trunk: . TestSuite | ||
| View as plain text | |||
Modified: trunk/Client.build trunk/TestSuite/ConnectionTests.cs trunk/TestSuite/GetSchemaTests.cs trunk/TestSuite/StoredProcedure.cs Log: 1. disabled named pipe testing temporarily 2. fixed several more test failures when test suite is run with non-super account Modified: trunk/Client.build =================================================================== --- trunk/Client.build 2006-12-12 02:17:38 UTC (rev 491) +++ trunk/Client.build 2006-12-12 03:13:24 UTC (rev 492) @@ -158,13 +158,13 @@ <call target="testdb"/> --> <echo message="Testing MySQL 5.0"/> - <property name="excludes" value="NotWorking,SharedMemory"/> + <property name="excludes" value="Pipe,NotWorking,SharedMemory"/> <property name="config" value="mysql-50.config"/> <!--<property name="doCoverage" value="true"/>--> <call target="testdb"/> <echo message="Testing MySQL 5.1"/> - <property name="excludes" value="NotWorking,SharedMemory"/> + <property name="excludes" value="Pipe,NotWorking,SharedMemory"/> <property name="config" value="mysql-51.config"/> <call target="testdb"/> </target> Modified: trunk/TestSuite/ConnectionTests.cs =================================================================== --- trunk/TestSuite/ConnectionTests.cs 2006-12-12 02:17:38 UTC (rev 491) +++ trunk/TestSuite/ConnectionTests.cs 2006-12-12 03:13:24 UTC (rev 492) @@ -107,15 +107,15 @@ [Test] public void TestPersistSecurityInfoCachingPasswords() { - string connStr = String.Format("database=test;server={0};user id={1};Password={2}; pooling=false", - host, this.user, this.password ); - MySqlConnection c = new MySqlConnection( connStr ); + string connStr = String.Format("database={3};test;server={0};user id={1};Password={2};" + + "pooling=false", host, this.user, this.password, database); + MySqlConnection c = new MySqlConnection(connStr); c.Open(); c.Close(); // this shouldn't work - connStr = String.Format("database=test;server={0};user id={1};Password={2}; pooling=false", - host, this.user, "bad_password" ); + connStr = String.Format("database={3};server={0};user id={1};Password={2}; pooling=false", + host, this.user, "bad_password", database); c = new MySqlConnection( connStr ); try { @@ -225,15 +225,14 @@ [Category("4.1")] public void ConnectingAsUTF8() { - execSQL("CREATE Database IF NOT EXISTS test2 DEFAULT CHARACTER SET utf8"); - - string connStr = String.Format("server={0};user id={1}; password={2}; database=test2;pooling=false;charset=utf8", - host, user, password); + string connStr = GetConnectionString(true) + ";charset=utf8"; MySqlConnection c = new MySqlConnection(connStr); c.Open(); - MySqlCommand cmd = new MySqlCommand("DROP TABLE IF EXISTS test;CREATE TABLE test (id varbinary(16), active bit)", c); + MySqlCommand cmd = new MySqlCommand("DROP TABLE IF EXISTS test", c); cmd.ExecuteNonQuery(); + cmd.CommandText = "CREATE TABLE test (id varbinary(16), active bit) CHARACTER SET utf8"; + cmd.ExecuteNonQuery(); cmd.CommandText = "INSERT INTO test (id, active) VALUES (CAST(0x1234567890 AS Binary), true)"; cmd.ExecuteNonQuery(); cmd.CommandText = "INSERT INTO test (id, active) VALUES (CAST(0x123456789a AS Binary), true)"; @@ -263,8 +262,6 @@ } d.Close(); - - execSQL("DROP DATABASE IF EXISTS test2"); } /// <summary> Modified: trunk/TestSuite/GetSchemaTests.cs =================================================================== --- trunk/TestSuite/GetSchemaTests.cs 2006-12-12 02:17:38 UTC (rev 491) +++ trunk/TestSuite/GetSchemaTests.cs 2006-12-12 03:13:24 UTC (rev 492) @@ -90,7 +90,7 @@ execSQL("CREATE TABLE test1 (id int)"); string[] restrictions = new string[4]; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[2] = "test1"; DataTable dt = conn.GetSchema("Tables", restrictions); Assert.IsTrue(dt.Rows.Count == 1); @@ -106,21 +106,21 @@ "col3 varchar(50) character set utf8, col4 tinyint unsigned)"); string[] restrictions = new string[4]; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[2] = "test"; DataTable dt = conn.GetSchema("Columns", restrictions); Assert.IsTrue(dt.Rows.Count == 4); Assert.AreEqual("Columns", dt.TableName); // first column - Assert.AreEqual("TEST", dt.Rows[0]["TABLE_SCHEMA"].ToString().ToUpper()); + Assert.AreEqual(database.ToUpper(), dt.Rows[0]["TABLE_SCHEMA"].ToString().ToUpper()); Assert.AreEqual("COL1", dt.Rows[0]["COLUMN_NAME"].ToString().ToUpper()); Assert.AreEqual(1, dt.Rows[0]["ORDINAL_POSITION"]); Assert.AreEqual("YES", dt.Rows[0]["IS_NULLABLE"]); Assert.AreEqual("INT", dt.Rows[0]["DATA_TYPE"].ToString().ToUpper()); // second column - Assert.AreEqual("TEST", dt.Rows[1]["TABLE_SCHEMA"].ToString().ToUpper()); + Assert.AreEqual(database.ToUpper(), dt.Rows[1]["TABLE_SCHEMA"].ToString().ToUpper()); Assert.AreEqual("COL2", dt.Rows[1]["COLUMN_NAME"].ToString().ToUpper()); Assert.AreEqual(2, dt.Rows[1]["ORDINAL_POSITION"]); Assert.AreEqual("YES", dt.Rows[1]["IS_NULLABLE"]); @@ -130,7 +130,7 @@ Assert.AreEqual(5, dt.Rows[1]["NUMERIC_SCALE"]); // third column - Assert.AreEqual("TEST", dt.Rows[2]["TABLE_SCHEMA"].ToString().ToUpper()); + Assert.AreEqual(database.ToUpper(), dt.Rows[2]["TABLE_SCHEMA"].ToString().ToUpper()); Assert.AreEqual("COL3", dt.Rows[2]["COLUMN_NAME"].ToString().ToUpper()); Assert.AreEqual(3, dt.Rows[2]["ORDINAL_POSITION"]); Assert.AreEqual("YES", dt.Rows[2]["IS_NULLABLE"]); @@ -138,7 +138,7 @@ Assert.AreEqual("VARCHAR(50)", dt.Rows[2]["COLUMN_TYPE"].ToString().ToUpper()); // fourth column - Assert.AreEqual("TEST", dt.Rows[3]["TABLE_SCHEMA"].ToString().ToUpper()); + Assert.AreEqual(database.ToUpper(), dt.Rows[3]["TABLE_SCHEMA"].ToString().ToUpper()); Assert.AreEqual("COL4", dt.Rows[3]["COLUMN_NAME"].ToString().ToUpper()); Assert.AreEqual(4, dt.Rows[3]["ORDINAL_POSITION"]); Assert.AreEqual("YES", dt.Rows[3]["IS_NULLABLE"]); @@ -153,7 +153,7 @@ execSQL("CREATE PROCEDURE spTest (id int) BEGIN SELECT 1; END"); string[] restrictions = new string[4]; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[2] = "spTest"; DataTable dt = conn.GetSchema("Procedures", restrictions); Assert.IsTrue(dt.Rows.Count == 1); @@ -169,7 +169,7 @@ execSQL("CREATE FUNCTION spFunc (id int) RETURNS INT BEGIN RETURN 1; END"); string[] restrictions = new string[4]; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[2] = "spFunc"; DataTable dt = conn.GetSchema("Procedures", restrictions); Assert.IsTrue(dt.Rows.Count == 1); @@ -185,12 +185,12 @@ execSQL("CREATE PROCEDURE spTest (id int, name varchar(50)) BEGIN SELECT 1; END"); string[] restrictions = new string[5]; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[2] = "spTest"; DataTable dt = conn.GetSchema("Procedure Parameters", restrictions); Assert.IsTrue(dt.Rows.Count == 2); Assert.AreEqual("Procedure Parameters", dt.TableName); - Assert.AreEqual("test", dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower()); + Assert.AreEqual(database.ToLower(), dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("sptest", dt.Rows[0]["ROUTINE_NAME"].ToString().ToLower()); Assert.AreEqual("?id", dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower()); Assert.AreEqual(1, dt.Rows[0]["ORDINAL_POSITION"]); @@ -201,7 +201,7 @@ dt.Clear(); dt = conn.GetSchema("Procedure Parameters", restrictions); Assert.AreEqual(1, dt.Rows.Count); - Assert.AreEqual("test", dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower()); + Assert.AreEqual(database.ToLower(), dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("sptest", dt.Rows[0]["ROUTINE_NAME"].ToString().ToLower()); Assert.AreEqual("?name", dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower()); Assert.AreEqual(2, dt.Rows[0]["ORDINAL_POSITION"]); @@ -212,19 +212,19 @@ execSQL("CREATE FUNCTION spFunc (id int) RETURNS INT BEGIN RETURN 1; END"); restrictions[4] = null; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[2] = "spFunc"; dt = conn.GetSchema("Procedure Parameters", restrictions); Assert.IsTrue(dt.Rows.Count == 2); Assert.AreEqual("Procedure Parameters", dt.TableName); - Assert.AreEqual("test", dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower()); + Assert.AreEqual(database.ToLower(), dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("spfunc", dt.Rows[0]["ROUTINE_NAME"].ToString().ToLower()); Assert.AreEqual("?id", dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower()); Assert.AreEqual(1, dt.Rows[0]["ORDINAL_POSITION"]); Assert.AreEqual("IN", dt.Rows[0]["PARAMETER_MODE"]); Assert.AreEqual("NO", dt.Rows[0]["IS_RESULT"]); - Assert.AreEqual("test", dt.Rows[1]["ROUTINE_SCHEMA"].ToString().ToLower()); + Assert.AreEqual(database.ToLower(), dt.Rows[1]["ROUTINE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("spfunc", dt.Rows[1]["ROUTINE_NAME"].ToString().ToLower()); Assert.AreEqual(0, dt.Rows[1]["ORDINAL_POSITION"]); Assert.AreEqual("YES", dt.Rows[1]["IS_RESULT"]); @@ -238,7 +238,7 @@ execSQL("CREATE TABLE test (id int, PRIMARY KEY(id))"); string[] restrictions = new string[4]; restrictions[2] = "test"; - restrictions[1] = "test"; + restrictions[1] = database; DataTable dt = conn.GetSchema("Indexes", restrictions); Assert.AreEqual(1, dt.Rows.Count); Assert.AreEqual("test", dt.Rows[0]["TABLE_NAME"]); @@ -275,7 +275,7 @@ execSQL("CREATE TABLE test (id int, PRIMARY KEY(id))"); string[] restrictions = new string[5]; restrictions[2] = "test"; - restrictions[1] = "test"; + restrictions[1] = database; DataTable dt = conn.GetSchema("IndexColumns", restrictions); Assert.AreEqual(1, dt.Rows.Count); Assert.AreEqual("test", dt.Rows[0]["TABLE_NAME"]); @@ -285,7 +285,7 @@ execSQL("CREATE TABLE test (id int, id1 int, id2 int, " + "INDEX key1 (id1, id2))"); restrictions[2] = "test"; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[4] = "id2"; dt = conn.GetSchema("IndexColumns", restrictions); Assert.AreEqual(1, dt.Rows.Count); @@ -302,7 +302,7 @@ execSQL("CREATE VIEW vw AS SELECT Now() as theTime"); string[] restrictions = new string[4]; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[2] = "vw"; DataTable dt = conn.GetSchema("Views", restrictions); Assert.IsTrue(dt.Rows.Count == 1); @@ -318,12 +318,12 @@ execSQL("CREATE VIEW vw AS SELECT Now() as theTime"); string[] restrictions = new string[4]; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[2] = "vw"; DataTable dt = conn.GetSchema("ViewColumns", restrictions); Assert.IsTrue(dt.Rows.Count == 1); Assert.AreEqual("ViewColumns", dt.TableName); - Assert.AreEqual("test", dt.Rows[0]["VIEW_SCHEMA"]); + Assert.AreEqual(database.ToLower(), dt.Rows[0]["VIEW_SCHEMA"].ToString().ToLower()); Assert.AreEqual("vw", dt.Rows[0]["VIEW_NAME"]); Assert.AreEqual("theTime", dt.Rows[0]["COLUMN_NAME"]); } @@ -336,12 +336,12 @@ execSQL("CREATE PROCEDURE spTest(id int, IN id2 INT(11), " + "INOUT io1 VARCHAR(20), OUT out1 FLOAT) BEGIN END"); string[] restrictions = new string[4]; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[2] = "spTest"; DataTable procs = conn.GetSchema("PROCEDURES", restrictions); Assert.AreEqual(1, procs.Rows.Count); Assert.AreEqual("spTest", procs.Rows[0][0]); - Assert.AreEqual("test", procs.Rows[0][2]); + Assert.AreEqual(database.ToLower(), procs.Rows[0][2].ToString().ToLower()); Assert.AreEqual("spTest", procs.Rows[0][3]); DataTable parameters = conn.GetSchema("PROCEDURE PARAMETERS", restrictions); @@ -351,10 +351,10 @@ Assert.AreEqual(DBNull.Value, parameters.Rows[2][0]); Assert.AreEqual(DBNull.Value, parameters.Rows[3][0]); - Assert.AreEqual("test", parameters.Rows[0][1]); - Assert.AreEqual("test", parameters.Rows[1][1]); - Assert.AreEqual("test", parameters.Rows[2][1]); - Assert.AreEqual("test", parameters.Rows[3][1]); + Assert.AreEqual(database.ToLower(), parameters.Rows[0][1].ToString().ToLower()); + Assert.AreEqual(database.ToLower(), parameters.Rows[1][1].ToString().ToLower()); + Assert.AreEqual(database.ToLower(), parameters.Rows[2][1].ToString().ToLower()); + Assert.AreEqual(database.ToLower(), parameters.Rows[3][1].ToString().ToLower()); Assert.AreEqual("spTest", parameters.Rows[0][2]); Assert.AreEqual("spTest", parameters.Rows[1][2]); @@ -400,20 +400,20 @@ "CONSTRAINT c1 FOREIGN KEY (parent_id) REFERENCES parent(id) ON DELETE CASCADE) TYPE=INNODB"); string[] restrictions = new string[4]; restrictions[0] = null; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[2] = "child"; DataTable dt = conn.GetSchema("Foreign Keys", restrictions); Assert.AreEqual(1, dt.Rows.Count); DataRow row = dt.Rows[0]; Assert.AreEqual(DBNull.Value, row["CONSTRAINT_CATALOG"]); - Assert.AreEqual("test", row["CONSTRAINT_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["CONSTRAINT_SCHEMA"].ToString().ToLower()); Assert.AreEqual("c1", row["CONSTRAINT_NAME"]); Assert.AreEqual(DBNull.Value, row["TABLE_CATALOG"]); - Assert.AreEqual("test", row["TABLE_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["TABLE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("child", row["TABLE_NAME"]); Assert.AreEqual("parent_id", row["COLUMN_NAME"]); Assert.AreEqual(0, row["ORDINAL_POSITION"]); - Assert.AreEqual("test", row["REFERENCED_TABLE_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("parent", row["REFERENCED_TABLE_NAME"]); Assert.AreEqual("id", row["REFERENCED_COLUMN_NAME"]); } @@ -436,46 +436,46 @@ string[] restrictions = new string[4]; restrictions[0] = null; - restrictions[1] = "test"; + restrictions[1] = database; restrictions[2] = "product_order"; DataTable dt = conn.GetSchema("Foreign Keys", restrictions); Assert.AreEqual(3, dt.Rows.Count); DataRow row = dt.Rows[0]; Assert.AreEqual(DBNull.Value, row["CONSTRAINT_CATALOG"]); - Assert.AreEqual("test", row["CONSTRAINT_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["CONSTRAINT_SCHEMA"].ToString().ToLower()); Assert.AreEqual("product_order_ibfk_1", row["CONSTRAINT_NAME"]); Assert.AreEqual(DBNull.Value, row["TABLE_CATALOG"]); - Assert.AreEqual("test", row["TABLE_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["TABLE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("product_order", row["TABLE_NAME"]); Assert.AreEqual("product_category", row["COLUMN_NAME"]); Assert.AreEqual(0, row["ORDINAL_POSITION"]); - Assert.AreEqual("test", row["REFERENCED_TABLE_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("product", row["REFERENCED_TABLE_NAME"]); Assert.AreEqual("category", row["REFERENCED_COLUMN_NAME"]); row = dt.Rows[1]; Assert.AreEqual(DBNull.Value, row["CONSTRAINT_CATALOG"]); - Assert.AreEqual("test", row["CONSTRAINT_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["CONSTRAINT_SCHEMA"].ToString().ToLower()); Assert.AreEqual("product_order_ibfk_1", row["CONSTRAINT_NAME"]); Assert.AreEqual(DBNull.Value, row["TABLE_CATALOG"]); - Assert.AreEqual("test", row["TABLE_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["TABLE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("product_order", row["TABLE_NAME"]); Assert.AreEqual("product_id", row["COLUMN_NAME"]); Assert.AreEqual(1, row["ORDINAL_POSITION"]); - Assert.AreEqual("test", row["REFERENCED_TABLE_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("product", row["REFERENCED_TABLE_NAME"]); Assert.AreEqual("id", row["REFERENCED_COLUMN_NAME"]); row = dt.Rows[2]; Assert.AreEqual(DBNull.Value, row["CONSTRAINT_CATALOG"]); - Assert.AreEqual("test", row["CONSTRAINT_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["CONSTRAINT_SCHEMA"].ToString().ToLower()); Assert.AreEqual("product_order_ibfk_2", row["CONSTRAINT_NAME"]); Assert.AreEqual(DBNull.Value, row["TABLE_CATALOG"]); - Assert.AreEqual("test", row["TABLE_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["TABLE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("product_order", row["TABLE_NAME"]); Assert.AreEqual("customer_id", row["COLUMN_NAME"]); Assert.AreEqual(0, row["ORDINAL_POSITION"]); - Assert.AreEqual("test", row["REFERENCED_TABLE_SCHEMA"]); + Assert.AreEqual(database.ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower()); Assert.AreEqual("customer", row["REFERENCED_TABLE_NAME"]); Assert.AreEqual("id", row["REFERENCED_COLUMN_NAME"]); } Modified: trunk/TestSuite/StoredProcedure.cs =================================================================== --- trunk/TestSuite/StoredProcedure.cs 2006-12-12 02:17:38 UTC (rev 491) +++ trunk/TestSuite/StoredProcedure.cs 2006-12-12 03:13:24 UTC (rev 492) @@ -463,7 +463,7 @@ try { c.Open(); - MySqlCommand cmd2 = new MySqlCommand("use test", c); + MySqlCommand cmd2 = new MySqlCommand(String.Format("use {0}", database), c); cmd2.ExecuteNonQuery(); MySqlCommand cmd = new MySqlCommand("spTest", c); @@ -474,7 +474,7 @@ cmd2.CommandText = "use mysql"; cmd2.ExecuteNonQuery(); - cmd.CommandText = "test.spTest"; + cmd.CommandText = String.Format("{0}.spTest", database); val = cmd.ExecuteScalar(); Assert.AreEqual(4, val); }
| Thread | ||
|---|---|---|
| • Connector/NET commit: r492 - in trunk: . TestSuite | rburnett | 12 Dec |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.443 sec. using MySQL 5.1.14-beta-log