From 003d34cf620703537eefb96bf67ede5a6be8ede0 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 20 Mar 2020 10:59:10 +0100 Subject: [PATCH] Don't allow null for manual index: windream index --- Global_Indexer/MyDataset.Designer.vb | 23 +---- Global_Indexer/MyDataset.vb | 3 + Global_Indexer/MyDataset.xsd | 92 +++++++++---------- Global_Indexer/MyDataset.xss | 132 +++++++++++---------------- 4 files changed, 106 insertions(+), 144 deletions(-) diff --git a/Global_Indexer/MyDataset.Designer.vb b/Global_Indexer/MyDataset.Designer.vb index 43f5199..99d1ec5 100644 --- a/Global_Indexer/MyDataset.Designer.vb +++ b/Global_Indexer/MyDataset.Designer.vb @@ -3563,6 +3563,7 @@ Partial Public Class MyDataset Me.columnDOK_ID.AllowDBNull = false Me.columnNAME.AllowDBNull = false Me.columnNAME.MaxLength = 50 + Me.columnWD_INDEX.AllowDBNull = false Me.columnWD_INDEX.MaxLength = 50 Me.columnCOMMENT.MaxLength = 150 Me.columnDATATYPE.DefaultValue = CType("VARCHAR",String) @@ -13048,11 +13049,7 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property WD_INDEX() As String Get - Try - Return CType(Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte WD_INDEX in Tabelle TBDD_INDEX_MAN ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn),String) End Get Set Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn) = value @@ -13307,18 +13304,6 @@ Partial Public Class MyDataset End Set End Property - _ - Public Function IsWD_INDEXNull() As Boolean - Return Me.IsNull(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn) - End Function - - _ - Public Sub SetWD_INDEXNull() - Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn) = Global.System.Convert.DBNull - End Sub - _ Public Function IsCOMMENTNull() As Boolean @@ -20947,7 +20932,7 @@ Namespace MyDatasetTableAdapters Me.Adapter.InsertCommand.Parameters(1).Value = CType(NAME,String) End If If (WD_INDEX Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("WD_INDEX") Else Me.Adapter.InsertCommand.Parameters(2).Value = CType(WD_INDEX,String) End If @@ -21045,7 +21030,7 @@ Namespace MyDatasetTableAdapters Me.Adapter.UpdateCommand.Parameters(1).Value = CType(NAME,String) End If If (WD_INDEX Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("WD_INDEX") Else Me.Adapter.UpdateCommand.Parameters(2).Value = CType(WD_INDEX,String) End If diff --git a/Global_Indexer/MyDataset.vb b/Global_Indexer/MyDataset.vb index 5a43f0e..5c1ec2c 100644 --- a/Global_Indexer/MyDataset.vb +++ b/Global_Indexer/MyDataset.vb @@ -1,6 +1,9 @@  Partial Public Class MyDataset + Partial Public Class TBDD_INDEX_MANDataTable + End Class + Partial Public Class TBDD_INDEX_MAN_POSTPROCESSINGDataTable Private Sub TBDD_INDEX_MAN_POSTPROCESSINGDataTable_ColumnChanging(sender As Object, e As DataColumnChangeEventArgs) Handles Me.ColumnChanging If (e.Column.ColumnName = Me.COMMENTColumn.ColumnName) Then diff --git a/Global_Indexer/MyDataset.xsd b/Global_Indexer/MyDataset.xsd index fadd1af..479df22 100644 --- a/Global_Indexer/MyDataset.xsd +++ b/Global_Indexer/MyDataset.xsd @@ -379,7 +379,7 @@ SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALU - + @@ -421,7 +421,7 @@ SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALU - + @@ -1691,7 +1691,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1756,7 +1756,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1839,7 +1839,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1876,7 +1876,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1890,7 +1890,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1904,7 +1904,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1916,7 +1916,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1986,7 +1986,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2059,7 +2059,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2172,7 +2172,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2268,7 +2268,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2323,7 +2323,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2331,7 +2331,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2381,7 +2381,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2453,7 +2453,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2534,7 +2534,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2548,7 +2548,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2557,7 +2557,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2582,7 +2582,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2621,7 +2621,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2693,7 +2693,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2732,7 +2732,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2746,7 +2746,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2792,7 +2792,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2852,7 +2852,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2884,7 +2884,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2922,7 +2922,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2944,7 +2944,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2956,7 +2956,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -3092,21 +3092,21 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Global_Indexer/MyDataset.xss b/Global_Indexer/MyDataset.xss index 4a0bae4..1ae3e72 100644 --- a/Global_Indexer/MyDataset.xss +++ b/Global_Indexer/MyDataset.xss @@ -4,41 +4,39 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - + 431 @@ -50,19 +48,19 @@ - + - 543 + 535 386 - 543 - 656 + 535 + 638 - + 397 @@ -74,14 +72,14 @@ - + - 605 - 656 + 597 + 638 - 605 + 597 148 @@ -90,7 +88,7 @@ - + 959 @@ -102,23 +100,7 @@ - - - - 1096 - 262 - - - 1047 - 262 - - - 1047 - 228 - - - - + 951 @@ -134,27 +116,19 @@ - + - 94 - 0 - - - 94 - -30 - - - 94 - -30 + 397 + 663 - 94 - 0 + 456 + 663 - + 129 @@ -170,7 +144,7 @@ - + 183 @@ -182,7 +156,7 @@ - + 88 @@ -202,7 +176,7 @@ - + 117 @@ -222,7 +196,7 @@ - + 765 @@ -238,7 +212,7 @@ - + 409 @@ -258,7 +232,7 @@ - + 38 @@ -278,7 +252,7 @@ - + 380