diff --git a/Duplicati/Scheduler/Monitor.SQL/SQLHistoryDataSet.Designer.cs b/Duplicati/Scheduler/Monitor.SQL/SQLHistoryDataSet.Designer.cs index 1c4850bc6..150539458 100644 --- a/Duplicati/Scheduler/Monitor.SQL/SQLHistoryDataSet.Designer.cs +++ b/Duplicati/Scheduler/Monitor.SQL/SQLHistoryDataSet.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4961 +// Runtime Version:4.0.30319.235 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -10,13 +10,12 @@ #pragma warning disable 1591 -namespace Duplicati.Scheduler.Monitor.SQL { +namespace Duplicati.Scheduler.Monitor.SQL { /// ///Represents a strongly typed in-memory cache of data. /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] [global::System.Serializable()] [global::System.ComponentModel.DesignerCategoryAttribute("code")] [global::System.ComponentModel.ToolboxItem(true)] @@ -30,6 +29,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public SQLHistoryDataSet() { this.BeginInit(); this.InitClass(); @@ -40,6 +40,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected SQLHistoryDataSet(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context, false) { if ((this.IsBinarySerialized(info, context) == true)) { @@ -75,6 +76,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] public HistoryDataTable History { @@ -84,6 +86,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)] public override global::System.Data.SchemaSerializationMode SchemaSerializationMode { @@ -96,6 +99,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] public new global::System.Data.DataTableCollection Tables { get { @@ -104,6 +108,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] public new global::System.Data.DataRelationCollection Relations { get { @@ -112,6 +117,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override void InitializeDerivedDataSet() { this.BeginInit(); this.InitClass(); @@ -119,6 +125,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public override global::System.Data.DataSet Clone() { SQLHistoryDataSet cln = ((SQLHistoryDataSet)(base.Clone())); cln.InitVars(); @@ -127,16 +134,19 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override bool ShouldSerializeTables() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override bool ShouldSerializeRelations() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) { if ((this.DetermineSchemaSerializationMode(reader) == global::System.Data.SchemaSerializationMode.IncludeSchema)) { this.Reset(); @@ -161,6 +171,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override global::System.Xml.Schema.XmlSchema GetSchemaSerializable() { global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(); this.WriteXmlSchema(new global::System.Xml.XmlTextWriter(stream, null)); @@ -169,11 +180,13 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] internal void InitVars() { this.InitVars(true); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] internal void InitVars(bool initTable) { this.tableHistory = ((HistoryDataTable)(base.Tables["History"])); if ((initTable == true)) { @@ -184,6 +197,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitClass() { this.DataSetName = "SQLHistoryDataSet"; this.Prefix = ""; @@ -195,11 +209,13 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private bool ShouldSerializeHistory() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) { this.InitVars(); @@ -207,6 +223,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedDataSetSchema(global::System.Xml.Schema.XmlSchemaSet xs) { SQLHistoryDataSet ds = new SQLHistoryDataSet(); global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); @@ -252,12 +269,12 @@ namespace Duplicati.Scheduler.Monitor.SQL { return type; } + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public delegate void HistoryRowChangeEventHandler(object sender, HistoryRowChangeEvent e); /// ///Represents the strongly named DataTable class. /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] [global::System.Serializable()] [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] public partial class HistoryDataTable : global::System.Data.TypedTableBase { @@ -273,6 +290,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { private global::System.Data.DataColumn columnXmlContent; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public HistoryDataTable() { this.TableName = "History"; this.BeginInit(); @@ -281,6 +299,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] internal HistoryDataTable(global::System.Data.DataTable table) { this.TableName = table.TableName; if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { @@ -297,12 +316,14 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected HistoryDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context) { this.InitVars(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn UserNameColumn { get { return this.columnUserName; @@ -310,6 +331,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn MachineNameColumn { get { return this.columnMachineName; @@ -317,6 +339,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn EntryTypeColumn { get { return this.columnEntryType; @@ -324,6 +347,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn ModificationDateColumn { get { return this.columnModificationDate; @@ -331,6 +355,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn XmlContentColumn { get { return this.columnXmlContent; @@ -338,6 +363,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int Count { get { @@ -346,26 +372,33 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public HistoryRow this[int index] { get { return ((HistoryRow)(this.Rows[index])); } } + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public event HistoryRowChangeEventHandler HistoryRowChanging; + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public event HistoryRowChangeEventHandler HistoryRowChanged; + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public event HistoryRowChangeEventHandler HistoryRowDeleting; + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public event HistoryRowChangeEventHandler HistoryRowDeleted; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public void AddHistoryRow(HistoryRow row) { this.Rows.Add(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public HistoryRow AddHistoryRow(string UserName, string MachineName, string EntryType, System.DateTime ModificationDate, string XmlContent) { HistoryRow rowHistoryRow = ((HistoryRow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -380,6 +413,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public HistoryRow FindByUserNameMachineNameEntryTypeModificationDate(string UserName, string MachineName, string EntryType, System.DateTime ModificationDate) { return ((HistoryRow)(this.Rows.Find(new object[] { UserName, @@ -389,6 +423,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public override global::System.Data.DataTable Clone() { HistoryDataTable cln = ((HistoryDataTable)(base.Clone())); cln.InitVars(); @@ -396,11 +431,13 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override global::System.Data.DataTable CreateInstance() { return new HistoryDataTable(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] internal void InitVars() { this.columnUserName = base.Columns["UserName"]; this.columnMachineName = base.Columns["MachineName"]; @@ -410,6 +447,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitClass() { this.columnUserName = new global::System.Data.DataColumn("UserName", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnUserName); @@ -437,21 +475,25 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public HistoryRow NewHistoryRow() { return ((HistoryRow)(this.NewRow())); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { return new HistoryRow(builder); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override global::System.Type GetRowType() { return typeof(HistoryRow); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanged(e); if ((this.HistoryRowChanged != null)) { @@ -460,6 +502,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanging(e); if ((this.HistoryRowChanging != null)) { @@ -468,6 +511,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleted(e); if ((this.HistoryRowDeleted != null)) { @@ -476,6 +520,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleting(e); if ((this.HistoryRowDeleting != null)) { @@ -484,11 +529,13 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public void RemoveHistoryRow(HistoryRow row) { this.Rows.Remove(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); @@ -554,18 +601,19 @@ namespace Duplicati.Scheduler.Monitor.SQL { /// ///Represents strongly named DataRow class. /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] public partial class HistoryRow : global::System.Data.DataRow { private HistoryDataTable tableHistory; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] internal HistoryRow(global::System.Data.DataRowBuilder rb) : base(rb) { this.tableHistory = ((HistoryDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string UserName { get { return ((string)(this[this.tableHistory.UserNameColumn])); @@ -576,6 +624,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string MachineName { get { return ((string)(this[this.tableHistory.MachineNameColumn])); @@ -586,6 +635,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string EntryType { get { return ((string)(this[this.tableHistory.EntryTypeColumn])); @@ -596,6 +646,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public System.DateTime ModificationDate { get { return ((global::System.DateTime)(this[this.tableHistory.ModificationDateColumn])); @@ -606,6 +657,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string XmlContent { get { try { @@ -621,11 +673,13 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsXmlContentNull() { return this.IsNull(this.tableHistory.XmlContentColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public void SetXmlContentNull() { this[this.tableHistory.XmlContentColumn] = global::System.Convert.DBNull; } @@ -634,7 +688,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { /// ///Row event argument class /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public class HistoryRowChangeEvent : global::System.EventArgs { private HistoryRow eventRow; @@ -642,12 +696,14 @@ namespace Duplicati.Scheduler.Monitor.SQL { private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public HistoryRowChangeEvent(HistoryRow row, global::System.Data.DataRowAction action) { this.eventRow = row; this.eventAction = action; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public HistoryRow Row { get { return this.eventRow; @@ -655,6 +711,7 @@ namespace Duplicati.Scheduler.Monitor.SQL { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataRowAction Action { get { return this.eventAction; @@ -669,12 +726,11 @@ namespace Duplicati.Scheduler.Monitor.SQL.SQLHistoryDataSetTableAdapters { /// ///Represents the connection and commands used to retrieve and save data. /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] [global::System.ComponentModel.DesignerCategoryAttribute("code")] [global::System.ComponentModel.ToolboxItem(true)] [global::System.ComponentModel.DataObjectAttribute(true)] [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + - ", Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public partial class HistoryTableAdapter : global::System.ComponentModel.Component { @@ -689,11 +745,13 @@ namespace Duplicati.Scheduler.Monitor.SQL.SQLHistoryDataSetTableAdapters { private bool _clearBeforeFill; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public HistoryTableAdapter() { this.ClearBeforeFill = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { get { if ((this._adapter == null)) { @@ -704,6 +762,7 @@ namespace Duplicati.Scheduler.Monitor.SQL.SQLHistoryDataSetTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] internal global::System.Data.SqlClient.SqlConnection Connection { get { if ((this._connection == null)) { @@ -731,6 +790,7 @@ namespace Duplicati.Scheduler.Monitor.SQL.SQLHistoryDataSetTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] internal global::System.Data.SqlClient.SqlTransaction Transaction { get { return this._transaction; @@ -756,6 +816,7 @@ namespace Duplicati.Scheduler.Monitor.SQL.SQLHistoryDataSetTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { get { if ((this._commandCollection == null)) { @@ -766,6 +827,7 @@ namespace Duplicati.Scheduler.Monitor.SQL.SQLHistoryDataSetTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool ClearBeforeFill { get { return this._clearBeforeFill; @@ -776,6 +838,7 @@ namespace Duplicati.Scheduler.Monitor.SQL.SQLHistoryDataSetTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitAdapter() { this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); @@ -824,12 +887,14 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); this._connection.ConnectionString = global::Duplicati.Scheduler.Monitor.SQL.Properties.Settings.Default.BackupsConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); @@ -858,6 +923,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] public virtual int Fill(SQLHistoryDataSet.HistoryDataTable dataTable) { @@ -870,6 +936,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] public virtual SQLHistoryDataSet.HistoryDataTable GetData() { @@ -880,6 +947,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] public virtual int FillBy(SQLHistoryDataSet.HistoryDataTable dataTable, string aUserName, string aMachineName, string aEntryType, System.DateTime aModificationDate) { @@ -911,6 +979,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual SQLHistoryDataSet.HistoryDataTable GetDataBy(string aUserName, string aMachineName, string aEntryType, System.DateTime aModificationDate) { @@ -940,18 +1009,21 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(SQLHistoryDataSet.HistoryDataTable dataTable) { return this.Adapter.Update(dataTable); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(SQLHistoryDataSet dataSet) { return this.Adapter.Update(dataSet, "History"); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(global::System.Data.DataRow dataRow) { return this.Adapter.Update(new global::System.Data.DataRow[] { @@ -959,12 +1031,14 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(global::System.Data.DataRow[] dataRows) { return this.Adapter.Update(dataRows); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] public virtual int Delete(string Original_UserName, string Original_MachineName, string Original_EntryType, System.DateTime Original_ModificationDate) { @@ -1004,6 +1078,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] public virtual int Insert(string UserName, string MachineName, string EntryType, System.DateTime ModificationDate, object XmlContent) { @@ -1049,6 +1124,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] public virtual int Update(string UserName, string MachineName, string EntryType, System.DateTime ModificationDate, object XmlContent, string Original_UserName, string Original_MachineName, string Original_EntryType, System.DateTime Original_ModificationDate) { @@ -1113,6 +1189,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] public virtual int Update(object XmlContent, string Original_UserName, string Original_MachineName, string Original_EntryType, System.DateTime Original_ModificationDate) { @@ -1120,6 +1197,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual global::System.Nullable LatestQuery(string aUserName, string aMachineName, string aEntryType) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; @@ -1168,11 +1246,10 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] [global::System.ComponentModel.DesignerCategoryAttribute("code")] [global::System.ComponentModel.ToolboxItem(true)] [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerDesigner, Microsoft.VSD" + - "esigner, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + "esigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapterManager")] public partial class TableAdapterManager : global::System.ComponentModel.Component { @@ -1185,6 +1262,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo private global::System.Data.IDbConnection _connection; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public UpdateOrderOption UpdateOrder { get { return this._updateOrder; @@ -1195,9 +1273,10 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + - "ft.VSDesigner, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + - "", "System.Drawing.Design.UITypeEditor")] + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + + "a", "System.Drawing.Design.UITypeEditor")] public HistoryTableAdapter HistoryTableAdapter { get { return this._historyTableAdapter; @@ -1208,6 +1287,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool BackupDataSetBeforeUpdate { get { return this._backupDataSetBeforeUpdate; @@ -1218,6 +1298,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] public global::System.Data.IDbConnection Connection { get { @@ -1236,6 +1317,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int TableAdapterInstanceCount { get { @@ -1251,6 +1333,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo ///Update rows in top-down order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private int UpdateUpdatedRows(SQLHistoryDataSet dataSet, global::System.Collections.Generic.List allChangedRows, global::System.Collections.Generic.List allAddedRows) { int result = 0; if ((this._historyTableAdapter != null)) { @@ -1269,6 +1352,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo ///Insert rows in top-down order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private int UpdateInsertedRows(SQLHistoryDataSet dataSet, global::System.Collections.Generic.List allAddedRows) { int result = 0; if ((this._historyTableAdapter != null)) { @@ -1286,6 +1370,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo ///Delete rows in bottom-up order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private int UpdateDeletedRows(SQLHistoryDataSet dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; if ((this._historyTableAdapter != null)) { @@ -1303,6 +1388,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo ///Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private global::System.Data.DataRow[] GetRealUpdatedRows(global::System.Data.DataRow[] updatedRows, global::System.Collections.Generic.List allAddedRows) { if (((updatedRows == null) || (updatedRows.Length < 1))) { @@ -1326,6 +1412,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo ///Update all changes to the dataset. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public virtual int UpdateAll(SQLHistoryDataSet dataSet) { if ((dataSet == null)) { throw new global::System.ArgumentNullException("dataSet"); @@ -1454,11 +1541,13 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected virtual void SortSelfReferenceRows(global::System.Data.DataRow[] rows, global::System.Data.DataRelation relation, bool childFirst) { global::System.Array.Sort(rows, new SelfReferenceComparer(relation, childFirst)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] protected virtual bool MatchTableAdapterConnection(global::System.Data.IDbConnection inputConnection) { if ((this._connection != null)) { return true; @@ -1476,7 +1565,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo /// ///Update Order Option /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public enum UpdateOrderOption { InsertUpdateDelete = 0, @@ -1487,7 +1576,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo /// ///Used to sort self-referenced table's rows /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private class SelfReferenceComparer : object, global::System.Collections.Generic.IComparer { private global::System.Data.DataRelation _relation; @@ -1495,6 +1584,7 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo private int _childFirst; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] internal SelfReferenceComparer(global::System.Data.DataRelation relation, bool childFirst) { this._relation = relation; if (childFirst) { @@ -1506,32 +1596,46 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - private bool IsChildAndParent(global::System.Data.DataRow child, global::System.Data.DataRow parent) { - global::System.Diagnostics.Debug.Assert((child != null)); - global::System.Diagnostics.Debug.Assert((parent != null)); - global::System.Data.DataRow newParent = child.GetParentRow(this._relation, global::System.Data.DataRowVersion.Default); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private global::System.Data.DataRow GetRoot(global::System.Data.DataRow row, out int distance) { + global::System.Diagnostics.Debug.Assert((row != null)); + global::System.Data.DataRow root = row; + distance = 0; + + global::System.Collections.Generic.IDictionary traversedRows = new global::System.Collections.Generic.Dictionary(); + traversedRows[row] = row; + + global::System.Data.DataRow parent = row.GetParentRow(this._relation, global::System.Data.DataRowVersion.Default); for ( - ; ((newParent != null) - && ((object.ReferenceEquals(newParent, child) == false) - && (object.ReferenceEquals(newParent, parent) == false))); + ; ((parent != null) + && (traversedRows.ContainsKey(parent) == false)); ) { - newParent = newParent.GetParentRow(this._relation, global::System.Data.DataRowVersion.Default); + distance = (distance + 1); + root = parent; + traversedRows[parent] = parent; + parent = parent.GetParentRow(this._relation, global::System.Data.DataRowVersion.Default); } - if ((newParent == null)) { - for (newParent = child.GetParentRow(this._relation, global::System.Data.DataRowVersion.Original); ((newParent != null) - && ((object.ReferenceEquals(newParent, child) == false) - && (object.ReferenceEquals(newParent, parent) == false))); + + if ((distance == 0)) { + traversedRows.Clear(); + traversedRows[row] = row; + parent = row.GetParentRow(this._relation, global::System.Data.DataRowVersion.Original); + for ( + ; ((parent != null) + && (traversedRows.ContainsKey(parent) == false)); ) { - newParent = newParent.GetParentRow(this._relation, global::System.Data.DataRowVersion.Original); + distance = (distance + 1); + root = parent; + traversedRows[parent] = parent; + parent = parent.GetParentRow(this._relation, global::System.Data.DataRowVersion.Original); } } - if (object.ReferenceEquals(newParent, parent)) { - return true; - } - return false; + + return root; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public int Compare(global::System.Data.DataRow row1, global::System.Data.DataRow row2) { if (object.ReferenceEquals(row1, row2)) { return 0; @@ -1543,16 +1647,25 @@ SELECT UserName, MachineName, EntryType, ModificationDate, XmlContent FROM Histo return 1; } - // Is row1 the child or grandchild of row2 - if (this.IsChildAndParent(row1, row2)) { - return this._childFirst; - } + int distance1 = 0; + global::System.Data.DataRow root1 = this.GetRoot(row1, out distance1); - // Is row2 the child or grandchild of row1 - if (this.IsChildAndParent(row2, row1)) { - return (-1 * this._childFirst); + int distance2 = 0; + global::System.Data.DataRow root2 = this.GetRoot(row2, out distance2); + + if (object.ReferenceEquals(root1, root2)) { + return (this._childFirst * distance1.CompareTo(distance2)); + } + else { + global::System.Diagnostics.Debug.Assert(((root1.Table != null) + && (root2.Table != null))); + if ((root1.Table.Rows.IndexOf(root1) < root2.Table.Rows.IndexOf(root2))) { + return -1; + } + else { + return 1; + } } - return 0; } } }