| List: | Commits | « Previous MessageNext Message » | |
| From: | rburnett | Date: | August 22 2007 7:51pm |
| Subject: | Connector/NET commit: r963 - branches/5.1/TestSuite/Source | ||
| View as plain text | |||
Modified: branches/5.1/TestSuite/Source/CommandBuilderTests.cs branches/5.1/TestSuite/Source/DataAdapterTests.cs branches/5.1/TestSuite/Source/DataReaderTests.cs branches/5.1/TestSuite/Source/DataTypeTests.cs branches/5.1/TestSuite/Source/DateTimeTests.cs branches/5.1/TestSuite/Source/MySqlHelperTests.cs branches/5.1/TestSuite/Source/ParameterTests.cs branches/5.1/TestSuite/Source/PreparedStatements.cs branches/5.1/TestSuite/Source/StoredProcedure.cs branches/5.1/TestSuite/Source/Syntax.cs branches/5.1/TestSuite/Source/Syntax2.cs branches/5.1/TestSuite/Source/Transactions.cs Log: merged r:942 from 5.0 Modified: branches/5.1/TestSuite/Source/CommandBuilderTests.cs =================================================================== --- branches/5.1/TestSuite/Source/CommandBuilderTests.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/CommandBuilderTests.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -129,11 +129,11 @@ [Test] public void UsingFunctions() { - execSQL("INSERT INTO test (id, name) VALUES (1,'test1')"); - execSQL("INSERT INTO test (id, name) VALUES (2,'test2')"); - execSQL("INSERT INTO test (id, name) VALUES (3,'test3')"); + execSQL("INSERT INTO Test (id, name) VALUES (1,'test1')"); + execSQL("INSERT INTO Test (id, name) VALUES (2,'test2')"); + execSQL("INSERT INTO Test (id, name) VALUES (3,'test3')"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT id, name, now() as ServerTime FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT id, name, now() as ServerTime FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); DataTable dt = new DataTable(); da.Fill(dt); @@ -141,7 +141,7 @@ dt.Rows[0]["id"] = 4; da.Update(dt); - da.SelectCommand.CommandText = "SELECT id, name, CONCAT(name, ' boo') as newname from test where id=4"; + da.SelectCommand.CommandText = "SELECT id, name, CONCAT(name, ' boo') as newname from Test where id=4"; dt.Clear(); da.Fill(dt); Assert.AreEqual(1, dt.Rows.Count); @@ -152,12 +152,12 @@ da.Update(dt); dt.Clear(); - da.SelectCommand.CommandText = "SELECT * FROM test WHERE id=5"; + da.SelectCommand.CommandText = "SELECT * FROM Test WHERE id=5"; da.Fill(dt); Assert.AreEqual(1, dt.Rows.Count); Assert.AreEqual("test1", dt.Rows[0]["name"]); - da.SelectCommand.CommandText = "SELECT *, now() as stime FROM test WHERE id<4"; + da.SelectCommand.CommandText = "SELECT *, now() as stime FROM Test WHERE id<4"; cb = new MySqlCommandBuilder(da); cb.ConflictOption = ConflictOption.OverwriteChanges; da.InsertCommand = cb.GetInsertCommand(); @@ -171,14 +171,14 @@ { if (Version < new Version(4, 1)) return; - execSQL("INSERT INTO test (id, name) VALUES (1,'test1')"); - execSQL("INSERT INTO test (id, name) VALUES (2,'test2')"); - execSQL("INSERT INTO test (id, name) VALUES (3,'test3')"); + execSQL("INSERT INTO Test (id, name) VALUES (1,'test1')"); + execSQL("INSERT INTO Test (id, name) VALUES (2,'test2')"); + execSQL("INSERT INTO Test (id, name) VALUES (3,'test3')"); conn.ChangeDatabase(database1); MySqlDataAdapter da = new MySqlDataAdapter( - String.Format("SELECT id, name FROM `{0}`.test", database0), conn); + String.Format("SELECT id, name FROM `{0}`.Test", database0), conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); DataSet ds = new DataSet(); da.Fill(ds); @@ -198,10 +198,10 @@ [Test] public void SpecialCharactersInFieldNames() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (`col%1` int PRIMARY KEY, `col()2` int, `col<>3` int, `col/4` int)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (`col%1` int PRIMARY KEY, `col()2` int, `col<>3` int, `col/4` int)"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); cb.ToString(); // keep the compiler happy DataTable dt = new DataTable(); @@ -221,15 +221,15 @@ [Test] public void SemicolonAtEndOfSQL() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT NOT NULL, name VARCHAR(100), PRIMARY KEY(id))"); - execSQL("INSERT INTO test VALUES(1, 'Data')"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT NOT NULL, name VARCHAR(100), PRIMARY KEY(id))"); + execSQL("INSERT INTO Test VALUES(1, 'Data')"); try { DataSet ds = new DataSet(); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM `test`;", conn); - da.FillSchema(ds, SchemaType.Source, "test"); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM `Test`;", conn); + da.FillSchema(ds, SchemaType.Source, "Test"); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); DataTable dt = new DataTable(); @@ -254,10 +254,10 @@ [Test] public void AutoIncrementColumnsOnInsert() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT UNSIGNED NOT NULL AUTO_INCREMENT, " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT UNSIGNED NOT NULL AUTO_INCREMENT, " + "name VARCHAR(100), PRIMARY KEY(id))"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); DataTable dt = new DataTable(); @@ -291,10 +291,10 @@ [Test] public void AutoIncrementColumnsOnInsert2() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT UNSIGNED NOT NULL " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT UNSIGNED NOT NULL " + "AUTO_INCREMENT PRIMARY KEY, name VARCHAR(20))"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); cb.ReturnGeneratedIdentifiers = true; @@ -347,9 +347,9 @@ { try { - execSQL("INSERT INTO test (id, name) VALUES (1, 'test1')"); - execSQL("INSERT INTO test (id, name) VALUES (2, 'test2')"); - execSQL("INSERT INTO test (id, name) VALUES (3, 'test3')"); + execSQL("INSERT INTO Test (id, name) VALUES (1, 'test1')"); + execSQL("INSERT INTO Test (id, name) VALUES (2, 'test2')"); + execSQL("INSERT INTO Test (id, name) VALUES (3, 'test3')"); MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); DataTable dt = new DataTable(); @@ -387,15 +387,15 @@ [Test] public void UpdatingWithDateInKey() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (cod INT, dt DATE, PRIMARY KEY(cod, dt))"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (cod INT, dt DATE, PRIMARY KEY(cod, dt))"); - execSQL("INSERT INTO test (cod, dt) VALUES (1, '2006-1-1')"); - execSQL("INSERT INTO test (cod, dt) VALUES (2, '2006-1-2')"); - execSQL("INSERT INTO test (cod, dt) VALUES (3, '2006-1-3')"); - execSQL("INSERT INTO test (cod, dt) VALUES (4, '2006-1-4')"); + execSQL("INSERT INTO Test (cod, dt) VALUES (1, '2006-1-1')"); + execSQL("INSERT INTO Test (cod, dt) VALUES (2, '2006-1-2')"); + execSQL("INSERT INTO Test (cod, dt) VALUES (3, '2006-1-3')"); + execSQL("INSERT INTO Test (cod, dt) VALUES (4, '2006-1-4')"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test ORDER BY cod", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test ORDER BY cod", conn); MySqlCommandBuilder bld = new MySqlCommandBuilder(da); bld.ConflictOption = ConflictOption.OverwriteChanges; DataTable dt = new DataTable(); @@ -406,7 +406,7 @@ da.Update(dt); dt.Clear(); - da.SelectCommand.CommandText = "SELECT * FROM test WHERE cod=6"; + da.SelectCommand.CommandText = "SELECT * FROM Test WHERE cod=6"; da.Fill(dt); Assert.AreEqual(6, dt.Rows[0]["cod"]); } Modified: branches/5.1/TestSuite/Source/DataAdapterTests.cs =================================================================== --- branches/5.1/TestSuite/Source/DataAdapterTests.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/DataAdapterTests.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -244,7 +244,7 @@ [Explicit] public void UpdateManyRows() { - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); DataTable dt = new DataTable(); da.Fill(dt); @@ -349,11 +349,11 @@ [Test] public void AutoIncrementColumns() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id int(10) unsigned NOT NULL auto_increment primary key)"); - execSQL("INSERT INTO test VALUES(NULL)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id int(10) unsigned NOT NULL auto_increment primary key)"); + execSQL("INSERT INTO Test VALUES(NULL)"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); DataSet ds = new DataSet(); da.Fill(ds); @@ -385,12 +385,12 @@ if (Version < new Version(4, 1)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test ( id INT NOT NULL, amount INT )"); - execSQL("INSERT INTO test VALUES (1, 44)"); - execSQL("INSERT INTO test VALUES (2, 88)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test ( id INT NOT NULL, amount INT )"); + execSQL("INSERT INTO Test VALUES (1, 44)"); + execSQL("INSERT INTO Test VALUES (2, 88)"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test GROUP BY id WITH ROLLUP", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test GROUP BY id WITH ROLLUP", conn); DataSet ds = new DataSet(); da.Fill(ds); @@ -406,11 +406,11 @@ /* [Test] public void DefaultValues() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id int, name VARCHAR(20) NOT NULL DEFAULT 'abc', dt TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id int, name VARCHAR(20) NOT NULL DEFAULT 'abc', dt TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); - MySqlCommand insCmd = new MySqlCommand("INSERT INTO test VALUES (?id, ?name, ?dt)", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); + MySqlCommand insCmd = new MySqlCommand("INSERT INTO Test VALUES (?id, ?name, ?dt)", conn); insCmd.Parameters.Add("?id", MySqlDbType.Int32, 0, "id"); insCmd.Parameters.Add("?name", MySqlDbType.VarChar, 20, "name"); insCmd.Parameters.Add("?dt", MySqlDbType.Datetime, 0, "dt"); @@ -418,7 +418,7 @@ DataTable dt = new DataTable(); - //da.FillSchema(ds, SchemaType.Source);//, "test"); + //da.FillSchema(ds, SchemaType.Source);//, "Test"); da.MissingSchemaAction = MissingSchemaAction.AddWithKey; try { @@ -442,7 +442,7 @@ da.Update(dt); - MySqlCommand cmd = new MySqlCommand("SELECT * FROM test", conn); + MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", conn); try { using (MySqlDataReader reader = cmd.ExecuteReader()) @@ -470,11 +470,11 @@ [Test] public void Bug16307() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (OrgNum int auto_increment, CallReportNum int, Stamp varchar(50), " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (OrgNum int auto_increment, CallReportNum int, Stamp varchar(50), " + "WasRealCall varchar(50), WasHangup varchar(50), primary key(orgnum))"); - string strSQL = "INSERT INTO test(OrgNum, CallReportNum, Stamp, WasRealCall, WasHangup) " + + string strSQL = "INSERT INTO Test(OrgNum, CallReportNum, Stamp, WasRealCall, WasHangup) " + "VALUES (?OrgNum, ?CallReportNum, ?Stamp, ?WasRealCall, ?WasHangup)"; MySqlCommand cmd = new MySqlCommand(strSQL, conn); @@ -486,7 +486,7 @@ pc.Add("?WasRealCall", MySqlDbType.VarChar, 0, "WasRealCall"); pc.Add("?WasHangup", MySqlDbType.VarChar, 0, "WasHangup"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); da.InsertCommand = cmd; DataSet ds = new DataSet(); @@ -528,14 +528,14 @@ [Test] public void QuietOpenAndClose() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT, PRIMARY KEY(id))"); - execSQL("INSERT INTO test VALUES(1)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT, PRIMARY KEY(id))"); + execSQL("INSERT INTO Test VALUES(1)"); try { MySqlConnection c = new MySqlConnection(GetConnectionString(true)); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", c); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", c); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); Assert.IsTrue(c.State == ConnectionState.Closed); DataTable dt = new DataTable(); @@ -565,26 +565,26 @@ [Test] public void RangeFill() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT)"); - execSQL("INSERT INTO test VALUES (1)"); - execSQL("INSERT INTO test VALUES (2)"); - execSQL("INSERT INTO test VALUES (3)"); - execSQL("INSERT INTO test VALUES (4)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT)"); + execSQL("INSERT INTO Test VALUES (1)"); + execSQL("INSERT INTO Test VALUES (2)"); + execSQL("INSERT INTO Test VALUES (3)"); + execSQL("INSERT INTO Test VALUES (4)"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); DataSet ds = new DataSet(); - da.Fill(ds, 1, 2, "test"); + da.Fill(ds, 1, 2, "Test"); } [Test] public void FillWithNulls() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL(@"CREATE TABLE test (id INT UNSIGNED NOT NULL AUTO_INCREMENT, + execSQL("DROP TABLE IF EXISTS Test"); + execSQL(@"CREATE TABLE Test (id INT UNSIGNED NOT NULL AUTO_INCREMENT, name VARCHAR(100), PRIMARY KEY(id))"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); DataTable dt = new DataTable(); da.Fill(dt); @@ -658,7 +658,7 @@ execSQL("INSERT INTO Test (id, id2, name) VALUES (NULL, 10, 'Name 10')"); execSQL("INSERT INTO Test (id, id2, name) VALUES (NULL, 11, 'Name 11')"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); DataTable dt = new DataTable(); da.Fill(0, 10, dt); Assert.AreEqual(10, dt.Rows.Count); @@ -675,10 +675,10 @@ [Test] public void SkippingRowsLargerThan1024() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT, name TEXT)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT, name TEXT)"); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES (?id, ?name)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (?id, ?name)", conn); cmd.Parameters.Add("?id", MySqlDbType.Int32); cmd.Parameters.Add("?name", MySqlDbType.Text); for (int i = 0; i < 5; i++) @@ -690,7 +690,7 @@ try { - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); DataTable dt = new DataTable(); da.Fill(0, 2, dt); } Modified: branches/5.1/TestSuite/Source/DataReaderTests.cs =================================================================== --- branches/5.1/TestSuite/Source/DataReaderTests.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/DataReaderTests.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -255,7 +255,7 @@ Assert.IsFalse(reader.NextResult(), "Trying NextResult"); reader.Close(); - cmd.CommandText = "SELECT * FROM test where id=1"; + cmd.CommandText = "SELECT * FROM Test where id=1"; reader = cmd.ExecuteReader(CommandBehavior.SingleRow); Assert.IsTrue(reader.Read()); Assert.AreEqual("test1", reader.GetString(1)); @@ -577,7 +577,7 @@ Assert.IsNotNull( reader ); //First ResultSet, should have 49 rows. - //SELECT id FROM test WHERE id<?param1; + //SELECT id FROM Test WHERE id<?param1; Assert.AreEqual( true, reader.HasRows ); Assert.AreEqual( 1, reader.FieldCount ); for (int i = 0; i < 49; i++) @@ -587,7 +587,7 @@ Assert.AreEqual( false, reader.Read() ); //Second ResultSet, should have no rows. - //SELECT id,name FROM test WHERE id = -50; + //SELECT id,name FROM Test WHERE id = -50; Assert.IsTrue( reader.NextResult() ); Assert.AreEqual( false, reader.HasRows ); Assert.AreEqual( 2, reader.FieldCount ); @@ -595,7 +595,7 @@ //Third ResultSet, should have 51 rows. - //SELECT * FROM test WHERE id >= ?param1; + //SELECT * FROM Test WHERE id >= ?param1; Assert.IsTrue( reader.NextResult() ); Assert.AreEqual( true, reader.HasRows ); Assert.AreEqual( 5, reader.FieldCount ); @@ -607,21 +607,21 @@ //Fourth ResultSet, should have no rows. - //SELECT id, dt, b1 FROM test WHERE id = -50; + //SELECT id, dt, b1 FROM Test WHERE id = -50; Assert.IsTrue( reader.NextResult() ); Assert.AreEqual( false, reader.HasRows ); Assert.AreEqual( 3, reader.FieldCount ); //Will Fail if uncommented expected 3 returned 5 Assert.AreEqual( false, reader.Read() ); //Fifth ResultSet, should have no rows. - //SELECT b1 FROM test WHERE id = -50; + //SELECT b1 FROM Test WHERE id = -50; Assert.IsTrue( reader.NextResult() ); Assert.AreEqual( false, reader.HasRows ); Assert.AreEqual( 1, reader.FieldCount ); //Will Fail if uncommented expected 1 returned 5 Assert.AreEqual( false, reader.Read() ); //Sixth ResultSet, should have 49 rows. - //SELECT id, dt, b1 FROM test WHERE id < ?param1; + //SELECT id, dt, b1 FROM Test WHERE id < ?param1; Assert.IsTrue( reader.NextResult() ); Assert.AreEqual( true, reader.HasRows ); Assert.AreEqual( 3, reader.FieldCount ); //Will Fail if uncommented expected 3 returned 5 @@ -632,7 +632,7 @@ Assert.AreEqual( false, reader.Read() ); //Seventh ResultSet, should have 51 rows. - //SELECT b1 FROM test WHERE id >= ?param1; + //SELECT b1 FROM Test WHERE id >= ?param1; Assert.IsTrue( reader.NextResult() ); Assert.AreEqual( true, reader.HasRows ); Assert.AreEqual( 1, reader.FieldCount ); //Will Fail if uncommented expected 1 returned 5 @@ -713,7 +713,7 @@ execSQL("INSERT INTO Test (id,name) VALUES(2,'test2')"); execSQL("INSERT INTO Test (id,name) VALUES(3,'test3')"); - MySqlCommand cmd = new MySqlCommand("SELECT * FROM test", conn); + MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", conn); MySqlDataReader reader = null; try { @@ -761,11 +761,11 @@ [Test] public void InvalidTimestamp() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (tm TIMESTAMP)"); - execSQL("INSERT INTO test VALUES (NULL)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (tm TIMESTAMP)"); + execSQL("INSERT INTO Test VALUES (NULL)"); - MySqlCommand cmd = new MySqlCommand("SELECT * FROM test WHERE tm = '7/1/2005 12:00:00 AM'", conn); + MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test WHERE tm = '7/1/2005 12:00:00 AM'", conn); MySqlDataReader reader = null; try { @@ -787,10 +787,10 @@ [Test] public void GetStringOnNull() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id int, PRIMARY KEY(id))"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id int, PRIMARY KEY(id))"); MySqlCommand cmd = new MySqlCommand( - String.Format("SHOW INDEX FROM test FROM `{0}`", database0), conn); + String.Format("SHOW INDEX FROM Test FROM `{0}`", database0), conn); MySqlDataReader reader = null; try { @@ -838,9 +838,9 @@ [Test] public void IsDbNullOnNonNullFields() { - execSQL("INSERT INTO test (id, name) VALUES (1, '')"); + execSQL("INSERT INTO Test (id, name) VALUES (1, '')"); - MySqlCommand cmd = new MySqlCommand("SELECT * FROM test", conn); + MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", conn); using (MySqlDataReader reader = cmd.ExecuteReader()) { Assert.IsTrue(reader.Read()); @@ -854,12 +854,12 @@ [Test] public void ConstraintWithLoadingReader() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL(@"CREATE TABLE test (ID_A int(11) NOT NULL, + execSQL("DROP TABLE IF EXISTS Test"); + execSQL(@"CREATE TABLE Test (ID_A int(11) NOT NULL, ID_B int(11) NOT NULL, PRIMARY KEY (ID_A,ID_B) ) ENGINE=MyISAM DEFAULT CHARSET=latin1;"); - MySqlCommand cmd = new MySqlCommand("SELECT * FROM test", conn); + MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", conn); DataTable dt = new DataTable(); using (MySqlDataReader reader = cmd.ExecuteReader()) Modified: branches/5.1/TestSuite/Source/DataTypeTests.cs =================================================================== --- branches/5.1/TestSuite/Source/DataTypeTests.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/DataTypeTests.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -320,14 +320,14 @@ [Test] public void Timestamp() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id int, dt DATETIME, ts2 TIMESTAMP(2), ts4 TIMESTAMP(4), " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id int, dt DATETIME, ts2 TIMESTAMP(2), ts4 TIMESTAMP(4), " + "ts6 TIMESTAMP(6), ts8 TIMESTAMP(8), ts10 TIMESTAMP(10), ts12 TIMESTAMP(12), " + "ts14 TIMESTAMP(14))"); - execSQL("INSERT INTO test (id, dt, ts2, ts4, ts6, ts8, ts10, ts12, ts14) " + + execSQL("INSERT INTO Test (id, dt, ts2, ts4, ts6, ts8, ts10, ts12, ts14) " + "VALUES (1, Now(), Now(), Now(), Now(), Now(), Now(), Now(), Now())"); - MySqlDataAdapter da = new MySqlDataAdapter( "SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter( "SELECT * FROM Test", conn); DataTable dt = new DataTable(); da.Fill(dt); @@ -467,12 +467,12 @@ [Test] public void BitAndDecimal() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (bt1 BIT, bt4 BIT(4), bt11 BIT(11), bt23 BIT(23), bt32 BIT(32)) engine=myisam"); - execSQL("INSERT INTO test VALUES (1, 2, 120, 240, 1000)"); - execSQL("INSERT INTO test VALUES (NULL, NULL, 100, NULL, NULL)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (bt1 BIT, bt4 BIT(4), bt11 BIT(11), bt23 BIT(23), bt32 BIT(32)) engine=myisam"); + execSQL("INSERT INTO Test VALUES (1, 2, 120, 240, 1000)"); + execSQL("INSERT INTO Test VALUES (NULL, NULL, 100, NULL, NULL)"); - MySqlCommand cmd = new MySqlCommand("SELECT * FROM test", conn); + MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", conn); MySqlDataReader reader = null; try { @@ -515,11 +515,11 @@ [Test] public void UpdateDecimalColumns() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id int not null auto_increment primary key, " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id int not null auto_increment primary key, " + "dec1 decimal(10,1))"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); DataTable dt = new DataTable(); da.Fill(dt); @@ -539,17 +539,17 @@ [Test] public void DecimalTests() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (val decimal(10,1))"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (val decimal(10,1))"); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES(?dec)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES(?dec)", conn); cmd.Parameters.AddWithValue("?dec", (decimal)2.4); Assert.AreEqual(1, cmd.ExecuteNonQuery()); cmd.Prepare(); Assert.AreEqual(1, cmd.ExecuteNonQuery()); - cmd.CommandText = "SELECT * FROM test"; + cmd.CommandText = "SELECT * FROM Test"; MySqlDataReader reader = null; try { @@ -578,17 +578,17 @@ [Test] public void DecimalTests2() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (val decimal(10,1))"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (val decimal(10,1))"); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES(?dec)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES(?dec)", conn); cmd.Parameters.AddWithValue("?dec", (decimal)2.4); Assert.AreEqual(1, cmd.ExecuteNonQuery()); cmd.Prepare(); Assert.AreEqual(1, cmd.ExecuteNonQuery()); - cmd.CommandText = "SELECT * FROM test"; + cmd.CommandText = "SELECT * FROM Test"; MySqlDataReader reader = null; try { @@ -619,10 +619,10 @@ { if (version < new Version(5, 0)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (bit1 BIT, bit2 BIT(5), bit3 BIT(10))"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (bit1 BIT, bit2 BIT(5), bit3 BIT(10))"); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES (?b1, ?b2, ?b3)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (?b1, ?b2, ?b3)", conn); cmd.Parameters.Add(new MySqlParameter("?b1", MySqlDbType.Bit)); cmd.Parameters.Add(new MySqlParameter("?b2", MySqlDbType.Bit)); cmd.Parameters.Add(new MySqlParameter("?b3", MySqlDbType.Bit)); @@ -635,7 +635,7 @@ MySqlDataReader reader = null; try { - cmd.CommandText = "SELECT * FROM test"; + cmd.CommandText = "SELECT * FROM Test"; cmd.Prepare(); reader = cmd.ExecuteReader(); Assert.IsTrue(reader.Read()); @@ -684,8 +684,8 @@ execSQL("DROP TABLE IF EXISTS Test"); execSQL("CREATE TABLE Test (b MEDIUMINT UNSIGNED PRIMARY KEY)"); - execSQL("INSERT INTO test VALUES(20)"); - MySqlCommand cmd = new MySqlCommand("SELECT * FROM test WHERE (b > ?id)", conn); + execSQL("INSERT INTO Test VALUES(20)"); + MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test WHERE (b > ?id)", conn); cmd.Parameters.Add("?id", MySqlDbType.UInt16).Value = 10; MySqlDataReader dr = null; try @@ -711,11 +711,11 @@ [Test] public void TestNegativeTime() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (t time)"); - execSQL("INSERT INTO test SET T='-07:24:00'"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (t time)"); + execSQL("INSERT INTO Test SET T='-07:24:00'"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); DataTable dt = new DataTable(); da.Fill(dt); @@ -763,11 +763,11 @@ [Test] public void BinaryTypes() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL(@"CREATE TABLE test (c1 VARCHAR(20), c2 VARBINARY(20), + execSQL("DROP TABLE IF EXISTS Test"); + execSQL(@"CREATE TABLE Test (c1 VARCHAR(20), c2 VARBINARY(20), c3 TEXT, c4 BLOB, c6 VARCHAR(20) CHARACTER SET BINARY)"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); DataTable dt = new DataTable(); da.Fill(dt); Assert.AreEqual(typeof(String), dt.Columns[0].DataType); @@ -799,15 +799,15 @@ [Test] public void RespectBinaryFlag() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (col1 VARBINARY(20), col2 BLOB)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (col1 VARBINARY(20), col2 BLOB)"); string connStr = GetConnectionString(true) + ";respect binary flags=false"; using (MySqlConnection c = new MySqlConnection(connStr)) { c.Open(); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", c); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", c); DataTable dt = new DataTable(); da.Fill(dt); Assert.IsTrue(dt.Columns[0].DataType == typeof(System.String)); @@ -818,11 +818,11 @@ [Test] public void BooleanForBit1() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT, `on` BIT(1))"); - execSQL("INSERT INTO test VALUES (1,1), (2,0)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT, `on` BIT(1))"); + execSQL("INSERT INTO Test VALUES (1,1), (2,0)"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); DataTable dt = new DataTable(); da.Fill(dt); Assert.AreEqual(typeof(Boolean), dt.Columns[1].DataType); Modified: branches/5.1/TestSuite/Source/DateTimeTests.cs =================================================================== --- branches/5.1/TestSuite/Source/DateTimeTests.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/DateTimeTests.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -59,7 +59,7 @@ { c.Open(); - MySqlCommand cmd = new MySqlCommand("SELECT * FROM test", c); + MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", c); reader = cmd.ExecuteReader(); Assert.IsTrue(reader.Read()); Assert.AreEqual(DateTime.MinValue.Date, reader.GetDateTime(1).Date); @@ -181,7 +181,7 @@ reader = null; DataTable dt = new DataTable(); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", c); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", c); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); da.Fill(dt); dt.Rows[0]["id"] = 2; @@ -346,12 +346,12 @@ [Test] public void UsingDatesAsStrings() { - MySqlCommand cmd = new MySqlCommand("INSERT INTO test (id, dt) VALUES (1, ?dt)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id, dt) VALUES (1, ?dt)", conn); cmd.Parameters.Add("?dt", MySqlDbType.Date); cmd.Parameters[0].Value = "2005-03-04"; cmd.ExecuteNonQuery(); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); DataTable dt = new DataTable(); da.Fill(dt); Assert.AreEqual(1, dt.Rows.Count); @@ -367,33 +367,33 @@ [Test] public void Bug19481() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test(ID INT NOT NULL AUTO_INCREMENT, " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test(ID INT NOT NULL AUTO_INCREMENT, " + "SATELLITEID VARCHAR(3) NOT NULL, ANTENNAID INT, AOS_TIMESTAMP DATETIME NOT NULL, " + "TEL_TIMESTAMP DATETIME, LOS_TIMESTAMP DATETIME, PRIMARY KEY (ID))"); - execSQL("INSERT INTO test VALUES (NULL,'224','0','2005-07-24 00:00:00'," + + execSQL("INSERT INTO Test VALUES (NULL,'224','0','2005-07-24 00:00:00'," + "'2005-07-24 00:02:00','2005-07-24 00:22:00')"); - execSQL("INSERT INTO test VALUES (NULL,'155','24','2005-07-24 03:00:00'," + + execSQL("INSERT INTO Test VALUES (NULL,'155','24','2005-07-24 03:00:00'," + "'2005-07-24 03:02:30','2005-07-24 03:20:00')"); - execSQL("INSERT INTO test VALUES (NULL,'094','34','2005-07-24 09:00:00'," + + execSQL("INSERT INTO Test VALUES (NULL,'094','34','2005-07-24 09:00:00'," + "'2005-07-24 09:00:30','2005-07-24 09:15:00')"); - execSQL("INSERT INTO test VALUES (NULL,'224','54','2005-07-24 12:00:00'," + + execSQL("INSERT INTO Test VALUES (NULL,'224','54','2005-07-24 12:00:00'," + "'2005-07-24 12:01:00','2005-07-24 12:33:00')"); - execSQL("INSERT INTO test VALUES (NULL,'155','25','2005-07-24 15:00:00'," + + execSQL("INSERT INTO Test VALUES (NULL,'155','25','2005-07-24 15:00:00'," + "'2005-07-24 15:02:00','2005-07-24 15:22:00')"); - execSQL("INSERT INTO test VALUES (NULL,'094','0','2005-07-24 17:00:00'," + + execSQL("INSERT INTO Test VALUES (NULL,'094','0','2005-07-24 17:00:00'," + "'2005-07-24 17:02:12','2005-07-24 17:20:00')"); - execSQL("INSERT INTO test VALUES (NULL,'224','24','2005-07-24 19:00:00'," + + execSQL("INSERT INTO Test VALUES (NULL,'224','24','2005-07-24 19:00:00'," + "'2005-07-24 19:02:00','2005-07-24 19:27:00')"); - execSQL("INSERT INTO test VALUES (NULL,'155','34','2005-07-24 21:00:00'," + + execSQL("INSERT INTO Test VALUES (NULL,'155','34','2005-07-24 21:00:00'," + "'2005-07-24 21:02:33','2005-07-24 21:22:55')"); - execSQL("INSERT INTO test VALUES (NULL,'094','55','2005-07-24 23:00:00'," + + execSQL("INSERT INTO Test VALUES (NULL,'094','55','2005-07-24 23:00:00'," + "'2005-07-24 23:00:45','2005-07-24 23:22:23')"); DateTime date = DateTime.Parse("7/24/2005"); StringBuilder sql = new StringBuilder(); sql.AppendFormat(CultureInfo.InvariantCulture, - @"SELECT ID, ANTENNAID, TEL_TIMESTAMP, LOS_TIMESTAMP FROM test + @"SELECT ID, ANTENNAID, TEL_TIMESTAMP, LOS_TIMESTAMP FROM Test WHERE TEL_TIMESTAMP >= '{0}'", date.ToString("u")); MySqlDataAdapter da = new MySqlDataAdapter(sql.ToString(), conn); DataSet dataSet = new DataSet(); @@ -408,8 +408,8 @@ { if (Version < new Version(4, 1)) return; - execSQL("INSERT INTO test VALUES(1, Now(), '0000-00-00', NULL, NULL)"); - MySqlCommand cmd = new MySqlCommand("SELECT d FROM test WHERE id=?id", conn); + execSQL("INSERT INTO Test VALUES(1, Now(), '0000-00-00', NULL, NULL)"); + MySqlCommand cmd = new MySqlCommand("SELECT d FROM Test WHERE id=?id", conn); cmd.Parameters.AddWithValue("?id", 1); cmd.Prepare(); MySqlDataReader reader = null; @@ -432,13 +432,13 @@ [Test] public void DateTimeInDataTable() { - execSQL("INSERT INTO test VALUES(1, Now(), '0000-00-00', NULL, NULL)"); + execSQL("INSERT INTO Test VALUES(1, Now(), '0000-00-00', NULL, NULL)"); MySqlConnection c = new MySqlConnection( conn.ConnectionString + ";pooling=false;AllowZeroDatetime=true"); c.Open(); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", c); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", c); MySqlCommandBuilder cb = new MySqlCommandBuilder(da); DataTable dt = new DataTable(); try Modified: branches/5.1/TestSuite/Source/MySqlHelperTests.cs =================================================================== --- branches/5.1/TestSuite/Source/MySqlHelperTests.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/MySqlHelperTests.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -53,7 +53,7 @@ StringBuilder sb = new StringBuilder(); for (int i=0; i < 254; i++) sb.Append('a'); - string sql = "INSERT INTO test (name) VALUES ('" + sb.ToString() + "')"; + string sql = "INSERT INTO Test (name) VALUES ('" + sb.ToString() + "')"; reader = MySqlHelper.ExecuteReader(this.GetConnectionString(true), sql); } catch (Exception ex) Modified: branches/5.1/TestSuite/Source/ParameterTests.cs =================================================================== --- branches/5.1/TestSuite/Source/ParameterTests.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/ParameterTests.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -252,7 +252,7 @@ [Test] public void AllowUnnamedParameters() { - MySqlCommand cmd = new MySqlCommand("INSERT INTO test (id,name) VALUES (?id, ?name)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id,name) VALUES (?id, ?name)", conn); MySqlParameter p = new MySqlParameter(); p.ParameterName = "?id"; @@ -266,10 +266,10 @@ cmd.ExecuteNonQuery(); - cmd.CommandText = "SELECT id FROM test"; + cmd.CommandText = "SELECT id FROM Test"; Assert.AreEqual(1, cmd.ExecuteScalar()); - cmd.CommandText = "SELECT name FROM test"; + cmd.CommandText = "SELECT name FROM Test"; Assert.AreEqual( "test", cmd.ExecuteScalar()); } @@ -335,11 +335,11 @@ [Test] public void InsertValueAfterNull() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id int auto_increment primary key, foo int)"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id int auto_increment primary key, foo int)"); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); - MySqlCommand c = new MySqlCommand("INSERT INTO test (foo) values (?foo)", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); + MySqlCommand c = new MySqlCommand("INSERT INTO Test (foo) values (?foo)", conn); c.Parameters.Add("?foo", MySqlDbType.Int32, 0, "foo"); da.InsertCommand = c; @@ -364,7 +364,7 @@ [Test] public void UnTypedParameterBeingReused() { - MySqlCommand cmd = new MySqlCommand("INSERT INTO test (id, dt) VALUES (?id, ?dt)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id, dt) VALUES (?id, ?dt)", conn); cmd.Parameters.AddWithValue("?id", 1); MySqlParameter p = cmd.CreateParameter(); p.ParameterName = "?dt"; @@ -376,7 +376,7 @@ p.Value = DateTime.Now; cmd.ExecuteNonQuery(); - cmd.CommandText = "SELECT * FROM test"; + cmd.CommandText = "SELECT * FROM Test"; cmd.Parameters.Clear(); using (MySqlDataReader reader = cmd.ExecuteReader()) { @@ -393,12 +393,12 @@ { try { - MySqlCommand cmd = new MySqlCommand("INSERT INTO test (id, name) VALUES (?id, ?name)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id, name) VALUES (?id, ?name)", conn); cmd.Parameters.AddWithValue("?id", 1); cmd.Parameters.AddWithValue("?name", "test"); cmd.ExecuteNonQuery(); - cmd.CommandText = "INSERT INTO test (id, name, dt) VALUES (?id1, ?name1, ?id)"; + cmd.CommandText = "INSERT INTO Test (id, name, dt) VALUES (?id1, ?name1, ?id)"; cmd.Parameters[0].ParameterName = "?id1"; cmd.Parameters[0].Value = 2; cmd.Parameters[1].ParameterName = "?name1"; @@ -416,7 +416,7 @@ { try { - MySqlCommand cmd = new MySqlCommand("INSERT INTO test (id, name) VALUES (?id, ?name)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id, name) VALUES (?id, ?name)", conn); cmd.Parameters.AddWithValue("id", 1); Assert.AreEqual(-1, cmd.Parameters.IndexOf("?id")); cmd.Parameters.AddWithValue("name", "test"); @@ -428,7 +428,7 @@ cmd.Parameters.AddWithValue("?name", "test2"); cmd.ExecuteNonQuery(); - cmd.CommandText = "SELECT COUNT(*) FROM test"; + cmd.CommandText = "SELECT COUNT(*) FROM Test"; object count = cmd.ExecuteScalar(); Assert.AreEqual(2, count); } @@ -443,7 +443,7 @@ { try { - MySqlCommand cmd = new MySqlCommand("INSERT INTO test (id, name) VALUES (?id, ?name)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id, name) VALUES (?id, ?name)", conn); cmd.Parameters.AddWithValue("id", 1); cmd.Parameters.AddWithValue("name", "test"); cmd.Parameters.AddWithValue("?id", 2); @@ -509,7 +509,7 @@ [Test] public void MissingParameter() { - MySqlCommand cmd = new MySqlCommand("INSERT INTO test(id) VALUES (?id)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test(id) VALUES (?id)", conn); try { cmd.ExecuteNonQuery(); Modified: branches/5.1/TestSuite/Source/PreparedStatements.cs =================================================================== --- branches/5.1/TestSuite/Source/PreparedStatements.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/PreparedStatements.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -398,7 +398,7 @@ execSQL("INSERT INTO Test VALUES( 1, 2)"); // create the command and prepare the statement IDbCommand cmd = conn.CreateCommand(); - cmd.CommandText = "SELECT * FROM test where one = ?p1"; + cmd.CommandText = "SELECT * FROM Test where one = ?p1"; // create the parameter IDbDataParameter p1 = cmd.CreateParameter(); p1.ParameterName = "?p1"; @@ -437,8 +437,8 @@ { if (version < new Version(4, 1)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT UNSIGNED NOT NULL PRIMARY KEY " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT UNSIGNED NOT NULL PRIMARY KEY " + "AUTO_INCREMENT, input TEXT NOT NULL) CHARACTER SET UTF8"); // COLLATE " + //"utf8_bin"); @@ -448,7 +448,7 @@ { conn2.Open(); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test(input) " + + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test(input) " + "VALUES (?input) ON DUPLICATE KEY UPDATE " + "id=LAST_INSERT_ID(id)", conn2); cmd.Parameters.Add(new MySqlParameter("?input", "")); @@ -456,7 +456,7 @@ cmd.Parameters[0].Value = "irache mart cmd.ExecuteNonQuery(); - MySqlCommand cmd2 = new MySqlCommand("SELECT input FROM test", conn2); + MySqlCommand cmd2 = new MySqlCommand("SELECT input FROM Test", conn2); Assert.AreEqual("irache mart cmd2.ExecuteScalar()); } @@ -478,11 +478,11 @@ { if (version < new Version(4, 1)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE IF NOT EXISTS test (input TEXT NOT NULL, " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE IF NOT EXISTS Test (input TEXT NOT NULL, " + "UNIQUE (input(100)), state INT NOT NULL, score INT NOT NULL)"); - MySqlCommand cmd = new MySqlCommand("Insert into test (input, " + + MySqlCommand cmd = new MySqlCommand("Insert into Test (input, " + "state, score) VALUES (?input, ?st, ?sc) ON DUPLICATE KEY " + "UPDATE state=state|?st;", conn); cmd.Parameters.Add (new MySqlParameter("?input", "")); @@ -496,7 +496,7 @@ int result = cmd.ExecuteNonQuery(); Assert.AreEqual(1, result); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); DataTable dt = new DataTable(); da.Fill(dt); Assert.AreEqual(1, dt.Rows.Count); @@ -513,15 +513,15 @@ { if (version < new Version(4, 1)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE `test` (`BlackListID` int(11) NOT NULL auto_increment, " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE `Test` (`BlackListID` int(11) NOT NULL auto_increment, " + "`SubscriberID` int(11) NOT NULL, `Phone` varchar(50) default NULL, " + "`ContactID` int(11) default NULL, " + "`AdminJunk` tinyint(1) NOT NULL default '0', " + "PRIMARY KEY (`BlackListID`), KEY `SubscriberID` (`SubscriberID`))"); IDbCommand cmd = conn.CreateCommand(); - cmd.CommandText = "INSERT INTO `test`(`SubscriberID`,`Phone`,`ContactID`, " + + cmd.CommandText = "INSERT INTO `Test`(`SubscriberID`,`Phone`,`ContactID`, " + "`AdminJunk`) VALUES (?SubscriberID,?Phone,?ContactID, ?AdminJunk);"; MySqlParameter oParameterSubscriberID = new MySqlParameter(); @@ -561,10 +561,10 @@ public void ParameterLengths() { if (version < new Version(4, 1)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id int, name VARCHAR(255))"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id int, name VARCHAR(255))"); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES (?id, ?name)", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (?id, ?name)", conn); cmd.Parameters.Add("?id", MySqlDbType.Int32); cmd.Parameters.Add("?name", MySqlDbType.VarChar); cmd.Parameters[1].Size = 255; @@ -574,7 +574,7 @@ cmd.Parameters[1].Value = "short string"; cmd.ExecuteNonQuery(); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); DataTable dt = new DataTable(); da.Fill(dt); Assert.AreEqual(1, dt.Rows.Count); @@ -590,13 +590,13 @@ { if (version < new Version(4, 1)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test(ID TINYINT UNSIGNED NOT NULL, " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test(ID TINYINT UNSIGNED NOT NULL, " + "Name VARCHAR(50) NOT NULL, PRIMARY KEY (ID), UNIQUE (ID), " + "UNIQUE (Name))"); - execSQL("INSERT INTO test VALUES ('127', 'name1')"); - execSQL("INSERT INTO test VALUES ('128', 'name2')"); - execSQL("INSERT INTO test VALUES ('255', 'name3')"); + execSQL("INSERT INTO Test VALUES ('127', 'name1')"); + execSQL("INSERT INTO Test VALUES ('128', 'name2')"); + execSQL("INSERT INTO Test VALUES ('255', 'name3')"); string sql = " SELECT count(*) FROM TEST WHERE ID = ?id"; @@ -634,11 +634,11 @@ { if (version < new Version(4, 1)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (ulVal BIGINT UNSIGNED, lVal INT UNSIGNED, " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (ulVal BIGINT UNSIGNED, lVal INT UNSIGNED, " + "mVal MEDIUMINT UNSIGNED, sVal SMALLINT UNSIGNED)"); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES (?ulVal, " + + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (?ulVal, " + "?lVal, ?mVal, ?sVal)", conn); cmd.Parameters.Add("?ulVal", MySqlDbType.UInt64); cmd.Parameters.Add("?lVal", MySqlDbType.UInt32); @@ -650,7 +650,7 @@ cmd.Parameters[2].Value = 16777215; cmd.Parameters[3].Value = UInt16.MaxValue; Assert.AreEqual(1, cmd.ExecuteNonQuery()); - cmd.CommandText = "SELECT * FROM test"; + cmd.CommandText = "SELECT * FROM Test"; cmd.CommandType = CommandType.Text; MySqlDataReader reader = null; try @@ -701,15 +701,15 @@ [Test] public void CompoundStatements() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE IF NOT EXISTS test ("+ + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE IF NOT EXISTS Test ("+ "id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT," + "test1 INT UNSIGNED, test2 INT UNSIGNED)"); try { MySqlCommand cmd = conn.CreateCommand(); - cmd.CommandText = "INSERT INTO test VALUES (NULL, ?t1, ?t2);" + + cmd.CommandText = "INSERT INTO Test VALUES (NULL, ?t1, ?t2);" + "SELECT last_insert_id()"; cmd.Parameters.Add("?t1", MySqlDbType.Int32); cmd.Parameters.Add("?t2", MySqlDbType.Int32); @@ -724,10 +724,10 @@ [Test] public void SchemaOnly() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT, name VARCHAR(50))"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT, name VARCHAR(50))"); - MySqlCommand cmd = new MySqlCommand("SELECT * FROM test", conn); + MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", conn); cmd.Prepare(); using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly)) { @@ -751,8 +751,8 @@ { if (version < new Version(5, 0)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT, name VARCHAR(50))"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT, name VARCHAR(50))"); string connStr = GetConnectionString(true) + ";ignore prepare=false"; @@ -765,7 +765,7 @@ for (int i = 0; i < 10; i++) { using (MySqlCommand cmd = - new MySqlCommand("INSERT INTO test VALUES (?id, ?name)", c)) + new MySqlCommand("INSERT INTO Test VALUES (?id, ?name)", c)) { cmd.Parameters.Add("?id", MySqlDbType.Int32); cmd.Parameters.Add("?name", MySqlDbType.VarChar); Modified: branches/5.1/TestSuite/Source/StoredProcedure.cs =================================================================== --- branches/5.1/TestSuite/Source/StoredProcedure.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/StoredProcedure.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -171,7 +171,7 @@ try { - MySqlCommand cmd = new MySqlCommand("spTest;select * from test", conn); + MySqlCommand cmd = new MySqlCommand("spTest;select * from Test", conn); cmd.CommandType = CommandType.StoredProcedure; cmd.ExecuteNonQuery(); Assert.Fail("Should have thrown an exception"); @@ -745,7 +745,7 @@ execSQL("DROP PROCEDURE IF EXISTS spTest"); execSQL("CREATE PROCEDURE spTest(id int, str VARCHAR(45)) " + - "BEGIN INSERT INTO test VALUES(id, str); END"); + "BEGIN INSERT INTO Test VALUES(id, str); END"); MySqlCommand cmd = new MySqlCommand("spTest", conn); cmd.CommandType = CommandType.StoredProcedure; @@ -759,7 +759,7 @@ cmd.Parameters.AddWithValue("?str", "Second record"); cmd.ExecuteNonQuery(); - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); DataTable dt = new DataTable(); da.Fill(dt); @@ -781,7 +781,7 @@ execSQL("CREATE TABLE Test (id integer(9), state varchar(2))"); execSQL("CREATE PROCEDURE spTest(IN p1 integer(9), IN p2 varchar(2)) " + "BEGIN " + - "INSERT INTO test (id, state) VALUES (p1, p2); " + + "INSERT INTO Test (id, state) VALUES (p1, p2); " + "END"); MySqlCommand cmd = conn.CreateCommand(); @@ -934,12 +934,12 @@ { if (version < new Version(5, 0)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id int(10) unsigned NOT NULL default '0', " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id int(10) unsigned NOT NULL default '0', " + "val int(10) unsigned default NULL, PRIMARY KEY (id)) " + "ENGINE=InnoDB DEFAULT CHARSET=utf8"); execSQL("CREATE PROCEDURE spTest (IN pp INTEGER) " + - "select * from test where id > pp "); + "select * from Test where id > pp "); MySqlCommand c = new MySqlCommand("spTest", conn); c.CommandType = CommandType.StoredProcedure; @@ -973,10 +973,10 @@ { if (version < new Version(5, 0)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT(10) UNSIGNED AUTO_INCREMENT, PRIMARY KEY (id)) "); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT(10) UNSIGNED AUTO_INCREMENT, PRIMARY KEY (id)) "); execSQL("CREATE PROCEDURE spTest (OUT id BIGINT UNSIGNED) " + - "BEGIN INSERT INTO test VALUES (NULL); SET id=LAST_INSERT_ID(); END"); + "BEGIN INSERT INTO Test VALUES (NULL); SET id=LAST_INSERT_ID(); END"); MySqlCommand cmd = new MySqlCommand("spTest", conn); cmd.CommandType = CommandType.StoredProcedure; @@ -1033,10 +1033,10 @@ { if (version < new Version(5, 0)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test(str VARCHAR(50), e ENUM ('P','R','F','E'), i INT(6))"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test(str VARCHAR(50), e ENUM ('P','R','F','E'), i INT(6))"); execSQL("CREATE PROCEDURE spTest(IN p_enum ENUM('P','R','F','E')) BEGIN " + - "INSERT INTO test (str, e, i) VALUES (null, p_enum, 55); END"); + "INSERT INTO Test (str, e, i) VALUES (null, p_enum, 55); END"); try { @@ -1047,7 +1047,7 @@ using (MySqlDataReader reader = cmd.ExecuteReader()) { } - cmd.CommandText = "SELECT e FROM test"; + cmd.CommandText = "SELECT e FROM Test"; cmd.CommandType = CommandType.Text; using (MySqlDataReader reader = cmd.ExecuteReader()) { @@ -1165,7 +1165,7 @@ try { - execSQL("CREATE PROCEDURE spTest() BEGIN SELECT * FROM test; END"); + execSQL("CREATE PROCEDURE spTest() BEGIN SELECT * FROM Test; END"); MySqlCommand cmd = new MySqlCommand("spTest", conn); cmd.CommandType = CommandType.StoredProcedure; @@ -1180,11 +1180,11 @@ Assert.AreEqual(2, schema.Columns.Count); //Bug #27668 FillSchema and Stored Proc with an out parameter - execSQL("DROP TABLE IF EXISTS test"); - execSQL(@"CREATE TABLE test(id INT AUTO_INCREMENT, PRIMARY KEY (id)) "); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL(@"CREATE TABLE Test(id INT AUTO_INCREMENT, PRIMARY KEY (id)) "); execSQL("DROP PROCEDURE IF EXISTS spTest"); execSQL(@"CREATE PROCEDURE spTest (OUT id INT) - BEGIN INSERT INTO test VALUES (NULL); SET id=520; END"); + BEGIN INSERT INTO Test VALUES (NULL); SET id=520; END"); cmd = new MySqlCommand("spTest", conn); cmd.CommandType = CommandType.StoredProcedure; @@ -1210,11 +1210,11 @@ /* [Test] public void LastInsertId() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(200))"); - execSQL("INSERT INTO test VALUES (NULL, 'Test1')"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(200))"); + execSQL("INSERT INTO Test VALUES (NULL, 'Test1')"); execSQL("CREATE PROCEDURE spTest() BEGIN " + - "INSERT INTO test VALUES (NULL, 'test'); END"); + "INSERT INTO Test VALUES (NULL, 'test'); END"); MySqlCommand cmd = new MySqlCommand("spTest", conn); cmd.CommandType = CommandType.StoredProcedure; @@ -1302,12 +1302,12 @@ { if (version < new Version(5, 0)) return; - execSQL("DROP TABLE IF EXISTS test"); - execSQL(@"CREATE TABLE test(f1 bigint(20) unsigned NOT NULL, + execSQL("DROP TABLE IF EXISTS Test"); + execSQL(@"CREATE TABLE Test(f1 bigint(20) unsigned NOT NULL, PRIMARY KEY(f1)) ENGINE=InnoDB DEFAULT CHARSET=utf8"); execSQL(@"CREATE PROCEDURE spTest(in _val bigint unsigned) - BEGIN insert into test set f1=_val; END"); + BEGIN insert into Test set f1=_val; END"); DbCommand cmd = new MySqlCommand(); cmd.Connection = conn; Modified: branches/5.1/TestSuite/Source/Syntax.cs =================================================================== --- branches/5.1/TestSuite/Source/Syntax.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/Syntax.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -40,7 +40,7 @@ [Test] public void ShowCreateTable() { - MySqlDataAdapter da = new MySqlDataAdapter("SHOW CREATE TABLE test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SHOW CREATE TABLE Test", conn); DataTable dt = new DataTable(); da.Fill(dt); @@ -234,15 +234,15 @@ [Test] public void Sum() { - execSQL("DROP TABLE IF EXISTS test"); + execSQL("DROP TABLE IF EXISTS Test"); - execSQL("CREATE TABLE test (field1 mediumint(9) default '0', field2 float(9,3) " + + execSQL("CREATE TABLE Test (field1 mediumint(9) default '0', field2 float(9,3) " + "default '0.000', field3 double(15,3) default '0.000') engine=innodb "); - execSQL("INSERT INTO test values (1,1,1)"); + execSQL("INSERT INTO Test values (1,1,1)"); MySqlDataReader reader = null; - MySqlCommand cmd2 = new MySqlCommand("SELECT sum(field2) FROM test", conn); + MySqlCommand cmd2 = new MySqlCommand("SELECT sum(field2) FROM Test", conn); try { reader = cmd2.ExecuteReader(); @@ -260,7 +260,7 @@ reader = null; } - execSQL("DROP TABLE IF EXISTS test"); + execSQL("DROP TABLE IF EXISTS Test"); execSQL("CREATE TABLE Test (id int, count int)"); execSQL("INSERT INTO Test VALUES (1, 21)"); execSQL("INSERT INTO Test VALUES (1, 33)"); @@ -291,7 +291,7 @@ { if (version < new Version(4, 1)) return; - MySqlCommand cmd = new MySqlCommand("SELECT * FROM test; DROP TABLE IF EXISTS test2; SELECT * FROM test", conn); + MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test; DROP TABLE IF EXISTS test2; SELECT * FROM Test", conn); MySqlDataReader reader = null; try { @@ -339,13 +339,13 @@ [Test] public void FoundRows() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (testID int(11) NOT NULL auto_increment, testName varchar(100) default '', " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (testID int(11) NOT NULL auto_increment, testName varchar(100) default '', " + "PRIMARY KEY (testID)) ENGINE=InnoDB DEFAULT CHARSET=latin1"); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES (NULL, 'test')", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (NULL, 'test')", conn); for (int i=0; i < 1000; i++) cmd.ExecuteNonQuery(); - cmd.CommandText = "SELECT SQL_CALC_FOUND_ROWS * FROM test LIMIT 0, 10"; + cmd.CommandText = "SELECT SQL_CALC_FOUND_ROWS * FROM Test LIMIT 0, 10"; cmd.ExecuteNonQuery(); cmd.CommandText = "SELECT FOUND_ROWS()"; object cnt = cmd.ExecuteScalar(); @@ -355,10 +355,10 @@ [Test] public void AutoIncrement() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (testID int(11) NOT NULL auto_increment, testName varchar(100) default '', " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (testID int(11) NOT NULL auto_increment, testName varchar(100) default '', " + "PRIMARY KEY (testID)) ENGINE=InnoDB DEFAULT CHARSET=latin1"); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES (NULL, 'test')", conn); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (NULL, 'test')", conn); cmd.ExecuteNonQuery(); cmd.CommandText = "SELECT @@IDENTITY as 'Identity'"; MySqlDataReader reader = null; @@ -388,14 +388,14 @@ { try { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (`PO#` int(11) NOT NULL auto_increment, " + + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (`PO#` int(11) NOT NULL auto_increment, " + "`PODate` date default NULL, PRIMARY KEY (`PO#`))"); - execSQL("INSERT INTO test ( `PO#`, `PODate` ) " + + execSQL("INSERT INTO Test ( `PO#`, `PODate` ) " + "VALUES ( NULL, '2006-01-01' )"); string sql = "SELECT `PO#` AS PurchaseOrderNumber, " + - "`PODate` AS OrderDate FROM test"; + "`PODate` AS OrderDate FROM Test"; MySqlCommand cmd = new MySqlCommand(sql, conn); MySqlDataAdapter da = new MySqlDataAdapter(cmd); DataTable dt = new DataTable(); @@ -432,7 +432,7 @@ [Test] public void Describe() { - MySqlDataAdapter da = new MySqlDataAdapter("DESCRIBE test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("DESCRIBE Test", conn); DataTable dt = new DataTable(); da.Fill(dt); @@ -448,7 +448,7 @@ public void ShowTableStatus() { MySqlDataAdapter da = new MySqlDataAdapter( - String.Format("SHOW TABLE STATUS FROM `{0}` LIKE 'test'", + String.Format("SHOW TABLE STATUS FROM `{0}` LIKE 'Test'", database0), conn); DataTable dt = new DataTable(); da.Fill(dt); Modified: branches/5.1/TestSuite/Source/Syntax2.cs =================================================================== --- branches/5.1/TestSuite/Source/Syntax2.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/Syntax2.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -45,7 +45,7 @@ " comments */\r\n" + "INSERT INTO \r\n" + " # This table is bogus\r\n" + - "test VALUES (2, 'Test2')"; + "Test VALUES (2, 'Test2')"; MySqlCommand cmd = new MySqlCommand(sql, conn); cmd.ExecuteNonQuery(); @@ -62,9 +62,9 @@ [Test] public void LastInsertid() { - execSQL("DROP TABLE test"); - execSQL("CREATE TABLE test(id int auto_increment, name varchar(20), primary key(id))"); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES(NULL, 'test')", conn); + execSQL("DROP TABLE Test"); + execSQL("CREATE TABLE Test(id int auto_increment, name varchar(20), primary key(id))"); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES(NULL, 'test')", conn); cmd.ExecuteNonQuery(); Assert.AreEqual(1, cmd.LastInsertedId); @@ -85,7 +85,7 @@ } Assert.AreEqual(2, cmd.LastInsertedId); - cmd.CommandText = "SELECT id FROM test"; + cmd.CommandText = "SELECT id FROM Test"; cmd.ExecuteScalar(); Assert.AreEqual(-1, cmd.LastInsertedId); } Modified: branches/5.1/TestSuite/Source/Transactions.cs =================================================================== --- branches/5.1/TestSuite/Source/Transactions.cs 2007-08-22 17:40:42 UTC (rev 962) +++ branches/5.1/TestSuite/Source/Transactions.cs 2007-08-22 17:51:27 UTC (rev 963) @@ -43,7 +43,7 @@ void TransactionScopeInternal(bool commit) { MySqlConnection c = new MySqlConnection(GetConnectionString(true)); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES ('a', 'name', 'name2')", c); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES ('a', 'name', 'name2')", c); try { @@ -57,7 +57,7 @@ ts.Complete(); } - cmd.CommandText = "SELECT COUNT(*) FROM test"; + cmd.CommandText = "SELECT COUNT(*) FROM Test"; object count = cmd.ExecuteScalar(); Assert.AreEqual(commit ? 1 : 0, count); } @@ -88,8 +88,8 @@ { MySqlConnection c1 = new MySqlConnection(GetConnectionString(true)); MySqlConnection c2 = new MySqlConnection(GetConnectionString(true)); - MySqlCommand cmd1 = new MySqlCommand("INSERT INTO test VALUES ('a', 'name', 'name2')", c1); - MySqlCommand cmd2 = new MySqlCommand("INSERT INTO test VALUES ('b', 'name', 'name2')", c1); + MySqlCommand cmd1 = new MySqlCommand("INSERT INTO Test VALUES ('a', 'name', 'name2')", c1); + MySqlCommand cmd2 = new MySqlCommand("INSERT INTO Test VALUES ('b', 'name', 'name2')", c1); try { @@ -105,7 +105,7 @@ ts.Complete(); } - cmd1.CommandText = "SELECT COUNT(*) FROM test"; + cmd1.CommandText = "SELECT COUNT(*) FROM Test"; object count = cmd1.ExecuteScalar(); Assert.AreEqual(commit ? 2 : 0, count); } @@ -142,20 +142,20 @@ [Test] public void RollingBackOnClose() { - execSQL("DROP TABLE IF EXISTS test"); - execSQL("CREATE TABLE test (id INT) TYPE=InnoDB"); + execSQL("DROP TABLE IF EXISTS Test"); + execSQL("CREATE TABLE Test (id INT) TYPE=InnoDB"); string connStr = GetConnectionString(true) + ";pooling=true;"; MySqlConnection c = new MySqlConnection(connStr); c.Open(); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES (1)", c); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (1)", c); MySqlTransaction tx = c.BeginTransaction(); cmd.ExecuteNonQuery(); c.Close(); MySqlConnection c2 = new MySqlConnection(connStr); c2.Open(); - MySqlCommand cmd2 = new MySqlCommand("SELECT COUNT(*) from test", c2); + MySqlCommand cmd2 = new MySqlCommand("SELECT COUNT(*) from Test", c2); MySqlTransaction tx2 = c2.BeginTransaction(); object count = cmd2.ExecuteScalar(); c2.Close(); @@ -264,10 +264,10 @@ MySqlConnection c = new MySqlConnection(connStr); c.Open(); - MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES ('a', 'name', 'name2')", c); + MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES ('a', 'name', 'name2')", c); cmd.ExecuteNonQuery(); } - MySqlCommand cmd2 = new MySqlCommand("SELECT COUNT(*) FROM test", conn); + MySqlCommand cmd2 = new MySqlCommand("SELECT COUNT(*) FROM Test", conn); Assert.AreEqual(1, cmd2.ExecuteScalar()); } @@ -281,7 +281,7 @@ { c1.Open(); c1.EnlistTransaction(Transaction.Current); - MySqlCommand cmd1 = new MySqlCommand("INSERT INTO test (key2) VALUES ('a')", c1); + MySqlCommand cmd1 = new MySqlCommand("INSERT INTO Test (key2) VALUES ('a')", c1); cmd1.ExecuteNonQuery(); } @@ -289,7 +289,7 @@ { c2.Open(); c2.EnlistTransaction(Transaction.Current); - MySqlCommand cmd2 = new MySqlCommand("INSERT INTO test (key2) VALUES ('b')", c2); + MySqlCommand cmd2 = new MySqlCommand("INSERT INTO Test (key2) VALUES ('b')", c2); cmd2.ExecuteNonQuery(); } if (complete) @@ -358,7 +358,7 @@ private void ReusingSameConnection(bool pooling, bool complete) { - execSQL("TRUNCATE TABLE test"); + execSQL("TRUNCATE TABLE Test"); using (TransactionScope ts = new TransactionScope(TransactionScopeOption.RequiresNew, TimeSpan.MaxValue)) { string connStr = GetConnectionStringBasic(true); @@ -368,14 +368,14 @@ using (MySqlConnection c1 = new MySqlConnection(connStr)) { c1.Open(); - MySqlCommand cmd1 = new MySqlCommand("INSERT INTO test (key2) VALUES ('a')", c1); + MySqlCommand cmd1 = new MySqlCommand("INSERT INTO Test (key2) VALUES ('a')", c1); cmd1.ExecuteNonQuery(); } using (MySqlConnection c2 = new MySqlConnection(connStr)) { c2.Open(); - MySqlCommand cmd2 = new MySqlCommand("INSERT INTO test (key2) VALUES ('b')", c2); + MySqlCommand cmd2 = new MySqlCommand("INSERT INTO Test (key2) VALUES ('b')", c2); cmd2.ExecuteNonQuery(); } @@ -390,7 +390,7 @@ } } - MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", conn); + MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn); DataTable dt = new DataTable(); da.Fill(dt); if (complete)
| Thread | ||
|---|---|---|
| • Connector/NET commit: r963 - branches/5.1/TestSuite/Source | rburnett | 22 Aug |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.928 sec. using MySQL 5.1.14-beta-log