Modified:
branches/5.1/TestSuite/Source/CultureTests.cs
branches/5.1/TestSuite/Source/CursorTests.cs
branches/5.1/TestSuite/Source/GetSchemaTests.cs
branches/5.1/TestSuite/Source/PoolingTests.cs
branches/5.1/TestSuite/Source/ProcedureParameters.cs
branches/5.1/TestSuite/Source/Syntax.cs
Log:
a few small syntax issues that were not included in the merge
Modified: branches/5.1/TestSuite/Source/CultureTests.cs
===================================================================
--- branches/5.1/TestSuite/Source/CultureTests.cs 2007-08-10 15:33:03 UTC (rev 853)
+++ branches/5.1/TestSuite/Source/CultureTests.cs 2007-08-10 17:09:10 UTC (rev 854)
@@ -158,6 +158,5 @@
Thread.CurrentThread.CurrentCulture = curCulture;
Thread.CurrentThread.CurrentUICulture = curUICulture;
}
-#endif
}
}
Modified: branches/5.1/TestSuite/Source/CursorTests.cs
===================================================================
--- branches/5.1/TestSuite/Source/CursorTests.cs 2007-08-10 15:33:03 UTC (rev 853)
+++ branches/5.1/TestSuite/Source/CursorTests.cs 2007-08-10 17:09:10 UTC (rev 854)
@@ -32,8 +32,7 @@
[TestFixture]
public class CursorTests : BaseTest
{
- [TestFixtureSetUp]
- public void TestFixtureSetUp()
+ protected override void TestFixtureSetUp()
{
Open();
@@ -43,8 +42,7 @@
execSQL("CREATE TABLE Test2 (id INT NOT NULL, parent INT, PRIMARY KEY(id))");
}
- [TestFixtureTearDown]
- public void TestFixtureTearDown()
+ protected override void TestFixtureTearDown()
{
execSQL("DROP TABLE IF EXISTS Test2");
Close();
Modified: branches/5.1/TestSuite/Source/GetSchemaTests.cs
===================================================================
--- branches/5.1/TestSuite/Source/GetSchemaTests.cs 2007-08-10 15:33:03 UTC (rev 853)
+++ branches/5.1/TestSuite/Source/GetSchemaTests.cs 2007-08-10 17:09:10 UTC (rev 854)
@@ -512,7 +512,7 @@
Assert.AreEqual("fk1", row["CONSTRAINT_NAME"]);
Assert.AreEqual(database0.ToLower(), row["TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("child", row["TABLE_NAME"]);
- Assert.AreEqual(databases[0].ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("parent1", row["REFERENCED_TABLE_NAME"]);
// now check that columns are coming back
@@ -520,11 +520,11 @@
Assert.AreEqual(1, dt.Rows.Count);
row = dt.Rows[0];
Assert.AreEqual(DBNull.Value, row["CONSTRAINT_CATALOG"]);
- Assert.AreEqual(databases[0].ToLower(), row["CONSTRAINT_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["CONSTRAINT_SCHEMA"].ToString().ToLower());
Assert.AreEqual("fk1", row["CONSTRAINT_NAME"]);
- Assert.AreEqual(databases[0].ToLower(), row["TABLE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("child", row["TABLE_NAME"]);
- Assert.AreEqual(databases[0].ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("parent1", row["REFERENCED_TABLE_NAME"]);
Assert.AreEqual("parent_id", row["COLUMN_NAME"]);
Assert.AreEqual(0, row["ORDINAL_POSITION"]);
@@ -584,27 +584,27 @@
Assert.AreEqual("fk1", row["CONSTRAINT_NAME"]);
Assert.AreEqual(database0.ToLower(), row["TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("child", row["TABLE_NAME"]);
- Assert.AreEqual(databases[0].ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("parent1", row["REFERENCED_TABLE_NAME"]);
row = dt.Rows[1];
Assert.AreEqual(DBNull.Value, row["CONSTRAINT_CATALOG"]);
- Assert.AreEqual(databases[0].ToLower(), row["CONSTRAINT_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["CONSTRAINT_SCHEMA"].ToString().ToLower());
Assert.AreEqual("fk2", row["CONSTRAINT_NAME"]);
- Assert.AreEqual(databases[0].ToLower(), row["TABLE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("child", row["TABLE_NAME"]);
- Assert.AreEqual(databases[0].ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("parent2", row["REFERENCED_TABLE_NAME"]);
dt = conn.GetSchema("Foreign Key Columns", restrictions);
Assert.AreEqual(3, dt.Rows.Count);
row = dt.Rows[0];
Assert.AreEqual(DBNull.Value, row["CONSTRAINT_CATALOG"]);
- Assert.AreEqual(databases[0].ToLower(), row["CONSTRAINT_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["CONSTRAINT_SCHEMA"].ToString().ToLower());
Assert.AreEqual("fk1", row["CONSTRAINT_NAME"]);
- Assert.AreEqual(databases[0].ToLower(), row["TABLE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("child", row["TABLE_NAME"]);
- Assert.AreEqual(databases[0].ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("parent1", row["REFERENCED_TABLE_NAME"]);
Assert.AreEqual("product_category", row["COLUMN_NAME"]);
Assert.AreEqual(0, row["ORDINAL_POSITION"]);
@@ -619,7 +619,7 @@
Assert.AreEqual("fk1", row["CONSTRAINT_NAME"]);
Assert.AreEqual(database0.ToLower(), row["TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("child", row["TABLE_NAME"]);
- Assert.AreEqual(databases[0].ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("parent1", row["REFERENCED_TABLE_NAME"]);
Assert.AreEqual("product_id", row["COLUMN_NAME"]);
Assert.AreEqual(1, row["ORDINAL_POSITION"]);
@@ -634,7 +634,7 @@
Assert.AreEqual("fk2", row["CONSTRAINT_NAME"]);
Assert.AreEqual(database0.ToLower(), row["TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("child", row["TABLE_NAME"]);
- Assert.AreEqual(databases[0].ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), row["REFERENCED_TABLE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("parent2", row["REFERENCED_TABLE_NAME"]);
Assert.AreEqual("customer_id", row["COLUMN_NAME"]);
Assert.AreEqual(0, row["ORDINAL_POSITION"]);
@@ -701,7 +701,7 @@
public void ObjectsRelativeToDatabase()
{
string[] restrictions = new string[4];
- restrictions[1] = databases[0];
+ restrictions[1] = database0;
DataTable dt = conn.GetSchema("Tables", restrictions);
int count1 = dt.Rows.Count;
Modified: branches/5.1/TestSuite/Source/PoolingTests.cs
===================================================================
--- branches/5.1/TestSuite/Source/PoolingTests.cs 2007-08-10 15:33:03 UTC (rev 853)
+++ branches/5.1/TestSuite/Source/PoolingTests.cs 2007-08-10 17:09:10 UTC (rev 854)
@@ -253,7 +253,6 @@
-
Modified: branches/5.1/TestSuite/Source/ProcedureParameters.cs
===================================================================
--- branches/5.1/TestSuite/Source/ProcedureParameters.cs 2007-08-10 15:33:03 UTC (rev 853)
+++ branches/5.1/TestSuite/Source/ProcedureParameters.cs 2007-08-10 17:09:10 UTC (rev 854)
@@ -28,18 +28,6 @@
[TestFixture]
public class ProcedureParameterTests : BaseTest
{
- [TestFixtureSetUp]
- public void TestFixtureSetUp()
- {
- Open();
- }
-
- [TestFixtureTearDown]
- public void TestFixtureTearDown()
- {
- Close();
- }
-
[Test]
public void ProcedureParameters()
{
@@ -49,12 +37,12 @@
execSQL("CREATE PROCEDURE spTest (id int, name varchar(50)) BEGIN SELECT 1; END");
string[] restrictions = new string[5];
- restrictions[1] = databases[0];
+ restrictions[1] = database0;
restrictions[2] = "spTest";
DataTable dt = conn.GetSchema("Procedure Parameters", restrictions);
Assert.IsTrue(dt.Rows.Count == 2);
Assert.AreEqual("Procedure Parameters", dt.TableName);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.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"]);
@@ -65,7 +53,7 @@
dt.Clear();
dt = conn.GetSchema("Procedure Parameters", restrictions);
Assert.AreEqual(1, dt.Rows.Count);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.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"]);
@@ -76,19 +64,19 @@
execSQL("CREATE FUNCTION spFunc (id int) RETURNS INT BEGIN RETURN 1; END");
restrictions[4] = null;
- restrictions[1] = databases[0];
+ restrictions[1] = database0;
restrictions[2] = "spFunc";
dt = conn.GetSchema("Procedure Parameters", restrictions);
Assert.IsTrue(dt.Rows.Count == 2);
Assert.AreEqual("Procedure Parameters", dt.TableName);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.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(databases[0].ToLower(), dt.Rows[1]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.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"]);
@@ -107,12 +95,12 @@
BEGIN SELECT action, result; END");
string[] restrictions = new string[5];
- restrictions[1] = databases[0];
+ restrictions[1] = database0;
restrictions[2] = "spTest";
DataTable dt = conn.GetSchema("Procedure Parameters", restrictions);
Assert.IsTrue(dt.Rows.Count == 2);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.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"]);
@@ -121,7 +109,7 @@
Assert.AreEqual(20, dt.Rows[0]["CHARACTER_OCTET_LENGTH"]);
Assert.AreEqual("NO", dt.Rows[0]["IS_RESULT"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[1]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[1]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[1]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?result2", dt.Rows[1]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(2, dt.Rows[1]["ORDINAL_POSITION"]);
@@ -158,12 +146,12 @@
*/) BEGIN SELECT 1; END");
string[] restrictions = new string[5];
- restrictions[1] = databases[0];
+ restrictions[1] = database0;
restrictions[2] = "spTest";
DataTable dt = conn.GetSchema("Procedure Parameters", restrictions);
Assert.IsTrue(dt.Rows.Count == 12);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[0]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?_action", dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(1, dt.Rows[0]["ORDINAL_POSITION"]);
@@ -172,7 +160,7 @@
Assert.AreEqual(20, dt.Rows[0]["CHARACTER_OCTET_LENGTH"]);
Assert.AreEqual("NO", dt.Rows[0]["IS_RESULT"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[1]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[1]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[1]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?/*dumb-identifier-1*/", dt.Rows[1]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(2, dt.Rows[1]["ORDINAL_POSITION"]);
@@ -180,7 +168,7 @@
Assert.AreEqual("INT", dt.Rows[1]["DATA_TYPE"]);
Assert.AreEqual("NO", dt.Rows[1]["IS_RESULT"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[2]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[2]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[2]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?#dumb-identifier-2", dt.Rows[2]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(3, dt.Rows[2]["ORDINAL_POSITION"]);
@@ -188,7 +176,7 @@
Assert.AreEqual("INT", dt.Rows[2]["DATA_TYPE"]);
Assert.AreEqual("NO", dt.Rows[2]["IS_RESULT"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[3]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[3]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[3]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?--dumb-identifier-3", dt.Rows[3]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(4, dt.Rows[3]["ORDINAL_POSITION"]);
@@ -196,7 +184,7 @@
Assert.AreEqual("INT", dt.Rows[3]["DATA_TYPE"]);
Assert.AreEqual("NO", dt.Rows[3]["IS_RESULT"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[4]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[4]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[4]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?_client_id", dt.Rows[4]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(5, dt.Rows[4]["ORDINAL_POSITION"]);
@@ -204,7 +192,7 @@
Assert.AreEqual("INT", dt.Rows[4]["DATA_TYPE"]);
Assert.AreEqual("NO", dt.Rows[4]["IS_RESULT"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[5]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[5]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[5]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?_login_id", dt.Rows[5]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(6, dt.Rows[5]["ORDINAL_POSITION"]);
@@ -212,7 +200,7 @@
Assert.AreEqual("INT", dt.Rows[5]["DATA_TYPE"]);
Assert.AreEqual("NO", dt.Rows[5]["IS_RESULT"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[6]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[6]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[6]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?_where", dt.Rows[6]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(7, dt.Rows[6]["ORDINAL_POSITION"]);
@@ -221,7 +209,7 @@
Assert.AreEqual("NO", dt.Rows[6]["IS_RESULT"]);
Assert.AreEqual(2000, dt.Rows[6]["CHARACTER_OCTET_LENGTH"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[7]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[7]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[7]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?_sort", dt.Rows[7]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(8, dt.Rows[7]["ORDINAL_POSITION"]);
@@ -230,7 +218,7 @@
Assert.AreEqual("NO", dt.Rows[7]["IS_RESULT"]);
Assert.AreEqual(2000, dt.Rows[7]["CHARACTER_OCTET_LENGTH"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[8]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[8]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[8]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?_sql", dt.Rows[8]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(9, dt.Rows[8]["ORDINAL_POSITION"]);
@@ -239,7 +227,7 @@
Assert.AreEqual("NO", dt.Rows[8]["IS_RESULT"]);
Assert.AreEqual(8000, dt.Rows[8]["CHARACTER_OCTET_LENGTH"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[9]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[9]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[9]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?_song_id", dt.Rows[9]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(10, dt.Rows[9]["ORDINAL_POSITION"]);
@@ -247,7 +235,7 @@
Assert.AreEqual("INT", dt.Rows[9]["DATA_TYPE"]);
Assert.AreEqual("NO", dt.Rows[9]["IS_RESULT"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[10]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[10]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[10]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?_notes", dt.Rows[10]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(11, dt.Rows[10]["ORDINAL_POSITION"]);
@@ -256,7 +244,7 @@
Assert.AreEqual("NO", dt.Rows[10]["IS_RESULT"]);
Assert.AreEqual(2000, dt.Rows[10]["CHARACTER_OCTET_LENGTH"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[11]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[11]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[11]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?_result", dt.Rows[11]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(12, dt.Rows[11]["ORDINAL_POSITION"]);
@@ -275,12 +263,12 @@
CHARACTER /* hello*/ SET utf8) BEGIN SELECT name; END");
string[] restrictions = new string[5];
- restrictions[1] = databases[0];
+ restrictions[1] = database0;
restrictions[2] = "spTest";
DataTable dt = conn.GetSchema("Procedure Parameters", restrictions);
Assert.IsTrue(dt.Rows.Count == 1);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.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(1, dt.Rows[0]["ORDINAL_POSITION"]);
@@ -300,12 +288,12 @@
name2 TEXT UNICODE) BEGIN SELECT name; END");
string[] restrictions = new string[5];
- restrictions[1] = databases[0];
+ restrictions[1] = database0;
restrictions[2] = "spTest";
DataTable dt = conn.GetSchema("Procedure Parameters", restrictions);
Assert.IsTrue(dt.Rows.Count == 2);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[0]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.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(1, dt.Rows[0]["ORDINAL_POSITION"]);
@@ -315,7 +303,7 @@
Assert.AreEqual("latin1", dt.Rows[0]["CHARACTER_SET"]);
Assert.AreEqual(1200, dt.Rows[0]["CHARACTER_OCTET_LENGTH"]);
- Assert.AreEqual(databases[0].ToLower(), dt.Rows[1]["ROUTINE_SCHEMA"].ToString().ToLower());
+ Assert.AreEqual(database0.ToLower(), dt.Rows[1]["ROUTINE_SCHEMA"].ToString().ToLower());
Assert.AreEqual("sptest", dt.Rows[1]["ROUTINE_NAME"].ToString().ToLower());
Assert.AreEqual("?name2", dt.Rows[1]["PARAMETER_NAME"].ToString().ToLower());
Assert.AreEqual(2, dt.Rows[1]["ORDINAL_POSITION"]);
Modified: branches/5.1/TestSuite/Source/Syntax.cs
===================================================================
--- branches/5.1/TestSuite/Source/Syntax.cs 2007-08-10 15:33:03 UTC (rev 853)
+++ branches/5.1/TestSuite/Source/Syntax.cs 2007-08-10 17:09:10 UTC (rev 854)
@@ -498,5 +498,24 @@
}
}
+ /// <summary>
+ /// Bug #28448 show processlist; returns byte arrays in the resulting data table
+ /// </summary>
+ [Test]
+ public void ShowProcessList()
+ {
+ MySqlCommand cmd = new MySqlCommand("show processlist", conn);
+ DataTable dt = new DataTable();
+
+ using (MySqlDataReader rdr = cmd.ExecuteReader())
+ {
+ dt.Load(rdr);
+ }
+ DataRow row = dt.Rows[0];
+
+ Assert.IsTrue(row["User"].GetType().Name == "String");
+ Assert.IsTrue(row["Host"].GetType().Name == "String");
+ Assert.IsTrue(row["Command"].GetType().Name == "String");
+ }
}
}
| Thread |
|---|
| • Connector/NET commit: r854 - branches/5.1/TestSuite/Source | rburnett | 10 Aug |
