From 25a49ac4de056f43d6c5803fcd34804fcea96ae2 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Wed, 30 Apr 2008 23:11:07 +0000 Subject: * Spring cleaned a bunch of '//TODO: unused' marked functions. --- OpenSim/Data/MSSQL/MSSQLDataStore.cs | 8 ----- OpenSim/Data/MySQL/MySQLDataStore.cs | 42 ---------------------- OpenSim/Data/SQLite/SQLiteManager.cs | 69 ------------------------------------ 3 files changed, 119 deletions(-) (limited to 'OpenSim/Data') diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs index 6b3b8ef..dd3d20e 100644 --- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs @@ -1350,14 +1350,6 @@ namespace OpenSim.Data.MSSQL return param; } -// TODO: unused -// private SqlParameter createParamWithValue(string name, Type type, Object o) -// { -// SqlParameter param = createSqlParameter(name, type); -// param.Value = o; -// return param; -// } - private void setupPrimCommands(SqlDataAdapter da, SqlConnection conn) { da.InsertCommand = createInsertCommand("prims", m_dataSet.Tables["prims"]); diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index d438064..1f9ea70 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs @@ -586,40 +586,6 @@ namespace OpenSim.Data.MySQL return landDataForRegion; } -// TODO: unused -// private void DisplayDataSet(DataSet ds, string title) -// { -// Debug.WriteLine(title); -// //--- Loop through the DataTables -// foreach (DataTable table in ds.Tables) -// { -// Debug.WriteLine("*** DataTable: " + table.TableName + "***"); -// //--- Loop through each DataTable's DataRows -// foreach (DataRow row in table.Rows) -// { -// //--- Display the original values, if there are any. -// if (row.HasVersion(DataRowVersion.Original)) -// { -// Debug.Write("Original Row Values ===> "); -// foreach (DataColumn column in table.Columns) -// Debug.Write(column.ColumnName + " = " + -// row[column, DataRowVersion.Original] + ", "); -// Debug.WriteLine(String.Empty); -// } -// //--- Display the current values, if there are any. -// if (row.HasVersion(DataRowVersion.Current)) -// { -// Debug.Write("Current Row Values ====> "); -// foreach (DataColumn column in table.Columns) -// Debug.Write(column.ColumnName + " = " + -// row[column, DataRowVersion.Current] + ", "); -// Debug.WriteLine(String.Empty); -// } -// Debug.WriteLine(String.Empty); -// } -// } -// } - public void Commit() { if (m_connection.State != ConnectionState.Open) @@ -1515,14 +1481,6 @@ namespace OpenSim.Data.MySQL return param; } -// TODO: unused -// private MySqlParameter createParamWithValue(string name, Type type, Object o) -// { -// MySqlParameter param = createMySqlParameter(name, type); -// param.Value = o; -// return param; -// } - private void SetupPrimCommands(MySqlDataAdapter da, MySqlConnection conn) { MySqlCommand insertCommand = createInsertCommand("prims", m_primTable); diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs index 66ce6ab..e1d2cdf 100644 --- a/OpenSim/Data/SQLite/SQLiteManager.cs +++ b/OpenSim/Data/SQLite/SQLiteManager.cs @@ -92,75 +92,6 @@ namespace OpenSim.Data.SQLite return (IDbCommand) dbcommand; } -// TODO: unused -// private bool TestTables(SQLiteConnection conn) -// { -// SQLiteCommand cmd = new SQLiteCommand("SELECT * FROM regions", conn); -// SQLiteDataAdapter pDa = new SQLiteDataAdapter(cmd); -// DataSet tmpDS = new DataSet(); -// try -// { -// pDa.Fill(tmpDS, "regions"); -// } -// catch (SqliteSyntaxException) -// { -// m_log.Info("[DATASTORE]: SQLite Database doesn't exist... creating"); -// InitDB(conn); -// } -// return true; -// } - -// TODO: unused -// private DataTable createRegionsTable() -// { -// DataTable regions = new DataTable("regions"); - -// createCol(regions, "regionHandle", typeof (ulong)); -// createCol(regions, "regionName", typeof (String)); -// createCol(regions, "uuid", typeof (String)); - -// createCol(regions, "regionRecvKey", typeof (String)); -// createCol(regions, "regionSecret", typeof (String)); -// createCol(regions, "regionSendKey", typeof (String)); - -// createCol(regions, "regionDataURI", typeof (String)); -// createCol(regions, "serverIP", typeof (String)); -// createCol(regions, "serverPort", typeof (String)); -// createCol(regions, "serverURI", typeof (String)); - - -// createCol(regions, "locX", typeof (uint)); -// createCol(regions, "locY", typeof (uint)); -// createCol(regions, "locZ", typeof (uint)); - -// createCol(regions, "eastOverrideHandle", typeof (ulong)); -// createCol(regions, "westOverrideHandle", typeof (ulong)); -// createCol(regions, "southOverrideHandle", typeof (ulong)); -// createCol(regions, "northOverrideHandle", typeof (ulong)); - -// createCol(regions, "regionAssetURI", typeof (String)); -// createCol(regions, "regionAssetRecvKey", typeof (String)); -// createCol(regions, "regionAssetSendKey", typeof (String)); - -// createCol(regions, "regionUserURI", typeof (String)); -// createCol(regions, "regionUserRecvKey", typeof (String)); -// createCol(regions, "regionUserSendKey", typeof (String)); - -// // Add in contraints -// regions.PrimaryKey = new DataColumn[] {regions.Columns["UUID"]}; -// return regions; -// } - -// TODO: unused -// private void InitDB(SQLiteConnection conn) -// { -// string createUsers = defineTable(createRegionsTable()); -// SQLiteCommand pcmd = new SQLiteCommand(createUsers, conn); -// conn.Open(); -// pcmd.ExecuteNonQuery(); -// conn.Close(); -// } - /// /// Reads a region row from a database reader /// -- cgit v1.1