yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks

Browse Source
This commit is contained in:
Sebastiaan Janssen
2016-11-25 22:18:35 +01:00
parent 47c8e6854e
commit ee3a4614c3
78 changed files with 2143 additions and 1684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
src/umbraco.editorControls/KeyValuePrevalueEditor.cs
View File

@@ -14,72 +14,77 @@ using System.Web.UI.HtmlControls;
[assembly: System.Web.UI.WebResource("umbraco.editorControls.KeyValuePrevalueEditor.css", "text/css")]
namespace umbraco.editorControls
{
/// <summary>
/// Summary description for KeyValuePrevalueEditor.
/// </summary>
/// <summary>
/// Summary description for KeyValuePrevalueEditor.
/// </summary>
[ClientDependency(ClientDependencyType.Javascript, "Jeditable/jquery.jeditable.js", "UmbracoClient")]
[Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
public class KeyValuePrevalueEditor : System.Web.UI.WebControls.PlaceHolder, interfaces.IDataPrevalue
{
// UI controls
public System.Web.UI.WebControls.DropDownList _dropdownlist;
public TextBox _textbox;
{
// UI controls
public System.Web.UI.WebControls.DropDownList _dropdownlist;
public TextBox _textbox;
private TextBox _tbhidden;
public umbraco.uicontrols.PropertyPanel pp1 = new umbraco.uicontrols.PropertyPanel();
public umbraco.uicontrols.PropertyPanel pp2 = new umbraco.uicontrols.PropertyPanel();
private Hashtable DeleteButtons = new Hashtable();
// referenced datatype
private cms.businesslogic.datatype.BaseDataType _datatype;
private Hashtable DeleteButtons = new Hashtable();
// referenced datatype
private cms.businesslogic.datatype.BaseDataType _datatype;
/// <summary>
/// Unused, please do not use
/// </summary>
[Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
}
public KeyValuePrevalueEditor(cms.businesslogic.datatype.BaseDataType DataType)
{
// state it knows its datatypedefinitionid
_datatype = DataType;
public KeyValuePrevalueEditor(cms.businesslogic.datatype.BaseDataType DataType)
{
// state it knows its datatypedefinitionid
_datatype = DataType;
setupChildControls();
// Bootstrap delete.
if (System.Web.HttpContext.Current.Request["delete"] != null) {
DeletePrevalue(int.Parse(System.Web.HttpContext.Current.Request["delete"]));
}
}
private void DeletePrevalue(int id) {
SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where id = " + id);
}
DeletePrevalue(int.Parse(System.Web.HttpContext.Current.Request["delete"]));
}
private void setupChildControls()
{
_dropdownlist = new DropDownList();
_dropdownlist.ID = "dbtype";
_textbox = new TextBox();
_textbox.ID = "AddValue";
}
private void DeletePrevalue(int id) {
using (var sqlHelper = Application.SqlHelper)
sqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where id = " + id);
}
private void setupChildControls()
{
_dropdownlist = new DropDownList();
_dropdownlist.ID = "dbtype";
_textbox = new TextBox();
_textbox.ID = "AddValue";
_tbhidden = new TextBox();
_tbhidden.Attributes.Add("style", "display:none;");
_tbhidden.CssClass = "valuesHiddenInput";
// put the childcontrols in context - ensuring that
// the viewstate is persisted etc.
this.Controls.Add(_dropdownlist);
this.Controls.Add(_textbox);
// put the childcontrols in context - ensuring that
// the viewstate is persisted etc.
this.Controls.Add(_dropdownlist);
this.Controls.Add(_textbox);
this.Controls.Add(_tbhidden);
_dropdownlist.Items.Add(DBTypes.Date.ToString());
_dropdownlist.Items.Add(DBTypes.Integer.ToString());
_dropdownlist.Items.Add(DBTypes.Ntext.ToString());
_dropdownlist.Items.Add(DBTypes.Nvarchar.ToString());
_dropdownlist.Items.Add(DBTypes.Date.ToString());
_dropdownlist.Items.Add(DBTypes.Integer.ToString());
_dropdownlist.Items.Add(DBTypes.Ntext.ToString());
_dropdownlist.Items.Add(DBTypes.Nvarchar.ToString());
}
protected override void OnInit(EventArgs e) {
@@ -103,26 +108,26 @@ namespace umbraco.editorControls
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad (e);
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
if (!Page.IsPostBack)
{
_dropdownlist.SelectedValue = _datatype.DBType.ToString();
{
_dropdownlist.SelectedValue = _datatype.DBType.ToString();
}
}
}
public Control Editor
{
get
{
return this;
}
}
}
public Control Editor
{
get
{
return this;
}
}
public void Save()
{
@@ -141,13 +146,14 @@ namespace umbraco.editorControls
if (row.Split('|').Length == 2 && int.TryParse(row.Split('|')[0], out id) && row.Split('|')[1].Length > 0)
{
IParameter[] SqlParams = new IParameter[] {
SqlHelper.CreateParameter("@value",row.Split('|')[1]),
SqlHelper.CreateParameter("@sortorder",so),
SqlHelper.CreateParameter("@id",id)};
SqlHelper.ExecuteNonQuery("update cmsDataTypePreValues set [value] = @value, sortorder = @sortorder where id = @id", SqlParams);
using (var sqlHelper = Application.SqlHelper)
{
IParameter[] SqlParams = new IParameter[] {
sqlHelper.CreateParameter("@value",row.Split('|')[1]),
sqlHelper.CreateParameter("@sortorder",so),
sqlHelper.CreateParameter("@id",id)};
sqlHelper.ExecuteNonQuery("update cmsDataTypePreValues set [value] = @value, sortorder = @sortorder where id = @id", SqlParams);
}
}
so++;
@@ -165,25 +171,29 @@ namespace umbraco.editorControls
try
{
so = SqlHelper.ExecuteScalar<int>("select max(sortorder) from cmsDataTypePreValues where datatypenodeid = @dtdefid",
SqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId));
using (var sqlHelper = Application.SqlHelper)
so = sqlHelper.ExecuteScalar<int>("select max(sortorder) from cmsDataTypePreValues where datatypenodeid = @dtdefid",
sqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId));
so++;
}
catch { }
IParameter[] SqlParams = new IParameter[] {
SqlHelper.CreateParameter("@value",_textbox.Text),
SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId),
SqlHelper.CreateParameter("@so",so)};
SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,@so,'')",SqlParams);
using (var sqlHelper = Application.SqlHelper)
{
IParameter[] SqlParams = new IParameter[] {
sqlHelper.CreateParameter("@value",_textbox.Text),
sqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId),
sqlHelper.CreateParameter("@so",so)};
sqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,@so,'')", SqlParams);
}
_textbox.Text = "";
ScriptManager.GetCurrent(Page).SetFocus(_textbox);
}
}
protected override void Render(HtmlTextWriter writer)
{
protected override void Render(HtmlTextWriter writer)
{
writer.Write("<div class='propertyItem'><div class='propertyItemheader'>" + ui.Text("dataBaseDatatype") + "</div>");
_dropdownlist.RenderControl(writer);
writer.Write("<br style='clear: both'/></div>");
@@ -206,24 +216,25 @@ namespace umbraco.editorControls
_tbhidden.RenderControl(writer);
}
public SortedList Prevalues {
get
public SortedList Prevalues {
get
{
SortedList retval = new SortedList();
IRecordsReader dr = SqlHelper.ExecuteReader(
"Select id, [value] from cmsDataTypePreValues where DataTypeNodeId = "
+ _datatype.DataTypeDefinitionId + " order by sortorder");
while (dr.Read())
retval.Add(dr.GetInt("id"), dr.GetString("value"));
dr.Close();
return retval;
}
}
using (var sqlHelper = Application.SqlHelper)
using (IRecordsReader dr = sqlHelper.ExecuteReader(
"Select id, [value] from cmsDataTypePreValues where DataTypeNodeId = "
+ _datatype.DataTypeDefinitionId + " order by sortorder"))
{
while (dr.Read())
retval.Add(dr.GetInt("id"), dr.GetString("value"));
return retval;
}
}
}
public List<KeyValuePair<int, String>> PrevaluesAsKeyValuePairList
{
@@ -232,15 +243,18 @@ namespace umbraco.editorControls
List<KeyValuePair<int, String>> items = new List<KeyValuePair<int, String>>();
IRecordsReader dr = SqlHelper.ExecuteReader(
"Select id, [value] from cmsDataTypePreValues where DataTypeNodeId = "
+ _datatype.DataTypeDefinitionId + " order by sortorder");
while (dr.Read())
items.Add(new KeyValuePair<int, string>(dr.GetInt("id"), dr.GetString("value")));
dr.Close();
using (var sqlHelper = Application.SqlHelper)
{
using (IRecordsReader dr = sqlHelper.ExecuteReader(
"Select id, [value] from cmsDataTypePreValues where DataTypeNodeId = "
+ _datatype.DataTypeDefinitionId + " order by sortorder"))
{
while (dr.Read())
items.Add(new KeyValuePair<int, string>(dr.GetInt("id"), dr.GetString("value")));
}
}
return items;
}
}
}
}
}