| List: | Commits | « Previous MessageNext Message » | |
| From: | rburnett | Date: | March 2 2007 8:10pm |
| Subject: | Connector/NET commit: r625 - in branches/5.0: Driver/Source TestSuite | ||
| View as plain text | |||
Modified: branches/5.0/Driver/Source/SchemaProvider.cs branches/5.0/Driver/Source/command.cs branches/5.0/Driver/Source/parameter_collection.cs branches/5.0/TestSuite/DataAdapterTests.cs branches/5.0/TestSuite/Syntax.cs Log: parameter_collection.cs - Fixed GetParameter method to allow query for parameters with or without leading marker. command.cs - Disabled command timeout when in debug mode. SchemaProvider.cs - Reworked how tables are enumerated to account for the fact that SHOW TABLE STATUS returns some char columns as binary TestSuite/DataAdapterTests.cs - whitespace removal TestSuite/Syntax.cs whitespace removal Modified: branches/5.0/Driver/Source/SchemaProvider.cs =================================================================== --- branches/5.0/Driver/Source/SchemaProvider.cs 2007-03-01 21:03:34 UTC (rev 624) +++ branches/5.0/Driver/Source/SchemaProvider.cs 2007-03-02 19:10:40 UTC (rev 625) @@ -116,35 +116,7 @@ foreach (DataRow db in databases.Rows) { dbRestriction[1] = db["SCHEMA_NAME"].ToString(); - string table_type = dbRestriction[1].ToLower() == "information_schema" ? - "SYSTEM VIEW" : "BASE TABLE"; - DataTable tables = FindTables(dbRestriction); - foreach (DataRow table in tables.Rows) - { - DataRow row = dt.NewRow(); - row["TABLE_CATALOG"] = null; - row["TABLE_SCHEMA"] = dbRestriction[1]; - row["TABLE_NAME"] = table[0]; - row["TABLE_TYPE"] = table_type; - row["ENGINE"] = table[1]; - row["VERSION"] = table[2]; - row["ROW_FORMAT"] = table[3]; - row["TABLE_ROWS"] = table[4]; - row["AVG_ROW_LENGTH"] = table[5]; - row["DATA_LENGTH"] = table[6]; - row["MAX_DATA_LENGTH"] = table[7]; - row["INDEX_LENGTH"] = table[8]; - row["DATA_FREE"] = table[9]; - row["AUTO_INCREMENT"] = table[10]; - row["CREATE_TIME"] = table[11]; - row["UPDATE_TIME"] = table[12]; - row["CHECK_TIME"] = table[13]; - row["TABLE_COLLATION"] = table[14]; - row["CHECKSUM"] = table[15]; - row["CREATE_OPTIONS"] = table[16]; - row["TABLE_COMMENT"] = table[17]; - dt.Rows.Add(row); - } + FindTables(dt, dbRestriction); } return dt; } @@ -722,27 +694,50 @@ } } - private DataTable FindTables(string[] restrictions) + private void FindTables(DataTable schemaTable, string[] restrictions) { - string[] dbres = new string[1]; - if (restrictions != null && restrictions.Length >= 2) - dbres[0] = restrictions[1]; - DataTable databases = GetDatabases(dbres); + StringBuilder sql = new StringBuilder(); + StringBuilder where = new StringBuilder(); + sql.AppendFormat("SHOW TABLE STATUS FROM `{0}`", + restrictions[1]); + if (restrictions != null && restrictions.Length >= 3 && + restrictions[2] != null) + where.AppendFormat(" LIKE '{0}'", restrictions[2]); + sql.Append(where.ToString()); - DataTable tables = new DataTable(); - foreach (DataRow db in databases.Rows) + string table_type = restrictions[1].ToLower() == "information_schema" ? + "SYSTEM VIEW" : "BASE TABLE"; + + MySqlCommand cmd = new MySqlCommand(sql.ToString(), connection); + using (MySqlDataReader reader = cmd.ExecuteReader()) { - StringBuilder sql = new StringBuilder(); - StringBuilder where = new StringBuilder(); - sql.AppendFormat("SHOW TABLE STATUS FROM `{0}`", db["SCHEMA_NAME"]); - if (restrictions != null && restrictions.Length >= 3 && - restrictions[2] != null) - where.AppendFormat(" LIKE '{0}'", restrictions[2]); - sql.Append(where.ToString()); - MySqlDataAdapter da = new MySqlDataAdapter(sql.ToString(), connection); - da.Fill(tables); + while (reader.Read()) + { + DataRow row = schemaTable.NewRow(); + row["TABLE_CATALOG"] = null; + row["TABLE_SCHEMA"] = restrictions[1]; + row["TABLE_NAME"] = reader.GetString(0); + row["TABLE_TYPE"] = table_type; + row["ENGINE"] = reader.GetString(1); + row["VERSION"] = reader.GetString(2); + row["ROW_FORMAT"] = reader.GetString(3); + row["TABLE_ROWS"] = reader.GetInt64(4); + row["AVG_ROW_LENGTH"] = reader.GetInt64(5); + row["DATA_LENGTH"] = reader.GetInt64(6); + row["MAX_DATA_LENGTH"] = reader.GetInt64(7); + row["INDEX_LENGTH"] = reader.GetInt64(8); + row["DATA_FREE"] = reader.GetInt64(9); + row["AUTO_INCREMENT"] = reader.GetInt64(10); + row["CREATE_TIME"] = reader.GetDateTime(11); + row["UPDATE_TIME"] = reader.GetDateTime(12); + row["CHECK_TIME"] = reader.GetDateTime(13); + row["TABLE_COLLATION"] = reader.GetString(14); + row["CHECKSUM"] = reader.GetInt64(15); + row["CREATE_OPTIONS"] = reader.GetString(16); + row["TABLE_COMMENT"] = reader.GetString(17); + schemaTable.Rows.Add(row); + } } - return tables; } protected virtual DataTable GetSchemaInternal(string collection, string[] restrictions) Modified: branches/5.0/Driver/Source/command.cs =================================================================== --- branches/5.0/Driver/Source/command.cs 2007-03-01 21:03:34 UTC (rev 624) +++ branches/5.0/Driver/Source/command.cs 2007-03-02 19:10:40 UTC (rev 625) @@ -373,6 +373,7 @@ timedOut = false; Timer t = null; querySent.Reset(); +#if !DEBUG if (connection.driver.Version.isAtLeast(5, 0, 0) && commandTimeout > 0) { @@ -380,6 +381,7 @@ new TimerCallback(TimeoutExpired); t = new Timer(timerDelegate, this, this.CommandTimeout * 1000, Timeout.Infinite); } +#endif // execute the statement statement.Execute(); Modified: branches/5.0/Driver/Source/parameter_collection.cs =================================================================== --- branches/5.0/Driver/Source/parameter_collection.cs 2007-03-01 21:03:34 UTC (rev 624) +++ branches/5.0/Driver/Source/parameter_collection.cs 2007-03-02 19:10:40 UTC (rev 625) @@ -222,9 +222,7 @@ string newParameterName = parameterName.Substring(1); index = IndexOf(newParameterName); if (index != -1) - throw new ArgumentException( - String.Format(Resources.WrongParameterName, parameterName, - newParameterName)); + return (DbParameter)items[index]; } throw new ArgumentException("Parameter '" + parameterName + "' not found in the collection."); } Modified: branches/5.0/TestSuite/DataAdapterTests.cs =================================================================== --- branches/5.0/TestSuite/DataAdapterTests.cs 2007-03-01 21:03:34 UTC (rev 624) +++ branches/5.0/TestSuite/DataAdapterTests.cs 2007-03-02 19:10:40 UTC (rev 625) @@ -304,16 +304,16 @@ MySqlCommandBuilder cb = new MySqlCommandBuilder(da); cb.ToString(); // keep the compiler happy DataTable dt = new DataTable(); - da.Fill( dt ); + da.Fill(dt); - Assert.AreEqual( String.Empty, dt.Rows[0]["name"] ); + Assert.AreEqual(String.Empty, dt.Rows[0]["name"]); dt.Rows[0]["name"] = "Test"; - da.Update( dt ); + da.Update(dt); dt.Clear(); da.Fill(dt); - Assert.AreEqual( "Test", dt.Rows[0]["name"] ); + Assert.AreEqual("Test", dt.Rows[0]["name"]); } [Test] Modified: branches/5.0/TestSuite/Syntax.cs =================================================================== --- branches/5.0/TestSuite/Syntax.cs 2007-03-01 21:03:34 UTC (rev 624) +++ branches/5.0/TestSuite/Syntax.cs 2007-03-02 19:10:40 UTC (rev 625) @@ -237,7 +237,7 @@ MySqlDataAdapter da = new MySqlDataAdapter("SELECT CHAR(id) FROM Test GROUP BY val1,val2", conn); DataTable dt = new DataTable(); da.Fill(dt); - Assert.AreEqual( "A", dt.Rows[0][0] ); + Assert.AreEqual("A", dt.Rows[0][0]); } [Test]
| Thread | ||
|---|---|---|
| • Connector/NET commit: r625 - in branches/5.0: Driver/Source TestSuite | rburnett | 2 Mar |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.099 sec. using MySQL 5.1.14-beta-log