diff --git a/Global_Indexer/MyDataset.Designer.vb b/Global_Indexer/MyDataset.Designer.vb index 6ae4c1c..3b774e8 100644 --- a/Global_Indexer/MyDataset.Designer.vb +++ b/Global_Indexer/MyDataset.Designer.vb @@ -1348,14 +1348,6 @@ Partial Public Class MyDataset Private columnEMAIL As Global.System.Data.DataColumn - Private columnLOGGED_IN As Global.System.Data.DataColumn - - Private columnLOGGED_WHERE As Global.System.Data.DataColumn - - Private columnLOG_IN_WHEN As Global.System.Data.DataColumn - - Private columnLOG_OUT_WHEN As Global.System.Data.DataColumn - Private columnADDED_WHO As Global.System.Data.DataColumn Private columnADDED_WHEN As Global.System.Data.DataColumn @@ -1443,38 +1435,6 @@ Partial Public Class MyDataset End Get End Property - _ - Public ReadOnly Property LOGGED_INColumn() As Global.System.Data.DataColumn - Get - Return Me.columnLOGGED_IN - End Get - End Property - - _ - Public ReadOnly Property LOGGED_WHEREColumn() As Global.System.Data.DataColumn - Get - Return Me.columnLOGGED_WHERE - End Get - End Property - - _ - Public ReadOnly Property LOG_IN_WHENColumn() As Global.System.Data.DataColumn - Get - Return Me.columnLOG_IN_WHEN - End Get - End Property - - _ - Public ReadOnly Property LOG_OUT_WHENColumn() As Global.System.Data.DataColumn - Get - Return Me.columnLOG_OUT_WHEN - End Get - End Property - _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn @@ -1560,9 +1520,9 @@ Partial Public Class MyDataset _ - Public Overloads Function AddTBDD_USERRow(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, ByVal LOGGED_IN As Boolean, ByVal LOGGED_WHERE As String, ByVal LOG_IN_WHEN As Date, ByVal LOG_OUT_WHEN As Date, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal SHORTNAME As String, ByVal LANGUAGE As String) As TBDD_USERRow + Public Overloads Function AddTBDD_USERRow(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal SHORTNAME As String, ByVal LANGUAGE As String) As TBDD_USERRow Dim rowTBDD_USERRow As TBDD_USERRow = CType(Me.NewRow,TBDD_USERRow) - Dim columnValuesArray() As Object = New Object() {Nothing, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SHORTNAME, LANGUAGE} + Dim columnValuesArray() As Object = New Object() {Nothing, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SHORTNAME, LANGUAGE} rowTBDD_USERRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBDD_USERRow) Return rowTBDD_USERRow @@ -1596,10 +1556,6 @@ Partial Public Class MyDataset Me.columnNAME = MyBase.Columns("NAME") Me.columnUSERNAME = MyBase.Columns("USERNAME") Me.columnEMAIL = MyBase.Columns("EMAIL") - Me.columnLOGGED_IN = MyBase.Columns("LOGGED_IN") - Me.columnLOGGED_WHERE = MyBase.Columns("LOGGED_WHERE") - Me.columnLOG_IN_WHEN = MyBase.Columns("LOG_IN_WHEN") - Me.columnLOG_OUT_WHEN = MyBase.Columns("LOG_OUT_WHEN") Me.columnADDED_WHO = MyBase.Columns("ADDED_WHO") Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") @@ -1621,14 +1577,6 @@ Partial Public Class MyDataset MyBase.Columns.Add(Me.columnUSERNAME) Me.columnEMAIL = New Global.System.Data.DataColumn("EMAIL", GetType(String), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnEMAIL) - Me.columnLOGGED_IN = New Global.System.Data.DataColumn("LOGGED_IN", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnLOGGED_IN) - Me.columnLOGGED_WHERE = New Global.System.Data.DataColumn("LOGGED_WHERE", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnLOGGED_WHERE) - Me.columnLOG_IN_WHEN = New Global.System.Data.DataColumn("LOG_IN_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnLOG_IN_WHEN) - Me.columnLOG_OUT_WHEN = New Global.System.Data.DataColumn("LOG_OUT_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnLOG_OUT_WHEN) Me.columnADDED_WHO = New Global.System.Data.DataColumn("ADDED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnADDED_WHO) Me.columnADDED_WHEN = New Global.System.Data.DataColumn("ADDED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) @@ -1651,9 +1599,6 @@ Partial Public Class MyDataset Me.columnUSERNAME.AllowDBNull = false Me.columnUSERNAME.MaxLength = 50 Me.columnEMAIL.MaxLength = 100 - Me.columnLOGGED_IN.AllowDBNull = false - Me.columnLOGGED_IN.DefaultValue = CType(false,Boolean) - Me.columnLOGGED_WHERE.MaxLength = 50 Me.columnADDED_WHO.AllowDBNull = false Me.columnADDED_WHO.MaxLength = 50 Me.columnCHANGED_WHO.MaxLength = 50 @@ -12659,62 +12604,6 @@ Partial Public Class MyDataset End Set End Property - _ - Public Property LOGGED_IN() As Boolean - Get - Return CType(Me(Me.tableTBDD_USER.LOGGED_INColumn),Boolean) - End Get - Set - Me(Me.tableTBDD_USER.LOGGED_INColumn) = value - End Set - End Property - - _ - Public Property LOGGED_WHERE() As String - Get - Try - Return CType(Me(Me.tableTBDD_USER.LOGGED_WHEREColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte LOGGED_WHERE in Tabelle TBDD_USER ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBDD_USER.LOGGED_WHEREColumn) = value - End Set - End Property - - _ - Public Property LOG_IN_WHEN() As Date - Get - Try - Return CType(Me(Me.tableTBDD_USER.LOG_IN_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte LOG_IN_WHEN in Tabelle TBDD_USER ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBDD_USER.LOG_IN_WHENColumn) = value - End Set - End Property - - _ - Public Property LOG_OUT_WHEN() As Date - Get - Try - Return CType(Me(Me.tableTBDD_USER.LOG_OUT_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte LOG_OUT_WHEN in Tabelle TBDD_USER ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBDD_USER.LOG_OUT_WHENColumn) = value - End Set - End Property - _ Public Property ADDED_WHO() As String @@ -12833,42 +12722,6 @@ Partial Public Class MyDataset Me(Me.tableTBDD_USER.EMAILColumn) = Global.System.Convert.DBNull End Sub - _ - Public Function IsLOGGED_WHERENull() As Boolean - Return Me.IsNull(Me.tableTBDD_USER.LOGGED_WHEREColumn) - End Function - - _ - Public Sub SetLOGGED_WHERENull() - Me(Me.tableTBDD_USER.LOGGED_WHEREColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsLOG_IN_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBDD_USER.LOG_IN_WHENColumn) - End Function - - _ - Public Sub SetLOG_IN_WHENNull() - Me(Me.tableTBDD_USER.LOG_IN_WHENColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsLOG_OUT_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBDD_USER.LOG_OUT_WHENColumn) - End Function - - _ - Public Sub SetLOG_OUT_WHENNull() - Me(Me.tableTBDD_USER.LOG_OUT_WHENColumn) = Global.System.Convert.DBNull - End Sub - _ Public Function IsADDED_WHENNull() As Boolean @@ -19713,10 +19566,6 @@ Namespace MyDatasetTableAdapters tableMapping.ColumnMappings.Add("NAME", "NAME") tableMapping.ColumnMappings.Add("USERNAME", "USERNAME") tableMapping.ColumnMappings.Add("EMAIL", "EMAIL") - tableMapping.ColumnMappings.Add("LOGGED_IN", "LOGGED_IN") - tableMapping.ColumnMappings.Add("LOGGED_WHERE", "LOGGED_WHERE") - tableMapping.ColumnMappings.Add("LOG_IN_WHEN", "LOG_IN_WHEN") - tableMapping.ColumnMappings.Add("LOG_OUT_WHEN", "LOG_OUT_WHEN") tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") @@ -19726,9 +19575,36 @@ Namespace MyDatasetTableAdapters 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 TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBDD_USER] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_PRENAME = "& _ + "1 AND [PRENAME] IS NULL) OR ([PRENAME] = @Original_PRENAME)) AND ((@IsNull_NAME "& _ + "= 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([USERNAME] = @Origina"& _ + "l_USERNAME) AND ((@IsNull_EMAIL = 1 AND [EMAIL] IS NULL) OR ([EMAIL] = @Original"& _ + "_EMAIL)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AN"& _ + "D [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_"& _ + "CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED"& _ + "_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_W"& _ + "HEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAME] IS N"& _ + "ULL) OR ([SHORTNAME] = @Original_SHORTNAME)) AND ([LANGUAGE] = @Original_LANGUAG"& _ + "E))" 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.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_PRENAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PRENAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_EMAIL", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_EMAIL", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_SHORTNAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LANGUAGE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LANGUAGE", 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 TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PRENAME, NAME, USERNAME, EMAIL, "& _ @@ -19778,15 +19654,13 @@ Namespace MyDatasetTableAdapters Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_"& _ - "IN_WHEN, LOG_OUT_WHEN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SHORTNA"& _ - "ME, LANGUAGE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_USER" + Me._commandCollection(0).CommandText = "SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGE"& _ + "D_WHO, CHANGED_WHEN, SHORTNAME, LANGUAGE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_USER" 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 = "SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_"& _ - "IN_WHEN, LOG_OUT_WHEN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, LANGUAG"& _ - "E, SHORTNAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_USER" + Me._commandCollection(1).CommandText = "SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGE"& _ + "D_WHO, CHANGED_WHEN, LANGUAGE, SHORTNAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_USER" Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text End Sub @@ -19870,8 +19744,72 @@ Namespace MyDatasetTableAdapters 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.Delete, true)> _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_PRENAME As String, ByVal Original_NAME As String, ByVal Original_USERNAME As String, ByVal Original_EMAIL As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_SHORTNAME As String, ByVal Original_LANGUAGE As String) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + If (Original_PRENAME Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(2).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_PRENAME,String) + End If + If (Original_NAME Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(4).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_NAME,String) + End If + If (Original_USERNAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_USERNAME") + Else + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_USERNAME,String) + End If + If (Original_EMAIL Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(7).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(Original_EMAIL,String) + End If + If (Original_ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Else + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_ADDED_WHO,String) + End If + If (Original_ADDED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_ADDED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = Global.System.DBNull.Value + End If + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(12).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(12).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(13).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(14).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(13).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(14).Value = Global.System.DBNull.Value + End If + If (Original_SHORTNAME Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(15).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(16).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(15).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(16).Value = CType(Original_SHORTNAME,String) + End If + If (Original_LANGUAGE Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_LANGUAGE") + Else + Me.Adapter.DeleteCommand.Parameters(17).Value = CType(Original_LANGUAGE,String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/Global_Indexer/MyDataset.xsc b/Global_Indexer/MyDataset.xsc index 34cb1c7..842f8e2 100644 --- a/Global_Indexer/MyDataset.xsc +++ b/Global_Indexer/MyDataset.xsc @@ -8,16 +8,6 @@ - - - - - - - - - - diff --git a/Global_Indexer/MyDataset.xsd b/Global_Indexer/MyDataset.xsd index a7aac26..de20ef5 100644 --- a/Global_Indexer/MyDataset.xsd +++ b/Global_Indexer/MyDataset.xsd @@ -12,53 +12,69 @@ - DELETE FROM TBDD_USER -WHERE (GUID = @Original_GUID) + DELETE FROM [TBDD_USER] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_PRENAME = 1 AND [PRENAME] IS NULL) OR ([PRENAME] = @Original_PRENAME)) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([USERNAME] = @Original_USERNAME) AND ((@IsNull_EMAIL = 1 AND [EMAIL] IS NULL) OR ([EMAIL] = @Original_EMAIL)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAME] IS NULL) OR ([SHORTNAME] = @Original_SHORTNAME)) AND ([LANGUAGE] = @Original_LANGUAGE)) - + + + + + + + + + + + + + + + + + + - + INSERT INTO TBDD_USER (PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, LANGUAGE, SHORTNAME) VALUES (@PRENAME,@NAME,@USERNAME,@EMAIL,@ADDED_WHO,@LANGUAGE,@SHORTNAME); SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, GI_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - + + + + + + + - SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SHORTNAME, LANGUAGE + SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SHORTNAME, LANGUAGE FROM TBDD_USER - + UPDATE TBDD_USER SET PRENAME = @PRENAME, NAME = @NAME, USERNAME = @USERNAME, EMAIL = @EMAIL, CHANGED_WHO = @CHANGED_WHO, LANGUAGE = @LANGUAGE, SHORTNAME = @SHORTNAME WHERE (GUID = @Original_GUID); SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, GI_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = @GUID) - - - - - - - - - + + + + + + + + + @@ -70,10 +86,6 @@ SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHE - - - - @@ -82,10 +94,10 @@ SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHE - + - SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, LANGUAGE, SHORTNAME + SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, LANGUAGE, SHORTNAME FROM TBDD_USER @@ -1743,7 +1755,7 @@ ORDER BY GUID DESC - + @@ -1775,16 +1787,6 @@ ORDER BY GUID DESC - - - - - - - - - - @@ -1818,7 +1820,7 @@ ORDER BY GUID DESC - + @@ -1901,7 +1903,7 @@ ORDER BY GUID DESC - + @@ -1938,7 +1940,7 @@ ORDER BY GUID DESC - + @@ -1952,7 +1954,7 @@ ORDER BY GUID DESC - + @@ -1966,7 +1968,7 @@ ORDER BY GUID DESC - + @@ -2048,7 +2050,7 @@ ORDER BY GUID DESC - + @@ -2121,7 +2123,7 @@ ORDER BY GUID DESC - + @@ -2234,7 +2236,7 @@ ORDER BY GUID DESC - + @@ -2330,7 +2332,7 @@ ORDER BY GUID DESC - + @@ -2385,7 +2387,7 @@ ORDER BY GUID DESC - + @@ -2393,7 +2395,7 @@ ORDER BY GUID DESC - + @@ -2443,7 +2445,7 @@ ORDER BY GUID DESC - + @@ -2515,7 +2517,7 @@ ORDER BY GUID DESC - + @@ -2596,7 +2598,7 @@ ORDER BY GUID DESC - + @@ -2610,7 +2612,7 @@ ORDER BY GUID DESC - + @@ -2619,7 +2621,7 @@ ORDER BY GUID DESC - + @@ -2649,7 +2651,7 @@ ORDER BY GUID DESC - + @@ -2674,7 +2676,7 @@ ORDER BY GUID DESC - + @@ -2713,7 +2715,7 @@ ORDER BY GUID DESC - + @@ -2745,7 +2747,7 @@ ORDER BY GUID DESC - + @@ -2817,7 +2819,7 @@ ORDER BY GUID DESC - + @@ -2856,7 +2858,7 @@ ORDER BY GUID DESC - + @@ -2870,7 +2872,7 @@ ORDER BY GUID DESC - + @@ -2916,7 +2918,7 @@ ORDER BY GUID DESC - + @@ -2976,7 +2978,7 @@ ORDER BY GUID DESC - + @@ -3008,7 +3010,7 @@ ORDER BY GUID DESC - + @@ -3046,7 +3048,7 @@ ORDER BY GUID DESC - + @@ -3068,7 +3070,7 @@ ORDER BY GUID DESC - + @@ -3189,21 +3191,21 @@ ORDER BY GUID DESC - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Global_Indexer/MyDataset.xss b/Global_Indexer/MyDataset.xss index 013941a..a40f0f5 100644 --- a/Global_Indexer/MyDataset.xss +++ b/Global_Indexer/MyDataset.xss @@ -6,7 +6,7 @@ --> - +