From ebfb05758389a6cc2e535cee4cf723a1fd3c763f Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Fri, 28 Sep 2007 11:11:36 +0000
Subject: negative code checkin. All these functions are in the base class
which we get for free now.
---
.../Framework/Data.SQLite/SQLiteInventoryStore.cs | 163 +--------------------
1 file changed, 1 insertion(+), 162 deletions(-)
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
index 4639e09..ba6038c 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
@@ -15,7 +15,7 @@ using Mono.Data.SqliteClient;
namespace OpenSim.Framework.Data.SQLite
{
- public class SQLiteInventoryStore : IInventoryData
+ public class SQLiteInventoryStore : SQLiteBase, IInventoryData
{
private const string invItemsSelect = "select * from inventoryitems";
private const string invFoldersSelect = "select * from inventoryfolders";
@@ -441,128 +441,6 @@ namespace OpenSim.Framework.Data.SQLite
/***********************************************************************
*
- * SQL Statement Creation Functions
- *
- * These functions create SQL statements for update, insert, and create.
- * They can probably be factored later to have a db independant
- * portion and a db specific portion
- *
- **********************************************************************/
-
- private SqliteCommand createInsertCommand(string table, DataTable dt)
- {
- /**
- * This is subtle enough to deserve some commentary.
- * Instead of doing *lots* and *lots of hardcoded strings
- * for database definitions we'll use the fact that
- * realistically all insert statements look like "insert
- * into A(b, c) values(:b, :c) on the parameterized query
- * front. If we just have a list of b, c, etc... we can
- * generate these strings instead of typing them out.
- */
- string[] cols = new string[dt.Columns.Count];
- for (int i = 0; i < dt.Columns.Count; i++) {
- DataColumn col = dt.Columns[i];
- cols[i] = col.ColumnName;
- }
-
- string sql = "insert into " + table + "(";
- sql += String.Join(", ", cols);
- // important, the first ':' needs to be here, the rest get added in the join
- sql += ") values (:";
- sql += String.Join(", :", cols);
- sql += ")";
- SqliteCommand cmd = new SqliteCommand(sql);
-
- // this provides the binding for all our parameters, so
- // much less code than it used to be
- foreach (DataColumn col in dt.Columns)
- {
- cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
- }
- return cmd;
- }
-
- private SqliteCommand createUpdateCommand(string table, string pk, DataTable dt)
- {
- string sql = "update " + table + " set ";
- string subsql = "";
- foreach (DataColumn col in dt.Columns)
- {
- if (subsql.Length > 0)
- { // a map function would rock so much here
- subsql += ", ";
- }
- subsql += col.ColumnName + "= :" + col.ColumnName;
- }
- sql += subsql;
- sql += " where " + pk;
- SqliteCommand cmd = new SqliteCommand(sql);
-
- // this provides the binding for all our parameters, so
- // much less code than it used to be
-
- foreach (DataColumn col in dt.Columns)
- {
- cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
- }
- return cmd;
- }
-
-
- private string defineTable(DataTable dt)
- {
- string sql = "create table " + dt.TableName + "(";
- string subsql = "";
- foreach (DataColumn col in dt.Columns)
- {
- if (subsql.Length > 0)
- { // a map function would rock so much here
- subsql += ",\n";
- }
- subsql += col.ColumnName + " " + sqliteType(col.DataType);
- if(col == dt.PrimaryKey[0])
- {
- subsql += " primary key";
- }
- }
- sql += subsql;
- sql += ")";
- return sql;
- }
-
- /***********************************************************************
- *
- * Database Binding functions
- *
- * These will be db specific due to typing, and minor differences
- * in databases.
- *
- **********************************************************************/
-
- ///<summary>
- /// This is a convenience function that collapses 5 repetitive
- /// lines for defining SqliteParameters to 2 parameters:
- /// column name and database type.
- ///
- /// It assumes certain conventions like :param as the param
- /// name to replace in parametrized queries, and that source
- /// version is always current version, both of which are fine
- /// for us.
- ///</summary>
- ///<returns>a built sqlite parameter</returns>
- private SqliteParameter createSqliteParameter(string name, System.Type type)
- {
- SqliteParameter param = new SqliteParameter();
- param.ParameterName = ":" + name;
- param.DbType = dbtypeFromType(type);
- param.SourceColumn = name;
- param.SourceVersion = DataRowVersion.Current;
- return param;
- }
-
- /***********************************************************************
- *
* Test and Initialization code
*
**********************************************************************/
@@ -612,45 +490,6 @@ namespace OpenSim.Framework.Data.SQLite
}
return true;
}
-
-
- /***********************************************************************
- *
- * Type conversion functions
- *
- **********************************************************************/
-
- private DbType dbtypeFromType(Type type)
- {
- if (type == typeof(System.String)) {
- return DbType.String;
- } else if (type == typeof(System.Int32)) {
- return DbType.Int32;
- } else if (type == typeof(System.Double)) {
- return DbType.Double;
- } else if (type == typeof(System.Byte[])) {
- return DbType.Binary;
- } else {
- return DbType.String;
- }
- }
-
- // this is something we'll need to implement for each db
- // slightly differently.
- private string sqliteType(Type type)
- {
- if (type == typeof(System.String)) {
- return "varchar(255)";
- } else if (type == typeof(System.Int32)) {
- return "integer";
- } else if (type == typeof(System.Double)) {
- return "float";
- } else if (type == typeof(System.Byte[])) {
- return "blob";
- } else {
- return "string";
- }
- }
}
}
--
cgit v1.1