From 99e3a89a3078ebb7abf9417007e227d4f449c792 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 23 Apr 2018 16:03:06 +0200 Subject: [PATCH] MS SQL Connections --- .../DD_DMSLiteDataSet.Designer.vb | 340 +++++++++--------- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc | 2 +- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 139 ++++--- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 2 +- app/DD_PM_WINDREAM/frmConnection.Designer.vb | 31 +- app/DD_PM_WINDREAM/frmConnection.resx | 10 +- app/DD_PM_WINDREAM/frmConnection.vb | 18 +- .../frmFormDesigner.Designer.vb | 7 +- app/DD_PM_WINDREAM/frmFormDesigner.vb | 2 +- app/DD_PM_WINDREAM/frmMain.Designer.vb | 2 +- .../frmProfileDesigner.Designer.vb | 8 +- app/DD_PM_WINDREAM/frmProfileDesigner.vb | 2 +- .../frmSQL_DESIGNER.Designer.vb | 22 +- app/DD_PM_WINDREAM/frmSQL_DESIGNER.resx | 3 - app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb | 6 +- app/DD_PM_WINDREAM/frmValidator.Designer.vb | 8 +- app/DD_PM_WINDREAM/frmValidator.vb | 16 +- 17 files changed, 309 insertions(+), 309 deletions(-) diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index e88812a..f01b184 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -39,7 +39,7 @@ Partial Public Class DD_DMSLiteDataSet Private tableVWPM_CONTROL_INDEX As VWPM_CONTROL_INDEXDataTable - Private tableTBPM_CONNECTION As TBPM_CONNECTIONDataTable + Private tableTBDD_CONNECTION As TBDD_CONNECTIONDataTable Private tableTBPROFILE_USER As TBPROFILE_USERDataTable @@ -117,8 +117,8 @@ Partial Public Class DD_DMSLiteDataSet If (Not (ds.Tables("VWPM_CONTROL_INDEX")) Is Nothing) Then MyBase.Tables.Add(New VWPM_CONTROL_INDEXDataTable(ds.Tables("VWPM_CONTROL_INDEX"))) End If - If (Not (ds.Tables("TBPM_CONNECTION")) Is Nothing) Then - MyBase.Tables.Add(New TBPM_CONNECTIONDataTable(ds.Tables("TBPM_CONNECTION"))) + If (Not (ds.Tables("TBDD_CONNECTION")) Is Nothing) Then + MyBase.Tables.Add(New TBDD_CONNECTIONDataTable(ds.Tables("TBDD_CONNECTION"))) End If If (Not (ds.Tables("TBPROFILE_USER")) Is Nothing) Then MyBase.Tables.Add(New TBPROFILE_USERDataTable(ds.Tables("TBPROFILE_USER"))) @@ -235,9 +235,9 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Browsable(false), _ Global.System.ComponentModel.DesignerSerializationVisibility(Global.System.ComponentModel.DesignerSerializationVisibility.Content)> _ - Public ReadOnly Property TBPM_CONNECTION() As TBPM_CONNECTIONDataTable + Public ReadOnly Property TBDD_CONNECTION() As TBDD_CONNECTIONDataTable Get - Return Me.tableTBPM_CONNECTION + Return Me.tableTBDD_CONNECTION End Get End Property @@ -409,8 +409,8 @@ Partial Public Class DD_DMSLiteDataSet If (Not (ds.Tables("VWPM_CONTROL_INDEX")) Is Nothing) Then MyBase.Tables.Add(New VWPM_CONTROL_INDEXDataTable(ds.Tables("VWPM_CONTROL_INDEX"))) End If - If (Not (ds.Tables("TBPM_CONNECTION")) Is Nothing) Then - MyBase.Tables.Add(New TBPM_CONNECTIONDataTable(ds.Tables("TBPM_CONNECTION"))) + If (Not (ds.Tables("TBDD_CONNECTION")) Is Nothing) Then + MyBase.Tables.Add(New TBDD_CONNECTIONDataTable(ds.Tables("TBDD_CONNECTION"))) End If If (Not (ds.Tables("TBPROFILE_USER")) Is Nothing) Then MyBase.Tables.Add(New TBPROFILE_USERDataTable(ds.Tables("TBPROFILE_USER"))) @@ -510,10 +510,10 @@ Partial Public Class DD_DMSLiteDataSet Me.tableVWPM_CONTROL_INDEX.InitVars End If End If - Me.tableTBPM_CONNECTION = CType(MyBase.Tables("TBPM_CONNECTION"),TBPM_CONNECTIONDataTable) + Me.tableTBDD_CONNECTION = CType(MyBase.Tables("TBDD_CONNECTION"),TBDD_CONNECTIONDataTable) If (initTable = true) Then - If (Not (Me.tableTBPM_CONNECTION) Is Nothing) Then - Me.tableTBPM_CONNECTION.InitVars + If (Not (Me.tableTBDD_CONNECTION) Is Nothing) Then + Me.tableTBDD_CONNECTION.InitVars End If End If Me.tableTBPROFILE_USER = CType(MyBase.Tables("TBPROFILE_USER"),TBPROFILE_USERDataTable) @@ -593,8 +593,8 @@ Partial Public Class DD_DMSLiteDataSet MyBase.Tables.Add(Me.tableTBPM_ERROR_LOG) Me.tableVWPM_CONTROL_INDEX = New VWPM_CONTROL_INDEXDataTable() MyBase.Tables.Add(Me.tableVWPM_CONTROL_INDEX) - Me.tableTBPM_CONNECTION = New TBPM_CONNECTIONDataTable() - MyBase.Tables.Add(Me.tableTBPM_CONNECTION) + Me.tableTBDD_CONNECTION = New TBDD_CONNECTIONDataTable() + MyBase.Tables.Add(Me.tableTBDD_CONNECTION) Me.tableTBPROFILE_USER = New TBPROFILE_USERDataTable() MyBase.Tables.Add(Me.tableTBPROFILE_USER) Me.tableTBPM_PROFILE_FILES = New TBPM_PROFILE_FILESDataTable() @@ -667,7 +667,7 @@ Partial Public Class DD_DMSLiteDataSet _ - Private Function ShouldSerializeTBPM_CONNECTION() As Boolean + Private Function ShouldSerializeTBDD_CONNECTION() As Boolean Return false End Function @@ -799,7 +799,7 @@ Partial Public Class DD_DMSLiteDataSet Public Delegate Sub VWPM_CONTROL_INDEXRowChangeEventHandler(ByVal sender As Object, ByVal e As VWPM_CONTROL_INDEXRowChangeEvent) _ - Public Delegate Sub TBPM_CONNECTIONRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPM_CONNECTIONRowChangeEvent) + Public Delegate Sub TBDD_CONNECTIONRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_CONNECTIONRowChangeEvent) _ Public Delegate Sub TBPROFILE_USERRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPROFILE_USERRowChangeEvent) @@ -3897,8 +3897,8 @@ Partial Public Class DD_DMSLiteDataSet ''' _ - Partial Public Class TBPM_CONNECTIONDataTable - Inherits Global.System.Data.TypedTableBase(Of TBPM_CONNECTIONRow) + Partial Public Class TBDD_CONNECTIONDataTable + Inherits Global.System.Data.TypedTableBase(Of TBDD_CONNECTIONRow) Private columnGUID As Global.System.Data.DataColumn @@ -3930,7 +3930,7 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Public Sub New() MyBase.New - Me.TableName = "TBPM_CONNECTION" + Me.TableName = "TBDD_CONNECTION" Me.BeginInit Me.InitClass Me.EndInit @@ -4076,50 +4076,50 @@ Partial Public Class DD_DMSLiteDataSet _ - Public Default ReadOnly Property Item(ByVal index As Integer) As TBPM_CONNECTIONRow + Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_CONNECTIONRow Get - Return CType(Me.Rows(index),TBPM_CONNECTIONRow) + Return CType(Me.Rows(index),TBDD_CONNECTIONRow) End Get End Property _ - Public Event TBPM_CONNECTIONRowChanging As TBPM_CONNECTIONRowChangeEventHandler + Public Event TBDD_CONNECTIONRowChanging As TBDD_CONNECTIONRowChangeEventHandler _ - Public Event TBPM_CONNECTIONRowChanged As TBPM_CONNECTIONRowChangeEventHandler + Public Event TBDD_CONNECTIONRowChanged As TBDD_CONNECTIONRowChangeEventHandler _ - Public Event TBPM_CONNECTIONRowDeleting As TBPM_CONNECTIONRowChangeEventHandler + Public Event TBDD_CONNECTIONRowDeleting As TBDD_CONNECTIONRowChangeEventHandler _ - Public Event TBPM_CONNECTIONRowDeleted As TBPM_CONNECTIONRowChangeEventHandler + Public Event TBDD_CONNECTIONRowDeleted As TBDD_CONNECTIONRowChangeEventHandler _ - Public Overloads Sub AddTBPM_CONNECTIONRow(ByVal row As TBPM_CONNECTIONRow) + Public Overloads Sub AddTBDD_CONNECTIONRow(ByVal row As TBDD_CONNECTIONRow) Me.Rows.Add(row) End Sub _ - Public Overloads Function AddTBPM_CONNECTIONRow(ByVal BEZEICHNUNG As String, ByVal SQL_PROVIDER As String, ByVal SERVER As String, ByVal DATENBANK As String, ByVal USERNAME As String, ByVal PASSWORD As String, ByVal BEMERKUNG As String, ByVal AKTIV As Boolean, ByVal ERSTELLTWER As String, ByVal ERSTELLTWANN As Date, ByVal GEANDERTWER As String, ByVal GEAENDERTWANN As Date) As TBPM_CONNECTIONRow - Dim rowTBPM_CONNECTIONRow As TBPM_CONNECTIONRow = CType(Me.NewRow,TBPM_CONNECTIONRow) + Public Overloads Function AddTBDD_CONNECTIONRow(ByVal BEZEICHNUNG As String, ByVal SQL_PROVIDER As String, ByVal SERVER As String, ByVal DATENBANK As String, ByVal USERNAME As String, ByVal PASSWORD As String, ByVal BEMERKUNG As String, ByVal AKTIV As Boolean, ByVal ERSTELLTWER As String, ByVal ERSTELLTWANN As Date, ByVal GEANDERTWER As String, ByVal GEAENDERTWANN As Date) As TBDD_CONNECTIONRow + Dim rowTBDD_CONNECTIONRow As TBDD_CONNECTIONRow = CType(Me.NewRow,TBDD_CONNECTIONRow) Dim columnValuesArray() As Object = New Object() {Nothing, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN} - rowTBPM_CONNECTIONRow.ItemArray = columnValuesArray - Me.Rows.Add(rowTBPM_CONNECTIONRow) - Return rowTBPM_CONNECTIONRow + rowTBDD_CONNECTIONRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBDD_CONNECTIONRow) + Return rowTBDD_CONNECTIONRow End Function _ - Public Function FindByGUID(ByVal GUID As Short) As TBPM_CONNECTIONRow - Return CType(Me.Rows.Find(New Object() {GUID}),TBPM_CONNECTIONRow) + Public Function FindByGUID(ByVal GUID As Short) As TBDD_CONNECTIONRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_CONNECTIONRow) End Function _ Public Overrides Function Clone() As Global.System.Data.DataTable - Dim cln As TBPM_CONNECTIONDataTable = CType(MyBase.Clone,TBPM_CONNECTIONDataTable) + Dim cln As TBDD_CONNECTIONDataTable = CType(MyBase.Clone,TBDD_CONNECTIONDataTable) cln.InitVars Return cln End Function @@ -4127,7 +4127,7 @@ Partial Public Class DD_DMSLiteDataSet _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable - Return New TBPM_CONNECTIONDataTable() + Return New TBDD_CONNECTIONDataTable() End Function _ - Public Function NewTBPM_CONNECTIONRow() As TBPM_CONNECTIONRow - Return CType(Me.NewRow,TBPM_CONNECTIONRow) + Public Function NewTBDD_CONNECTIONRow() As TBDD_CONNECTIONRow + Return CType(Me.NewRow,TBDD_CONNECTIONRow) End Function _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow - Return New TBPM_CONNECTIONRow(builder) + Return New TBDD_CONNECTIONRow(builder) End Function _ Protected Overrides Function GetRowType() As Global.System.Type - Return GetType(TBPM_CONNECTIONRow) + Return GetType(TBDD_CONNECTIONRow) End Function _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) - If (Not (Me.TBPM_CONNECTIONRowChangedEvent) Is Nothing) Then - RaiseEvent TBPM_CONNECTIONRowChanged(Me, New TBPM_CONNECTIONRowChangeEvent(CType(e.Row,TBPM_CONNECTIONRow), e.Action)) + If (Not (Me.TBDD_CONNECTIONRowChangedEvent) Is Nothing) Then + RaiseEvent TBDD_CONNECTIONRowChanged(Me, New TBDD_CONNECTIONRowChangeEvent(CType(e.Row,TBDD_CONNECTIONRow), e.Action)) End If End Sub @@ -4227,8 +4227,8 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) - If (Not (Me.TBPM_CONNECTIONRowChangingEvent) Is Nothing) Then - RaiseEvent TBPM_CONNECTIONRowChanging(Me, New TBPM_CONNECTIONRowChangeEvent(CType(e.Row,TBPM_CONNECTIONRow), e.Action)) + If (Not (Me.TBDD_CONNECTIONRowChangingEvent) Is Nothing) Then + RaiseEvent TBDD_CONNECTIONRowChanging(Me, New TBDD_CONNECTIONRowChangeEvent(CType(e.Row,TBDD_CONNECTIONRow), e.Action)) End If End Sub @@ -4236,8 +4236,8 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) - If (Not (Me.TBPM_CONNECTIONRowDeletedEvent) Is Nothing) Then - RaiseEvent TBPM_CONNECTIONRowDeleted(Me, New TBPM_CONNECTIONRowChangeEvent(CType(e.Row,TBPM_CONNECTIONRow), e.Action)) + If (Not (Me.TBDD_CONNECTIONRowDeletedEvent) Is Nothing) Then + RaiseEvent TBDD_CONNECTIONRowDeleted(Me, New TBDD_CONNECTIONRowChangeEvent(CType(e.Row,TBDD_CONNECTIONRow), e.Action)) End If End Sub @@ -4245,14 +4245,14 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) - If (Not (Me.TBPM_CONNECTIONRowDeletingEvent) Is Nothing) Then - RaiseEvent TBPM_CONNECTIONRowDeleting(Me, New TBPM_CONNECTIONRowChangeEvent(CType(e.Row,TBPM_CONNECTIONRow), e.Action)) + If (Not (Me.TBDD_CONNECTIONRowDeletingEvent) Is Nothing) Then + RaiseEvent TBDD_CONNECTIONRowDeleting(Me, New TBDD_CONNECTIONRowChangeEvent(CType(e.Row,TBDD_CONNECTIONRow), e.Action)) End If End Sub _ - Public Sub RemoveTBPM_CONNECTIONRow(ByVal row As TBPM_CONNECTIONRow) + Public Sub RemoveTBDD_CONNECTIONRow(ByVal row As TBDD_CONNECTIONRow) Me.Rows.Remove(row) End Sub @@ -4279,7 +4279,7 @@ Partial Public Class DD_DMSLiteDataSet type.Attributes.Add(attribute1) Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() attribute2.Name = "tableTypeName" - attribute2.FixedValue = "TBPM_CONNECTIONDataTable" + attribute2.FixedValue = "TBDD_CONNECTIONDataTable" type.Attributes.Add(attribute2) type.Particle = sequence Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable @@ -9488,26 +9488,26 @@ Partial Public Class DD_DMSLiteDataSet ''' '''Represents strongly named DataRow class. ''' - Partial Public Class TBPM_CONNECTIONRow + Partial Public Class TBDD_CONNECTIONRow Inherits Global.System.Data.DataRow - Private tableTBPM_CONNECTION As TBPM_CONNECTIONDataTable + Private tableTBDD_CONNECTION As TBDD_CONNECTIONDataTable _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) - Me.tableTBPM_CONNECTION = CType(Me.Table,TBPM_CONNECTIONDataTable) + Me.tableTBDD_CONNECTION = CType(Me.Table,TBDD_CONNECTIONDataTable) End Sub _ Public Property GUID() As Short Get - Return CType(Me(Me.tableTBPM_CONNECTION.GUIDColumn),Short) + Return CType(Me(Me.tableTBDD_CONNECTION.GUIDColumn),Short) End Get Set - Me(Me.tableTBPM_CONNECTION.GUIDColumn) = value + Me(Me.tableTBDD_CONNECTION.GUIDColumn) = value End Set End Property @@ -9516,13 +9516,13 @@ Partial Public Class DD_DMSLiteDataSet Public Property BEZEICHNUNG() As String Get Try - Return CType(Me(Me.tableTBPM_CONNECTION.BEZEICHNUNGColumn),String) + Return CType(Me(Me.tableTBDD_CONNECTION.BEZEICHNUNGColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte BEZEICHNUNG in Tabelle TBPM_CONNECTION ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte BEZEICHNUNG in Tabelle TBDD_CONNECTION ist DBNull.", e) End Try End Get Set - Me(Me.tableTBPM_CONNECTION.BEZEICHNUNGColumn) = value + Me(Me.tableTBDD_CONNECTION.BEZEICHNUNGColumn) = value End Set End Property @@ -9531,13 +9531,13 @@ Partial Public Class DD_DMSLiteDataSet Public Property SQL_PROVIDER() As String Get Try - Return CType(Me(Me.tableTBPM_CONNECTION.SQL_PROVIDERColumn),String) + Return CType(Me(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SQL_PROVIDER in Tabelle TBPM_CONNECTION ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SQL_PROVIDER in Tabelle TBDD_CONNECTION ist DBNull.", e) End Try End Get Set - Me(Me.tableTBPM_CONNECTION.SQL_PROVIDERColumn) = value + Me(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn) = value End Set End Property @@ -9546,13 +9546,13 @@ Partial Public Class DD_DMSLiteDataSet Public Property SERVER() As String Get Try - Return CType(Me(Me.tableTBPM_CONNECTION.SERVERColumn),String) + Return CType(Me(Me.tableTBDD_CONNECTION.SERVERColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SERVER in Tabelle TBPM_CONNECTION ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SERVER in Tabelle TBDD_CONNECTION ist DBNull.", e) End Try End Get Set - Me(Me.tableTBPM_CONNECTION.SERVERColumn) = value + Me(Me.tableTBDD_CONNECTION.SERVERColumn) = value End Set End Property @@ -9561,13 +9561,13 @@ Partial Public Class DD_DMSLiteDataSet Public Property DATENBANK() As String Get Try - Return CType(Me(Me.tableTBPM_CONNECTION.DATENBANKColumn),String) + Return CType(Me(Me.tableTBDD_CONNECTION.DATENBANKColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte DATENBANK in Tabelle TBPM_CONNECTION ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte DATENBANK in Tabelle TBDD_CONNECTION ist DBNull.", e) End Try End Get Set - Me(Me.tableTBPM_CONNECTION.DATENBANKColumn) = value + Me(Me.tableTBDD_CONNECTION.DATENBANKColumn) = value End Set End Property @@ -9576,13 +9576,13 @@ Partial Public Class DD_DMSLiteDataSet Public Property USERNAME() As String Get Try - Return CType(Me(Me.tableTBPM_CONNECTION.USERNAMEColumn),String) + Return CType(Me(Me.tableTBDD_CONNECTION.USERNAMEColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte USERNAME in Tabelle TBPM_CONNECTION ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte USERNAME in Tabelle TBDD_CONNECTION ist DBNull.", e) End Try End Get Set - Me(Me.tableTBPM_CONNECTION.USERNAMEColumn) = value + Me(Me.tableTBDD_CONNECTION.USERNAMEColumn) = value End Set End Property @@ -9591,13 +9591,13 @@ Partial Public Class DD_DMSLiteDataSet Public Property PASSWORD() As String Get Try - Return CType(Me(Me.tableTBPM_CONNECTION.PASSWORDColumn),String) + Return CType(Me(Me.tableTBDD_CONNECTION.PASSWORDColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte PASSWORD in Tabelle TBPM_CONNECTION ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte PASSWORD in Tabelle TBDD_CONNECTION ist DBNull.", e) End Try End Get Set - Me(Me.tableTBPM_CONNECTION.PASSWORDColumn) = value + Me(Me.tableTBDD_CONNECTION.PASSWORDColumn) = value End Set End Property @@ -9606,13 +9606,13 @@ Partial Public Class DD_DMSLiteDataSet Public Property BEMERKUNG() As String Get Try - Return CType(Me(Me.tableTBPM_CONNECTION.BEMERKUNGColumn),String) + Return CType(Me(Me.tableTBDD_CONNECTION.BEMERKUNGColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte BEMERKUNG in Tabelle TBPM_CONNECTION ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte BEMERKUNG in Tabelle TBDD_CONNECTION ist DBNull.", e) End Try End Get Set - Me(Me.tableTBPM_CONNECTION.BEMERKUNGColumn) = value + Me(Me.tableTBDD_CONNECTION.BEMERKUNGColumn) = value End Set End Property @@ -9620,10 +9620,10 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Public Property AKTIV() As Boolean Get - Return CType(Me(Me.tableTBPM_CONNECTION.AKTIVColumn),Boolean) + Return CType(Me(Me.tableTBDD_CONNECTION.AKTIVColumn),Boolean) End Get Set - Me(Me.tableTBPM_CONNECTION.AKTIVColumn) = value + Me(Me.tableTBDD_CONNECTION.AKTIVColumn) = value End Set End Property @@ -9631,10 +9631,10 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Public Property ERSTELLTWER() As String Get - Return CType(Me(Me.tableTBPM_CONNECTION.ERSTELLTWERColumn),String) + Return CType(Me(Me.tableTBDD_CONNECTION.ERSTELLTWERColumn),String) End Get Set - Me(Me.tableTBPM_CONNECTION.ERSTELLTWERColumn) = value + Me(Me.tableTBDD_CONNECTION.ERSTELLTWERColumn) = value End Set End Property @@ -9643,13 +9643,13 @@ Partial Public Class DD_DMSLiteDataSet Public Property ERSTELLTWANN() As Date Get Try - Return CType(Me(Me.tableTBPM_CONNECTION.ERSTELLTWANNColumn),Date) + Return CType(Me(Me.tableTBDD_CONNECTION.ERSTELLTWANNColumn),Date) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ERSTELLTWANN in Tabelle TBPM_CONNECTION ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ERSTELLTWANN in Tabelle TBDD_CONNECTION ist DBNull.", e) End Try End Get Set - Me(Me.tableTBPM_CONNECTION.ERSTELLTWANNColumn) = value + Me(Me.tableTBDD_CONNECTION.ERSTELLTWANNColumn) = value End Set End Property @@ -9658,13 +9658,13 @@ Partial Public Class DD_DMSLiteDataSet Public Property GEANDERTWER() As String Get Try - Return CType(Me(Me.tableTBPM_CONNECTION.GEANDERTWERColumn),String) + Return CType(Me(Me.tableTBDD_CONNECTION.GEANDERTWERColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte GEANDERTWER in Tabelle TBPM_CONNECTION ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte GEANDERTWER in Tabelle TBDD_CONNECTION ist DBNull.", e) End Try End Get Set - Me(Me.tableTBPM_CONNECTION.GEANDERTWERColumn) = value + Me(Me.tableTBDD_CONNECTION.GEANDERTWERColumn) = value End Set End Property @@ -9673,134 +9673,134 @@ Partial Public Class DD_DMSLiteDataSet Public Property GEAENDERTWANN() As Date Get Try - Return CType(Me(Me.tableTBPM_CONNECTION.GEAENDERTWANNColumn),Date) + Return CType(Me(Me.tableTBDD_CONNECTION.GEAENDERTWANNColumn),Date) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte GEAENDERTWANN in Tabelle TBPM_CONNECTION ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte GEAENDERTWANN in Tabelle TBDD_CONNECTION ist DBNull.", e) End Try End Get Set - Me(Me.tableTBPM_CONNECTION.GEAENDERTWANNColumn) = value + Me(Me.tableTBDD_CONNECTION.GEAENDERTWANNColumn) = value End Set End Property _ Public Function IsBEZEICHNUNGNull() As Boolean - Return Me.IsNull(Me.tableTBPM_CONNECTION.BEZEICHNUNGColumn) + Return Me.IsNull(Me.tableTBDD_CONNECTION.BEZEICHNUNGColumn) End Function _ Public Sub SetBEZEICHNUNGNull() - Me(Me.tableTBPM_CONNECTION.BEZEICHNUNGColumn) = Global.System.Convert.DBNull + Me(Me.tableTBDD_CONNECTION.BEZEICHNUNGColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsSQL_PROVIDERNull() As Boolean - Return Me.IsNull(Me.tableTBPM_CONNECTION.SQL_PROVIDERColumn) + Return Me.IsNull(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn) End Function _ Public Sub SetSQL_PROVIDERNull() - Me(Me.tableTBPM_CONNECTION.SQL_PROVIDERColumn) = Global.System.Convert.DBNull + Me(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsSERVERNull() As Boolean - Return Me.IsNull(Me.tableTBPM_CONNECTION.SERVERColumn) + Return Me.IsNull(Me.tableTBDD_CONNECTION.SERVERColumn) End Function _ Public Sub SetSERVERNull() - Me(Me.tableTBPM_CONNECTION.SERVERColumn) = Global.System.Convert.DBNull + Me(Me.tableTBDD_CONNECTION.SERVERColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsDATENBANKNull() As Boolean - Return Me.IsNull(Me.tableTBPM_CONNECTION.DATENBANKColumn) + Return Me.IsNull(Me.tableTBDD_CONNECTION.DATENBANKColumn) End Function _ Public Sub SetDATENBANKNull() - Me(Me.tableTBPM_CONNECTION.DATENBANKColumn) = Global.System.Convert.DBNull + Me(Me.tableTBDD_CONNECTION.DATENBANKColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsUSERNAMENull() As Boolean - Return Me.IsNull(Me.tableTBPM_CONNECTION.USERNAMEColumn) + Return Me.IsNull(Me.tableTBDD_CONNECTION.USERNAMEColumn) End Function _ Public Sub SetUSERNAMENull() - Me(Me.tableTBPM_CONNECTION.USERNAMEColumn) = Global.System.Convert.DBNull + Me(Me.tableTBDD_CONNECTION.USERNAMEColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsPASSWORDNull() As Boolean - Return Me.IsNull(Me.tableTBPM_CONNECTION.PASSWORDColumn) + Return Me.IsNull(Me.tableTBDD_CONNECTION.PASSWORDColumn) End Function _ Public Sub SetPASSWORDNull() - Me(Me.tableTBPM_CONNECTION.PASSWORDColumn) = Global.System.Convert.DBNull + Me(Me.tableTBDD_CONNECTION.PASSWORDColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsBEMERKUNGNull() As Boolean - Return Me.IsNull(Me.tableTBPM_CONNECTION.BEMERKUNGColumn) + Return Me.IsNull(Me.tableTBDD_CONNECTION.BEMERKUNGColumn) End Function _ Public Sub SetBEMERKUNGNull() - Me(Me.tableTBPM_CONNECTION.BEMERKUNGColumn) = Global.System.Convert.DBNull + Me(Me.tableTBDD_CONNECTION.BEMERKUNGColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsERSTELLTWANNNull() As Boolean - Return Me.IsNull(Me.tableTBPM_CONNECTION.ERSTELLTWANNColumn) + Return Me.IsNull(Me.tableTBDD_CONNECTION.ERSTELLTWANNColumn) End Function _ Public Sub SetERSTELLTWANNNull() - Me(Me.tableTBPM_CONNECTION.ERSTELLTWANNColumn) = Global.System.Convert.DBNull + Me(Me.tableTBDD_CONNECTION.ERSTELLTWANNColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsGEANDERTWERNull() As Boolean - Return Me.IsNull(Me.tableTBPM_CONNECTION.GEANDERTWERColumn) + Return Me.IsNull(Me.tableTBDD_CONNECTION.GEANDERTWERColumn) End Function _ Public Sub SetGEANDERTWERNull() - Me(Me.tableTBPM_CONNECTION.GEANDERTWERColumn) = Global.System.Convert.DBNull + Me(Me.tableTBDD_CONNECTION.GEANDERTWERColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsGEAENDERTWANNNull() As Boolean - Return Me.IsNull(Me.tableTBPM_CONNECTION.GEAENDERTWANNColumn) + Return Me.IsNull(Me.tableTBDD_CONNECTION.GEAENDERTWANNColumn) End Function _ Public Sub SetGEAENDERTWANNNull() - Me(Me.tableTBPM_CONNECTION.GEAENDERTWANNColumn) = Global.System.Convert.DBNull + Me(Me.tableTBDD_CONNECTION.GEAENDERTWANNColumn) = Global.System.Convert.DBNull End Sub End Class @@ -12107,16 +12107,16 @@ Partial Public Class DD_DMSLiteDataSet '''Row event argument class ''' _ - Public Class TBPM_CONNECTIONRowChangeEvent + Public Class TBDD_CONNECTIONRowChangeEvent Inherits Global.System.EventArgs - Private eventRow As TBPM_CONNECTIONRow + Private eventRow As TBDD_CONNECTIONRow Private eventAction As Global.System.Data.DataRowAction _ - Public Sub New(ByVal row As TBPM_CONNECTIONRow, ByVal action As Global.System.Data.DataRowAction) + Public Sub New(ByVal row As TBDD_CONNECTIONRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row Me.eventAction = action @@ -12124,7 +12124,7 @@ Partial Public Class DD_DMSLiteDataSet _ - Public ReadOnly Property Row() As TBPM_CONNECTIONRow + Public ReadOnly Property Row() As TBDD_CONNECTIONRow Get Return Me.eventRow End Get @@ -15393,7 +15393,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner"& _ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ - Partial Public Class TBPM_CONNECTIONTableAdapter + Partial Public Class TBDD_CONNECTIONTableAdapter Inherits Global.System.ComponentModel.Component Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter @@ -15510,7 +15510,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() tableMapping.SourceTable = "Table" - tableMapping.DataSetTable = "TBPM_CONNECTION" + tableMapping.DataSetTable = "TBDD_CONNECTION" tableMapping.ColumnMappings.Add("GUID", "GUID") tableMapping.ColumnMappings.Add("BEZEICHNUNG", "BEZEICHNUNG") tableMapping.ColumnMappings.Add("SQL_PROVIDER", "SQL_PROVIDER") @@ -15527,20 +15527,20 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBPM_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBDD_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPM_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (BEZEICHNUNG, SQL_PROVIDER,"& _ + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (BEZEICHNUNG, SQL_PROVIDER,"& _ " SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES "& _ " (@BEZEICHNUNG,@SQL_PROVIDER,@SERVER,@DATENBANK,@USERNAME,@PASSWORD,@BEMERK"& _ - "UNG,@AKTIV,@ERSTELLTWER); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DAT"& _ - "ENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDER"& _ - "TWER, GEAENDERTWANN FROM TBPM_CONNECTION WHERE (GUID = SCOPE_IDENTITY())" + "UNG,@AKTIV,@ERSTELLTWER); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DA"& _ + "TENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDE"& _ + "RTWER, GEAENDERTWANN FROM TBPM_CONNECTION WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEZEICHNUNG", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_PROVIDER", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_PROVIDER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_PROVIDER", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_PROVIDER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SERVER", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "SERVER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DATENBANK", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "DATENBANK", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -15550,16 +15550,16 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ERSTELLTWER", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ERSTELLTWER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection - Me._adapter.UpdateCommand.CommandText = "UPDATE TBPM_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET BEZEICHNUNG = @BEZEICHNUNG, SQL_"& _ + Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET BEZEICHNUNG = @BEZEICHNUNG, SQL_"& _ "PROVIDER = @SQL_PROVIDER, SERVER = @SERVER, DATENBANK = @DATENBANK, USERNAME = @"& _ - "USERNAME, PASSWORD = @PASSWORD, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" BEMERKUNG = @BEMERKUN"& _ - "G, AKTIV = @AKTIV, GEANDERTWER = @GEANDERTWER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GU"& _ - "ID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PAS"& _ - "SWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN F"& _ - "ROM TBPM_CONNECTION WHERE (GUID = @GUID)" + "USERNAME, PASSWORD = @PASSWORD, BEMERKUNG = @BEMERKUNG, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " AKTIV = @AKTIV, GEANDERTWER = @GEANDERTWER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GU"& _ + "ID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PA"& _ + "SSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN "& _ + "FROM TBPM_CONNECTION WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEZEICHNUNG", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_PROVIDER", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_PROVIDER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_PROVIDER", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_PROVIDER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SERVER", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "SERVER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DATENBANK", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "DATENBANK", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -15585,20 +15585,20 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSW"& _ - "ORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " GEAENDERTWANN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONNECTION" + "ORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FR"& _ + "OM TBDD_CONNECTION" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(1).Connection = Me.Connection - Me._commandCollection(1).CommandText = "INSERT INTO TBPM_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (BEZEICHNUNG, SQL_PROVIDER,"& _ + Me._commandCollection(1).CommandText = "INSERT INTO TBDD_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (BEZEICHNUNG, SQL_PROVIDER,"& _ " SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES "& _ " (@BEZEICHNUNG,@SQL_PROVIDER,@SERVER,@DATENBANK,@USERNAME,@PASSWORD,@BEMERK"& _ - "UNG,@AKTIV,@ERSTELLTWER); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DAT"& _ - "ENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDER"& _ - "TWER, GEAENDERTWANN FROM TBPM_CONNECTION WHERE (GUID = SCOPE_IDENTITY())" + "UNG,@AKTIV,@ERSTELLTWER); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DA"& _ + "TENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDE"& _ + "RTWER, GEAENDERTWANN FROM TBPM_CONNECTION WHERE (GUID = SCOPE_IDENTITY())" Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEZEICHNUNG", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_PROVIDER", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_PROVIDER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_PROVIDER", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_PROVIDER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SERVER", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "SERVER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DATENBANK", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "DATENBANK", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -15610,7 +15610,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(2).Connection = Me.Connection Me._commandCollection(2).CommandText = "SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSW"& _ "ORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FR"& _ - "OM TBPM_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @ID)" + "OM TBDD_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @ID)" Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub @@ -15619,7 +15619,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, true)> _ - Public Overloads Overridable Function Fill(ByVal dataTable As DD_DMSLiteDataSet.TBPM_CONNECTIONDataTable) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As DD_DMSLiteDataSet.TBDD_CONNECTIONDataTable) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) If (Me.ClearBeforeFill = true) Then dataTable.Clear @@ -15632,9 +15632,9 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetData() As DD_DMSLiteDataSet.TBPM_CONNECTIONDataTable + Public Overloads Overridable Function GetData() As DD_DMSLiteDataSet.TBDD_CONNECTIONDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Dim dataTable As DD_DMSLiteDataSet.TBPM_CONNECTIONDataTable = New DD_DMSLiteDataSet.TBPM_CONNECTIONDataTable() + Dim dataTable As DD_DMSLiteDataSet.TBDD_CONNECTIONDataTable = New DD_DMSLiteDataSet.TBDD_CONNECTIONDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -15643,7 +15643,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, false)> _ - Public Overloads Overridable Function FillByID(ByVal dataTable As DD_DMSLiteDataSet.TBPM_CONNECTIONDataTable, ByVal ID As Short) As Integer + Public Overloads Overridable Function FillByID(ByVal dataTable As DD_DMSLiteDataSet.TBDD_CONNECTIONDataTable, ByVal ID As Short) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(2) Me.Adapter.SelectCommand.Parameters(0).Value = CType(ID,Short) If (Me.ClearBeforeFill = true) Then @@ -15657,10 +15657,10 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], false)> _ - Public Overloads Overridable Function GetDataByID(ByVal ID As Short) As DD_DMSLiteDataSet.TBPM_CONNECTIONDataTable + Public Overloads Overridable Function GetDataByID(ByVal ID As Short) As DD_DMSLiteDataSet.TBDD_CONNECTIONDataTable Me.Adapter.SelectCommand = Me.CommandCollection(2) Me.Adapter.SelectCommand.Parameters(0).Value = CType(ID,Short) - Dim dataTable As DD_DMSLiteDataSet.TBPM_CONNECTIONDataTable = New DD_DMSLiteDataSet.TBPM_CONNECTIONDataTable() + Dim dataTable As DD_DMSLiteDataSet.TBDD_CONNECTIONDataTable = New DD_DMSLiteDataSet.TBDD_CONNECTIONDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -15668,7 +15668,7 @@ Namespace DD_DMSLiteDataSetTableAdapters _ - Public Overloads Overridable Function Update(ByVal dataTable As DD_DMSLiteDataSet.TBPM_CONNECTIONDataTable) As Integer + Public Overloads Overridable Function Update(ByVal dataTable As DD_DMSLiteDataSet.TBDD_CONNECTIONDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function @@ -15676,7 +15676,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ Public Overloads Overridable Function Update(ByVal dataSet As DD_DMSLiteDataSet) As Integer - Return Me.Adapter.Update(dataSet, "TBPM_CONNECTION") + Return Me.Adapter.Update(dataSet, "TBDD_CONNECTION") End Function _ - Public Property TBPM_CONNECTIONTableAdapter() As TBPM_CONNECTIONTableAdapter + Public Property TBDD_CONNECTIONTableAdapter() As TBDD_CONNECTIONTableAdapter Get - Return Me._tBPM_CONNECTIONTableAdapter + Return Me._tBDD_CONNECTIONTableAdapter End Get Set - Me._tBPM_CONNECTIONTableAdapter = value + Me._tBDD_CONNECTIONTableAdapter = value End Set End Property @@ -20086,9 +20086,9 @@ Namespace DD_DMSLiteDataSetTableAdapters AndAlso (Not (Me._tBPM_ERROR_LOGTableAdapter.Connection) Is Nothing)) Then Return Me._tBPM_ERROR_LOGTableAdapter.Connection End If - If ((Not (Me._tBPM_CONNECTIONTableAdapter) Is Nothing) _ - AndAlso (Not (Me._tBPM_CONNECTIONTableAdapter.Connection) Is Nothing)) Then - Return Me._tBPM_CONNECTIONTableAdapter.Connection + If ((Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBDD_CONNECTIONTableAdapter.Connection) Is Nothing)) Then + Return Me._tBDD_CONNECTIONTableAdapter.Connection End If If ((Not (Me._tBPM_PROFILE_FILESTableAdapter) Is Nothing) _ AndAlso (Not (Me._tBPM_PROFILE_FILESTableAdapter.Connection) Is Nothing)) Then @@ -20138,7 +20138,7 @@ Namespace DD_DMSLiteDataSetTableAdapters If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then count = (count + 1) End If - If (Not (Me._tBPM_CONNECTIONTableAdapter) Is Nothing) Then + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then count = (count + 1) End If If (Not (Me._tBPM_PROFILE_FILESTableAdapter) Is Nothing) Then @@ -20230,12 +20230,12 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPM_CONNECTIONTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPM_CONNECTIONTableAdapter.Update(updatedRows)) + result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -20332,11 +20332,11 @@ Namespace DD_DMSLiteDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPM_CONNECTIONTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPM_CONNECTIONTableAdapter.Update(addedRows)) + result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -20398,11 +20398,11 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPM_CONNECTIONTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPM_CONNECTIONTableAdapter.Update(deletedRows)) + result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -20528,8 +20528,8 @@ Namespace DD_DMSLiteDataSetTableAdapters Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ "s die gleiche Verbindungszeichenfolge verwendet werden.") End If - If ((Not (Me._tBPM_CONNECTIONTableAdapter) Is Nothing) _ - AndAlso (Me.MatchTableAdapterConnection(Me._tBPM_CONNECTIONTableAdapter.Connection) = false)) Then + If ((Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBDD_CONNECTIONTableAdapter.Connection) = false)) Then Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ "s die gleiche Verbindungszeichenfolge verwendet werden.") End If @@ -20637,13 +20637,13 @@ Namespace DD_DMSLiteDataSetTableAdapters adaptersWithAcceptChangesDuringUpdate.Add(Me._tBPM_ERROR_LOGTableAdapter.Adapter) End If End If - If (Not (Me._tBPM_CONNECTIONTableAdapter) Is Nothing) Then - revertConnections.Add(Me._tBPM_CONNECTIONTableAdapter, Me._tBPM_CONNECTIONTableAdapter.Connection) - Me._tBPM_CONNECTIONTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) - Me._tBPM_CONNECTIONTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) - If Me._tBPM_CONNECTIONTableAdapter.Adapter.AcceptChangesDuringUpdate Then - Me._tBPM_CONNECTIONTableAdapter.Adapter.AcceptChangesDuringUpdate = false - adaptersWithAcceptChangesDuringUpdate.Add(Me._tBPM_CONNECTIONTableAdapter.Adapter) + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBDD_CONNECTIONTableAdapter, Me._tBDD_CONNECTIONTableAdapter.Connection) + Me._tBDD_CONNECTIONTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBDD_CONNECTIONTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBDD_CONNECTIONTableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBDD_CONNECTIONTableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBDD_CONNECTIONTableAdapter.Adapter) End If End If If (Not (Me._tBPM_PROFILE_FILESTableAdapter) Is Nothing) Then @@ -20771,9 +20771,9 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._tBPM_ERROR_LOGTableAdapter.Connection = CType(revertConnections(Me._tBPM_ERROR_LOGTableAdapter),Global.System.Data.SqlClient.SqlConnection) Me._tBPM_ERROR_LOGTableAdapter.Transaction = Nothing End If - If (Not (Me._tBPM_CONNECTIONTableAdapter) Is Nothing) Then - Me._tBPM_CONNECTIONTableAdapter.Connection = CType(revertConnections(Me._tBPM_CONNECTIONTableAdapter),Global.System.Data.SqlClient.SqlConnection) - Me._tBPM_CONNECTIONTableAdapter.Transaction = Nothing + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Me._tBDD_CONNECTIONTableAdapter.Connection = CType(revertConnections(Me._tBDD_CONNECTIONTableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBDD_CONNECTIONTableAdapter.Transaction = Nothing End If If (Not (Me._tBPM_PROFILE_FILESTableAdapter) Is Nothing) Then Me._tBPM_PROFILE_FILESTableAdapter.Connection = CType(revertConnections(Me._tBPM_PROFILE_FILESTableAdapter),Global.System.Data.SqlClient.SqlConnection) diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc index 4bee580..195a42d 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc @@ -43,7 +43,7 @@ - + diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index ce008ca..35cc7e4 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -755,64 +755,63 @@ ORDER BY Y_LOC, X_LOC - + - + - DELETE FROM TBPM_CONNECTION + DELETE FROM TBDD_CONNECTION WHERE (GUID = @Original_GUID) - + - INSERT INTO TBPM_CONNECTION + INSERT INTO TBDD_CONNECTION (BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER) -VALUES (@BEZEICHNUNG,@SQL_PROVIDER,@SERVER,@DATENBANK,@USERNAME,@PASSWORD,@BEMERKUNG,@AKTIV,@ERSTELLTWER); +VALUES (@BEZEICHNUNG,@SQL_PROVIDER,@SERVER,@DATENBANK,@USERNAME,@PASSWORD,@BEMERKUNG,@AKTIV,@ERSTELLTWER); SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBPM_CONNECTION WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - - - + + + + + + + + + - - SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, - GEAENDERTWANN -FROM TBPM_CONNECTION + + SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN +FROM TBDD_CONNECTION - UPDATE TBPM_CONNECTION -SET BEZEICHNUNG = @BEZEICHNUNG, SQL_PROVIDER = @SQL_PROVIDER, SERVER = @SERVER, DATENBANK = @DATENBANK, USERNAME = @USERNAME, PASSWORD = @PASSWORD, - BEMERKUNG = @BEMERKUNG, AKTIV = @AKTIV, GEANDERTWER = @GEANDERTWER -WHERE (GUID = @Original_GUID); + UPDATE TBDD_CONNECTION +SET BEZEICHNUNG = @BEZEICHNUNG, SQL_PROVIDER = @SQL_PROVIDER, SERVER = @SERVER, DATENBANK = @DATENBANK, USERNAME = @USERNAME, PASSWORD = @PASSWORD, BEMERKUNG = @BEMERKUNG, + AKTIV = @AKTIV, GEANDERTWER = @GEANDERTWER +WHERE (GUID = @Original_GUID); SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBPM_CONNECTION WHERE (GUID = @GUID) - - - - - - - - - - - + + + + + + + + + + + @@ -856,20 +855,20 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - INSERT INTO TBPM_CONNECTION + INSERT INTO TBDD_CONNECTION (BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER) -VALUES (@BEZEICHNUNG,@SQL_PROVIDER,@SERVER,@DATENBANK,@USERNAME,@PASSWORD,@BEMERKUNG,@AKTIV,@ERSTELLTWER); +VALUES (@BEZEICHNUNG,@SQL_PROVIDER,@SERVER,@DATENBANK,@USERNAME,@PASSWORD,@BEMERKUNG,@AKTIV,@ERSTELLTWER); SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBPM_CONNECTION WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - - - + + + + + + + + + @@ -878,10 +877,10 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN -FROM TBPM_CONNECTION +FROM TBDD_CONNECTION WHERE (GUID = @ID) - + @@ -1920,7 +1919,7 @@ WHERE (GUID = @GUID) - + @@ -1965,7 +1964,7 @@ WHERE (GUID = @GUID) - + @@ -2068,7 +2067,7 @@ WHERE (GUID = @GUID) - + @@ -2164,7 +2163,7 @@ WHERE (GUID = @GUID) - + @@ -2215,7 +2214,7 @@ WHERE (GUID = @GUID) - + @@ -2245,7 +2244,7 @@ WHERE (GUID = @GUID) - + @@ -2268,7 +2267,7 @@ WHERE (GUID = @GUID) - + @@ -2357,7 +2356,7 @@ WHERE (GUID = @GUID) - + @@ -2430,7 +2429,7 @@ WHERE (GUID = @GUID) - + @@ -2466,7 +2465,7 @@ WHERE (GUID = @GUID) - + @@ -2481,7 +2480,7 @@ WHERE (GUID = @GUID) - + @@ -2502,7 +2501,7 @@ WHERE (GUID = @GUID) - + @@ -2610,7 +2609,7 @@ WHERE (GUID = @GUID) - + @@ -2683,7 +2682,7 @@ WHERE (GUID = @GUID) - + @@ -2734,7 +2733,7 @@ WHERE (GUID = @GUID) - + @@ -2825,7 +2824,7 @@ WHERE (GUID = @GUID) - + @@ -2913,8 +2912,8 @@ WHERE (GUID = @GUID) - - + + @@ -2956,11 +2955,11 @@ WHERE (GUID = @GUID) - - - - - + + + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index 44d0588..135f5c1 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -13,7 +13,7 @@ - + diff --git a/app/DD_PM_WINDREAM/frmConnection.Designer.vb b/app/DD_PM_WINDREAM/frmConnection.Designer.vb index cb59c65..c1154da 100644 --- a/app/DD_PM_WINDREAM/frmConnection.Designer.vb +++ b/app/DD_PM_WINDREAM/frmConnection.Designer.vb @@ -45,7 +45,6 @@ Partial Class frmConnection Me.cmbDbArt = New System.Windows.Forms.ComboBox() Me.lblDatenbanktyp = New System.Windows.Forms.Label() Me.txtDatasource2 = New System.Windows.Forms.TextBox() - Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBPM_CONNECTIONBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() @@ -74,6 +73,7 @@ Partial Class frmConnection Me.grpbx_ConnAdd = New System.Windows.Forms.GroupBox() Me.btnadd = New System.Windows.Forms.Button() Me.GEAENDERTWANNTextBox = New System.Windows.Forms.TextBox() + Me.TBDD_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() GEANDERTWERLabel = New System.Windows.Forms.Label() GEAENDERTWANNLabel = New System.Windows.Forms.Label() CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -136,7 +136,7 @@ Partial Class frmConnection ' 'TBPM_CONNECTIONBindingSource ' - Me.TBPM_CONNECTIONBindingSource.DataMember = "TBPM_CONNECTION" + Me.TBPM_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" Me.TBPM_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet ' 'DD_DMSLiteDataSet @@ -150,7 +150,7 @@ Partial Class frmConnection Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label1.Location = New System.Drawing.Point(228, 19) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(155, 17) + Me.Label1.Size = New System.Drawing.Size(154, 17) Me.Label1.TabIndex = 40 Me.Label1.Text = "Bezeichnung Verbindung:" ' @@ -292,14 +292,12 @@ Partial Class frmConnection Me.txtDatasource2.TabIndex = 35 Me.txtDatasource2.Visible = False ' - 'TBPM_CONNECTIONTableAdapter - ' - Me.TBPM_CONNECTIONTableAdapter.ClearBeforeFill = True - ' 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False - Me.TableAdapterManager.TBPM_CONNECTIONTableAdapter = Me.TBPM_CONNECTIONTableAdapter + Me.TableAdapterManager.Connection = Nothing + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing + Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing @@ -309,7 +307,6 @@ Partial Class frmConnection Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBPM_CONNECTIONBindingNavigator @@ -327,7 +324,7 @@ Partial Class frmConnection Me.TBPM_CONNECTIONBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem Me.TBPM_CONNECTIONBindingNavigator.Name = "TBPM_CONNECTIONBindingNavigator" Me.TBPM_CONNECTIONBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem - Me.TBPM_CONNECTIONBindingNavigator.Size = New System.Drawing.Size(818, 25) + Me.TBPM_CONNECTIONBindingNavigator.Size = New System.Drawing.Size(838, 25) Me.TBPM_CONNECTIONBindingNavigator.TabIndex = 53 Me.TBPM_CONNECTIONBindingNavigator.Text = "BindingNavigator1" ' @@ -404,7 +401,7 @@ Partial Class frmConnection Me.ToolStripButton1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" - Me.ToolStripButton1.Size = New System.Drawing.Size(152, 22) + Me.ToolStripButton1.Size = New System.Drawing.Size(151, 22) Me.ToolStripButton1.Text = "Verbindung hinzufügen" Me.ToolStripButton1.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' @@ -421,7 +418,7 @@ Partial Class frmConnection Me.ToolStripButton2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton2.Name = "ToolStripButton2" - Me.ToolStripButton2.Size = New System.Drawing.Size(129, 22) + Me.ToolStripButton2.Size = New System.Drawing.Size(128, 22) Me.ToolStripButton2.Text = "Lösche Verbindung" ' 'TBPM_CONNECTIONDataGridView @@ -440,7 +437,7 @@ Partial Class frmConnection Me.TBPM_CONNECTIONDataGridView.Location = New System.Drawing.Point(15, 303) Me.TBPM_CONNECTIONDataGridView.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.TBPM_CONNECTIONDataGridView.Name = "TBPM_CONNECTIONDataGridView" - Me.TBPM_CONNECTIONDataGridView.Size = New System.Drawing.Size(797, 256) + Me.TBPM_CONNECTIONDataGridView.Size = New System.Drawing.Size(817, 276) Me.TBPM_CONNECTIONDataGridView.TabIndex = 53 ' 'DataGridViewTextBoxColumn1 @@ -560,11 +557,15 @@ Partial Class frmConnection Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(155, 23) Me.GEAENDERTWANNTextBox.TabIndex = 63 ' + 'TBDD_CONNECTIONTableAdapter + ' + Me.TBDD_CONNECTIONTableAdapter.ClearBeforeFill = True + ' 'frmConnection ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(818, 559) + Me.ClientSize = New System.Drawing.Size(838, 579) Me.Controls.Add(GEAENDERTWANNLabel) Me.Controls.Add(Me.GEAENDERTWANNTextBox) Me.Controls.Add(Me.grpbx_ConnAdd) @@ -602,7 +603,6 @@ Partial Class frmConnection Friend WithEvents txtDatasource2 As System.Windows.Forms.TextBox Friend WithEvents DD_DMSLiteDataSet As DD_PM_WINDREAM.DD_DMSLiteDataSet Friend WithEvents TBPM_CONNECTIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents TBPM_CONNECTIONBindingNavigator As System.Windows.Forms.BindingNavigator Friend WithEvents BindingNavigatorCountItem As System.Windows.Forms.ToolStripLabel @@ -635,4 +635,5 @@ Partial Class frmConnection Friend WithEvents btnadd As System.Windows.Forms.Button Friend WithEvents GEAENDERTWANNTextBox As System.Windows.Forms.TextBox Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton + Friend WithEvents TBDD_CONNECTIONTableAdapter As DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter End Class diff --git a/app/DD_PM_WINDREAM/frmConnection.resx b/app/DD_PM_WINDREAM/frmConnection.resx index 8c56943..e99f58f 100644 --- a/app/DD_PM_WINDREAM/frmConnection.resx +++ b/app/DD_PM_WINDREAM/frmConnection.resx @@ -146,14 +146,11 @@ AAAAAElFTkSuQmCC - - 424, 17 - - 663, 17 + 424, 17 - 836, 17 + 597, 17 @@ -210,4 +207,7 @@ 4OSJHr6etGG0JDRnGhV1mxpGNdOrlATvjMsSgn8PSVoDbGg6a0b5NXsAAAAASUVORK5CYII= + + 858, 17 + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmConnection.vb b/app/DD_PM_WINDREAM/frmConnection.vb index 3262adf..b876f6b 100644 --- a/app/DD_PM_WINDREAM/frmConnection.vb +++ b/app/DD_PM_WINDREAM/frmConnection.vb @@ -122,7 +122,7 @@ Public Class frmConnection Case Else MsgBox("Test zur Zeit nicht möglich", MsgBoxStyle.Information, "Achtung:") End Select - Me.TBPM_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONNECTION) + Me.TBDD_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBDD_CONNECTION) End If Catch ex As Exception Cursor = Cursors.Default @@ -134,10 +134,10 @@ Public Class frmConnection Private Sub TBPM_CONNECTIONBindingNavigatorSaveItem_Click(sender As System.Object, e As System.EventArgs) Handles TBPM_CONNECTIONBindingNavigatorSaveItem.Click Try Me.TBPM_CONNECTIONBindingSource.EndEdit() - If DD_DMSLiteDataSet.TBPM_CONNECTION.GetChanges Is Nothing = False Then + If DD_DMSLiteDataSet.TBDD_CONNECTION.GetChanges Is Nothing = False Then Me.GEANDERTWERTextBox.Text = Environment.UserName Me.TBPM_CONNECTIONBindingSource.EndEdit() - Me.TBPM_CONNECTIONTableAdapter.Update(DD_DMSLiteDataSet.TBPM_CONNECTION) + Me.TBDD_CONNECTIONTableAdapter.Update(DD_DMSLiteDataSet.TBDD_CONNECTION) MsgBox("Änderungen wurden erfolgreich gespeichert!", MsgBoxStyle.Information) End If Catch ex As Exception @@ -148,7 +148,7 @@ Public Class frmConnection Private Sub frmConnection_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load Try - Me.TBPM_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString load_connections() Catch ex As Exception MsgBox("Fehler bei Laden der Grunddaten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -156,7 +156,7 @@ Public Class frmConnection End Sub Sub load_connections() Try - Me.TBPM_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONNECTION) + Me.TBDD_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBDD_CONNECTION) TBPM_CONNECTIONDataGridView.AutoResizeColumns() Catch ex As Exception MsgBox("Fehler bei Connections laden: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -181,7 +181,7 @@ Public Class frmConnection End Sub Private Sub TBPM_CONNECTIONBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPM_CONNECTIONBindingSource.AddingNew - DD_DMSLiteDataSet.TBPM_CONNECTION.ERSTELLTWERColumn.DefaultValue = Environment.UserName + DD_DMSLiteDataSet.TBDD_CONNECTION.ERSTELLTWERColumn.DefaultValue = Environment.UserName End Sub Private Sub TBPM_CONNECTIONBindingSource_PositionChanged(sender As Object, e As EventArgs) Handles TBPM_CONNECTIONBindingSource.PositionChanged @@ -210,9 +210,9 @@ Public Class frmConnection Case "ORACLE" Case "MS-SQL" If Me.txtUserId.Text = "WINAUTH" Then - TBPM_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, txtDatasource1.Text, txtDatasource2.Text, "WINAUTH", "", "", True, Environment.UserName) + TBDD_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, txtDatasource1.Text, txtDatasource2.Text, "WINAUTH", "", "", True, Environment.UserName) Else - TBPM_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, txtDatasource1.Text, txtDatasource2.Text, txtUserId.Text, txtPassword.Text, "", True, Environment.UserName) + TBDD_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, txtDatasource1.Text, txtDatasource2.Text, txtUserId.Text, txtPassword.Text, "", True, Environment.UserName) End If End Select @@ -236,7 +236,7 @@ Public Class frmConnection Dim result As MsgBoxResult = MsgBox("Wollen Sie die Connection wirklich löschen?", MsgBoxStyle.YesNo, "Bestätigung erforderlich:") ' wenn Löschen ja If result = MsgBoxResult.Yes Then - TBPM_CONNECTIONTableAdapter.Delete(ID) + TBDD_CONNECTIONTableAdapter.Delete(ID) load_connections() End If End If diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index 1ec2b91..9eeffb3 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -56,7 +56,7 @@ Partial Class frmFormDesigner Me.btnrefresh = New System.Windows.Forms.Button() Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() - Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter() + Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBWH_CHECK_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter() Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -366,7 +366,7 @@ Partial Class frmFormDesigner ' 'TBPM_CONNECTIONBindingSource ' - Me.TBPM_CONNECTIONBindingSource.DataMember = "TBPM_CONNECTION" + Me.TBPM_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" Me.TBPM_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet ' 'btndelete @@ -419,7 +419,6 @@ Partial Class frmFormDesigner ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBPM_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing @@ -514,7 +513,7 @@ Partial Class frmFormDesigner Friend WithEvents Label2 As System.Windows.Forms.Label Friend WithEvents btnVektor As System.Windows.Forms.Button Friend WithEvents TBPM_CONNECTIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter + Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter Friend WithEvents btnCheckbox As System.Windows.Forms.Button Friend WithEvents TBWH_CHECK_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBWH_CHECK_PROFILE_CONTROLSTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index e8a8d07..72713dd 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -44,7 +44,7 @@ Public Class frmFormDesigner TBPM_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString TBWH_CHECK_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = MyConnectionString TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = MyConnectionString - TBPM_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_CONNECTION) + TBPM_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) Catch ex As Exception MsgBox("Fehler bei Laden der Connection-Strings und Grunddaten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") End Try diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 9947f5c..1495510 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -238,7 +238,7 @@ Partial Class frmMain Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.Connection = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBPM_CONNECTIONTableAdapter = Nothing + Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb index 9477d2b..825de18 100644 --- a/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb @@ -319,7 +319,7 @@ Partial Class frmProfileDesigner Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource() Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() - Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter() + Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.Button4 = New System.Windows.Forms.Button() GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() @@ -771,7 +771,7 @@ Partial Class frmProfileDesigner Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.Connection = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBPM_CONNECTIONTableAdapter = Nothing + Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing @@ -1769,7 +1769,7 @@ Partial Class frmProfileDesigner ' 'TBPM_CONNECTIONBindingSource ' - Me.TBPM_CONNECTIONBindingSource.DataMember = "TBPM_CONNECTION" + Me.TBPM_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" Me.TBPM_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet ' 'Label4 @@ -3607,7 +3607,7 @@ Partial Class frmProfileDesigner Friend WithEvents Label14 As System.Windows.Forms.Label Friend WithEvents cmbConnection As System.Windows.Forms.ComboBox Friend WithEvents TBPM_CONNECTIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter + Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter Friend WithEvents SQL_COMMANDTextBox As System.Windows.Forms.TextBox Friend WithEvents btnSaveSQLCommand As System.Windows.Forms.Button Friend WithEvents Label15 As System.Windows.Forms.Label diff --git a/app/DD_PM_WINDREAM/frmProfileDesigner.vb b/app/DD_PM_WINDREAM/frmProfileDesigner.vb index bfc3bf8..52dd4b1 100644 --- a/app/DD_PM_WINDREAM/frmProfileDesigner.vb +++ b/app/DD_PM_WINDREAM/frmProfileDesigner.vb @@ -41,7 +41,7 @@ Public Class frmProfileDesigner Me.TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = MyConnectionString TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBPM_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBPM_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONNECTION) + Me.TBPM_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBDD_CONNECTION) Refresh_Profildaten() Catch ex As Exception MsgBox("Fehler bei Laden der Wertehilfen und Konfig-Daten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb index 78a2316..56f8297 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb @@ -23,14 +23,14 @@ Partial Class frmSQL_DESIGNER _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQL_DESIGNER)) Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() - Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter() + Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.TBPM_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.btnShowConnections = New System.Windows.Forms.Button() Me.Label14 = New System.Windows.Forms.Label() @@ -76,7 +76,8 @@ Partial Class frmSQL_DESIGNER 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False - Me.TableAdapterManager.TBPM_CONNECTIONTableAdapter = Me.TBPM_CONNECTIONTableAdapter + Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing + Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing @@ -86,7 +87,6 @@ Partial Class frmSQL_DESIGNER Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBPM_CONNECTIONTableAdapter @@ -95,7 +95,7 @@ Partial Class frmSQL_DESIGNER ' 'TBPM_CONNECTIONBindingSource ' - Me.TBPM_CONNECTIONBindingSource.DataMember = "TBPM_CONNECTION" + Me.TBPM_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" Me.TBPM_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet ' 'btnShowConnections @@ -179,8 +179,8 @@ Partial Class frmSQL_DESIGNER ' Me.dgvResult.AllowUserToAddRows = False Me.dgvResult.AllowUserToDeleteRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.Cyan - Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan + Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvResult.Location = New System.Drawing.Point(372, 373) Me.dgvResult.Name = "dgvResult" @@ -192,8 +192,8 @@ Partial Class frmSQL_DESIGNER ' Me.dgvPlaceholders.AllowUserToAddRows = False Me.dgvPlaceholders.AllowUserToDeleteRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan - Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan + Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace}) Me.dgvPlaceholders.Enabled = False @@ -348,7 +348,7 @@ Partial Class frmSQL_DESIGNER Friend WithEvents TBPM_PROFILE_FINAL_INDEXINGBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_PROFILE_FINAL_INDEXINGTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager - Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter + Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter Friend WithEvents TBPM_CONNECTIONBindingSource As System.Windows.Forms.BindingSource Friend WithEvents btnShowConnections As System.Windows.Forms.Button Friend WithEvents Label14 As System.Windows.Forms.Label diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.resx b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.resx index 2e5d97e..4eb4cd4 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.resx +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.resx @@ -129,9 +129,6 @@ 794, 17 - - 1212, 17 - 967, 17 diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index 0649c0b..f5721a0 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -14,7 +14,7 @@ Public Class frmSQL_DESIGNER Try lblSaveFinalIndex.Visible = False TBPM_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString - TBPM_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_CONNECTION) + TBPM_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Connection.ConnectionString = MyConnectionString CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBPM_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_CONTROL_ID), True) @@ -229,4 +229,8 @@ Public Class frmSQL_DESIGNER Me.SQL_COMMANDTextBox.SelectionStart = altePosition + val.Length End If End Sub + + Private Sub btnShowConnections_Click(sender As Object, e As EventArgs) Handles btnShowConnections.Click + frmConnection.ShowDialog() + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index 3bb4285..c7ed1e6 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -48,7 +48,7 @@ Partial Class frmValidator Me.pnldesigner = New System.Windows.Forms.Panel() Me.VWPM_PROFILE_USERTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_PROFILE_USERTableAdapter() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() - Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter() + Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.TBPM_CONTROL_TABLETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() Me.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_FILES_USER_NOT_INDEXEDTableAdapter() Me.TBPM_KONFIGURATIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() @@ -397,7 +397,7 @@ Partial Class frmValidator ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBPM_CONNECTIONTableAdapter = Me.TBPM_CONNECTIONTableAdapter + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Me.TBPM_CONNECTIONTableAdapter Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Me.TBPM_CONTROL_TABLETableAdapter Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Me.TBPM_FILES_USER_NOT_INDEXEDTableAdapter @@ -462,7 +462,7 @@ Partial Class frmValidator ' 'TBPM_CONNECTIONBindingSource ' - Me.TBPM_CONNECTIONBindingSource.DataMember = "TBPM_CONNECTION" + Me.TBPM_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" Me.TBPM_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet ' 'TBPM_PROFILE_FILESBindingSource @@ -1099,7 +1099,7 @@ Partial Class frmValidator Friend WithEvents TBPM_FILES_USER_NOT_INDEXEDBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_PROFILE_CONTROLSTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter Friend WithEvents TBPM_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter + Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter Friend WithEvents TBPM_CONNECTIONBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_PROFILE_FILESTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter Friend WithEvents TBPM_PROFILE_FILESBindingSource As System.Windows.Forms.BindingSource diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 77353e2..e95df97 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -311,7 +311,7 @@ Public Class frmValidator VWPM_PROFILE_USERTableAdapter.FillByName(DD_DMSLiteDataSet.VWPM_PROFILE_USER, CURRENT_ProfilName, Environment.UserName) VWPM_CONTROL_INDEXTableAdapter.Fill(DD_DMSLiteDataSet.VWPM_CONTROL_INDEX, CURRENT_ProfilName) - TBPM_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_CONNECTION) + TBPM_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) If LogErrorsOnly = False Then ClassLogger.Add(" >> Profile Data geladen", False) Catch ex As Exception MsgBox("Error LOADING profile-data:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") @@ -427,11 +427,11 @@ Public Class frmValidator Exit Sub End If - TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBPM_CONNECTION, ConnectionId) + TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBDD_CONNECTION, ConnectionId) Dim connectionString As String - For Each row As DataRow In DD_DMSLiteDataSet.TBPM_CONNECTION.Rows + For Each row As DataRow In DD_DMSLiteDataSet.TBDD_CONNECTION.Rows Select Case row.Item("SQL_PROVIDER").ToString().ToLower() Case "ms-sql" If row.Item("USERNAME") = "WINAUTH" Then @@ -548,8 +548,8 @@ Public Class frmValidator If ConID > 0 And commandsql <> "" Then If LogErrorsOnly = False Then ClassLogger.Add(" >> CConID > 0 And TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)", False) Dim connectionString As String - TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBPM_CONNECTION, ConID) - Dim DTConnection As DataTable = DD_DMSLiteDataSet.TBPM_CONNECTION + TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBDD_CONNECTION, ConID) + Dim DTConnection As DataTable = DD_DMSLiteDataSet.TBDD_CONNECTION Dim drConnection As DataRow For Each drConnection In DTConnection.Rows Select Case drConnection.Item("SQL_PROVIDER").ToString.ToLower @@ -776,8 +776,8 @@ Public Class frmValidator If ConID > 0 And commandsql <> "" Then If LogErrorsOnly = False Then ClassLogger.Add(" >> CConID > 0 And TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)", False) Dim connectionString As String - TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBPM_CONNECTION, ConID) - Dim DT As DataTable = DD_DMSLiteDataSet.TBPM_CONNECTION + TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBDD_CONNECTION, ConID) + Dim DT As DataTable = DD_DMSLiteDataSet.TBDD_CONNECTION Dim drConnection As DataRow For Each drConnection In DT.Rows Select Case drConnection.Item("SQL_PROVIDER").ToString.ToLower @@ -2892,7 +2892,7 @@ Public Class frmValidator Try Dim connectionString As String Dim DTConnection As DataTable - DTConnection = DD_DMSLiteDataSet.TBPM_CONNECTION + DTConnection = DD_DMSLiteDataSet.TBDD_CONNECTION Dim drConnection As DataRow For Each drConnection In DTConnection.Rows If drConnection.Item("GUID") = id Then