fixed/redesigned DBsheet re-assignment

fixed DBSheet design tool:
  non-functional dbsheet definitions can now be read (without missing columns),
  design workflow is now better shown by disabled buttons.
  fixed save DBsheet definition
fixed DBsetQuery calcmode assignment (and also DBsetpowerquery)

Author: rkapl123

Distribution/DBaddin32.xll

@@ -21,8 +21,8 @@ Public Module DBSheetConfig
     ''' <summary>the Database table name of the DBSheet</summary>
     Dim tableName As String
     ''' <summary>counter to know how many cells we filled for the db-mapper query 
-    ''' (at least 2: dbsetquery function and query string, if additional where clause exists, 
-    ''' add one for where clause, then one for each parameter)
+    ''' (at least 2: dbsetquery function and query string, if an additional where clause exists, 
+    ''' add one for this where clause and then one for each parameter)
     ''' </summary>
     Dim addedCells As Integer
     ''' <summary>these three need to be global, so that finishDBMapperCreation also knows about them</summary>
@@ -35,7 +35,7 @@ Public Module DBSheetConfig
     Public existingName As String
 
 
-    ''' <summary>create lookups (with dblistfetch) and a dbsetquery that acts as a list-object for a CUD DB Mapper</summary>
+    ''' <summary>create a DBSheet by creating lookups (with dblistfetch) and a dbsetquery that acts as a list-object for a CUD DBMapper. Called by clickAssignDBSheet (Ribbon) and assignDBSheet_Click (DBSheetCreateForm)</summary>
     Public Sub createDBSheet(Optional dbsheetDefPath As String = "")
         If ExcelDnaUtil.Application.ActiveWorkbook.Windows(1).WindowState = Excel.XlWindowState.xlMinimized Then
             UserMsg("No assignment possible when active workbook is minimized!", "DBSheet Creation Error")
@@ -121,7 +121,9 @@ Public Module DBSheetConfig
                     lookupWS = ExcelDnaUtil.Application.ActiveWorkbook.Worksheets.Add()
                     lookupWS.Name = "DBSheetLookups"
                 Else
-                    If QuestionMsg("Existing DBSheetLookups sheet detected, should all lookup definitions be removed (if definitions with existing names are added, this might lead to errors)?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+                    Dim answer As MsgBoxResult = QuestionMsg("Existing DBSheetLookups sheet detected, should all lookup definitions be removed (if definitions with existing names but different meanings are added, this might lead to errors)?", MsgBoxStyle.YesNoCancel)
+                    If answer = MsgBoxResult.Cancel Then Exit Sub
+                    If answer = MsgBoxResult.Yes Then
                         ExcelDnaUtil.Application.Worksheets("DBSheetLookups").Cells.Clear
                         For Each LookupDef As String In lookupsList
                             Dim lookupRangeName As String = tableName + Replace(getEntry("name", LookupDef, 1), specialNonNullableChar, "") + "Lookup"
@@ -220,19 +222,25 @@ Public Module DBSheetConfig
             queryStr = Replace(queryStr, selectPart, selectPartModif)
             ' then create the DBSetQuery assigning the (yet to be filled) query to the above list-object
             ' add DBSetQuery with queryStr as Basis for the final DBMapper
-            ' first create a ListObject, but only if it doesn't exist already (to allow recreating DBSheets)
+            ' if DBMapper already exists remove everything to allow recreating DBSheets
             If existingName <> "" Then
-                ' get the existing list-object
                 Try
-                    createdListObject = curCell.Offset(0, 1).ListObject
+                    If curCell.Column = 1 And curCell.Row = 1 Then curCell.EntireColumn.ColumnWidth = 10 ' reset minimized column, otherwise list object looks stupid.
+                    curCell.Offset(0, 1).ListObject.Delete()
+                    ExcelDnaUtil.Application.ActiveWindow.FreezePanes = False ' remove the freeze-pane, it will be applied later again.
+                    ExcelDnaUtil.Application.ActiveWorkbook.Names(existingName).Delete
+                    Dim theCustomXmlParts As Object = ExcelDnaUtil.Application.ActiveWorkbook.CustomXMLParts.SelectByNamespace("DBModifDef")
+                    ' remove old node of DBMapper in definitions
+                    If Not IsNothing(theCustomXmlParts(1).SelectSingleNode("/ns0:root/ns0:DBMapper[@Name='" + Replace(existingName, "DBMapper", "") + "']")) Then theCustomXmlParts(1).SelectSingleNode("/ns0:root/ns0:DBMapper[@Name='" + Replace(existingName, "DBMapper", "") + "']").Delete
                 Catch ex As Exception
-                    UserMsg("Error getting existing list-object for DBSheet for table " + tableName + ": " + ex.Message, "DBSheet Creation Error")
+                    UserMsg("Error deleting existing list-object for DBSheet for table " + tableName + ": " + ex.Message, "DBSheet Creation Error")
                     Exit Sub
                 End Try
-            Else
-                createdListObject = createListObject(curCell)
-                If createdListObject Is Nothing Then Exit Sub
             End If
+            ' create a ListObject
+            createdListObject = createListObject(curCell)
+            If createdListObject Is Nothing Then Exit Sub
+
             With curCell
                 ' add the query as text
                 Try
@@ -257,12 +265,9 @@ Public Module DBSheetConfig
             End With
             ' finally add the DBSetQuery for the main DB Mapper, only taking the query without the where clause (because we can't prefill the where parameters, 
             ' the user has to do that before extending the query definition to the where clause as well)
-            If existingName <> "" Then
-                createdListObject.QueryTable.PreserveColumnInfo = False
-            Else
-                createFunctionsInCells(curCell, {"RC", "=DBSetQuery(R[1]C,"""",RC[1])"})
-            End If
-            ' finish creation in async called function (need to have the results from the above createFunctionsInCells/invocations)
+            ' only create DBSetQuery if a completely new DBSheet is created, when overwriting an existing don't do this as it triggers a unwanted premature recalculation.
+            If existingName = "" Then createFunctionsInCells(curCell, {"RC", "=DBSetQuery(R[1]C,"""",RC[1])"})
+            ' finish creation in async called sub (need to have the results from the above createFunctionsInCells/invocations)
             ExcelAsyncUtil.QueueAsMacro(Sub()
                                             finishDBMapperCreation()
                                         End Sub)
@@ -271,20 +276,6 @@ Public Module DBSheetConfig
 
     ''' <summary>after creating lookups and setting the dbsetquery finish the list-object area with reverse lookups and drop-downs</summary>
     Private Sub finishDBMapperCreation()
-        If existingName <> "" Then
-            ' if there was an already an existing dbsheet, remove the Range name, the DBMapper definition and finally the validations
-            ExcelDnaUtil.Application.ActiveWindow.FreezePanes = False ' remove the freeze-pane, it will be applied later again.
-            ExcelDnaUtil.Application.ActiveWorkbook.Names(existingName).Delete
-            Dim curColumnCount As Integer = getEntryList("columns", "field", "", curConfig).Length()
-            curColumnCount = createdListObject.ListColumns.Count - curColumnCount
-            For i As Integer = 1 To curColumnCount
-                createdListObject.ListColumns(createdListObject.ListColumns.Count).Delete()
-            Next
-            Dim theCustomXmlParts As Object = ExcelDnaUtil.Application.ActiveWorkbook.CustomXMLParts.SelectByNamespace("DBModifDef")
-            ' remove old node of DBMapper in definitions
-            If Not IsNothing(theCustomXmlParts(1).SelectSingleNode("/ns0:root/ns0:DBMapper[@Name='" + Replace(existingName, "DBMapper", "") + "']")) Then theCustomXmlParts(1).SelectSingleNode("/ns0:root/ns0:DBMapper[@Name='" + Replace(existingName, "DBMapper", "") + "']").Delete
-            createdListObject.Range.Validation.Delete()
-        End If
 
         ' store lookup columns (<>LU) to be ignored in DBMapper
         Dim queryErrorPos As Integer = InStr(curCell.Value.ToString(), "Error")
@@ -296,12 +287,12 @@ Public Module DBSheetConfig
         ' name the worksheet to tableName, if defined in the settings
         If fetchSettingBool("DBSheetAutoName", "False") Then
             Try
-                curCell.Parent.Name = Left(tableName, 31)
+                curCell.Parent.Name = Left(tableName, 31) ' prevent errors due to long names
             Catch ex As Exception
                 UserMsg("DBSheet setting worksheet name to '" + Left(tableName, 31) + "', error:" + ex.Message, "DBSheet Creation Error")
             End Try
         End If
-        ' some visual aid for DBSheets
+        ' for "full" DBSheets, minimize first column as much as possible
         If curCell.Column = 1 And curCell.Row = 1 Then curCell.EntireColumn.ColumnWidth = 0.4
         Dim ignoreColumns As String = ""
         Try
@@ -319,7 +310,7 @@ Public Module DBSheetConfig
                     End If
 
                     ' ..... create dropdown (validation) for lookup column
-                    ' a workaround with getting the local formula is necessary as Formula1 in Validation.Add doesn't accept English formulas
+                    ' workaround by setting formula in a temporary cell to get the local language formula. This is necessary as Formula1 in Validation.Add doesn't accept English formulas
                     curCell.Offset(2 + addedCells, 0).Formula = "=OFFSET(" + lookupRangeName + ",0,0,,1)"
                     ' necessary as Excel>=2016 introduces the @operator automatically in formulas referring to list objects, referring to just that value in the same row. which is undesired here..
                     Dim localOffsetFormula As String = Replace(curCell.Offset(2 + addedCells, 0).FormulaLocal.ToString(), "@", "")
@@ -339,15 +330,13 @@ Public Module DBSheetConfig
                     Try
                         ' if nothing was fetched, there is no DataBodyRange, so add validation to the second row of the column range...
                         If IsNothing(lookupColumn.DataBodyRange) Then
-                            lookupColumn.Range.Cells(2, 1).Validation.Delete ' remove existing validations, just in case it exists, otherwise add would throw exception... 
+                            lookupColumn.Range.Cells(2, 1).Validation.Delete() ' remove existing validations, just in case it exists, otherwise add would throw exception... 
                             lookupColumn.Range.Cells(2, 1).Validation.Add(
-                                Type:=Excel.XlDVType.xlValidateList, AlertStyle:=Excel.XlDVAlertStyle.xlValidAlertStop, Operator:=Excel.XlFormatConditionOperator.xlEqual,
-                                Formula1:=localOffsetFormula)
+                                Type:=Excel.XlDVType.xlValidateList, AlertStyle:=Excel.XlDVAlertStyle.xlValidAlertStop, Operator:=Excel.XlFormatConditionOperator.xlEqual, Formula1:=localOffsetFormula)
                         Else
                             lookupColumn.DataBodyRange.Validation.Delete()   ' remove existing validations, just in case it exists, otherwise add would throw exception... 
                             lookupColumn.DataBodyRange.Validation.Add(
-                                Type:=Excel.XlDVType.xlValidateList, AlertStyle:=Excel.XlDVAlertStyle.xlValidAlertStop, Operator:=Excel.XlFormatConditionOperator.xlEqual,
-                                Formula1:=localOffsetFormula)
+                                Type:=Excel.XlDVType.xlValidateList, AlertStyle:=Excel.XlDVAlertStyle.xlValidAlertStop, Operator:=Excel.XlFormatConditionOperator.xlEqual, Formula1:=localOffsetFormula)
                         End If
                     Catch ex As Exception
                         UserMsg("Error in adding validation formula " + localOffsetFormula + " to column " + lookupColumn.Name + ": " + ex.Message, "DBSheet Creation Error")

Distribution/DBaddin64.xll

@@ -319,6 +319,7 @@ Public Class DBSheetCreateForm
                 UserMsg("Exception in DBSheetCols_CellValueChanged: " + ex.Message)
             End Try
         End If
+        assignDBSheet.Enabled = False
         DBSheetCols.AutoResizeColumns()
         FormDisabled = False
     End Sub
@@ -375,12 +376,14 @@ Public Class DBSheetCreateForm
                 DirectCast(DBSheetCols.Rows(selRowIndex).Cells("fkey"), DataGridViewComboBoxCell).DataSource = forColsList
                 DirectCast(DBSheetCols.Rows(selRowIndex).Cells("flookup"), DataGridViewComboBoxCell).DataSource = forColsList
             End If
+            assignDBSheet.Enabled = False
             FormDisabled = False
             ' Delete key sets column values to empty
         ElseIf e.KeyCode = Keys.Delete Then
             If selRowIndex >= 0 Then
                 ' avoid setting tick-boxes and type column to empty...
                 If selColIndex <> 0 And Not (selColIndex >= 4 And selColIndex <= 6) Then DBSheetCols.Rows(selRowIndex).Cells().Item(selColIndex).Value = ""
+                assignDBSheet.Enabled = False
             End If
             ' shortcut for move up
         ElseIf e.KeyCode = Keys.Up And DBSheetCols.SelectedRows.Count > 0 Then
@@ -477,13 +480,15 @@ Public Class DBSheetCreateForm
         Catch ex As System.Exception
             UserMsg("Exception in moveRow: " + ex.Message)
         End Try
+        assignDBSheet.Enabled = False
         FormDisabled = False
     End Sub
     ''' <summary>(re)generates the lookup query for active row/cell</summary>
     ''' <param name="sender"></param>
     ''' <param name="e"></param>
     Private Sub RegenerateThisLookupQuery_Click(sender As Object, e As EventArgs) Handles RegenerateThisLookupQuery.Click
         regenLookupForRow(selRowIndex)
+        assignDBSheet.Enabled = False
         DBSheetCols.AutoResizeColumns()
     End Sub
 
@@ -523,6 +528,7 @@ Public Class DBSheetCreateForm
                 If retval = MsgBoxResult.Yes Then DBSheetCols.Rows(i).Cells("lookup").Value = ""
             End If
         Next
+        assignDBSheet.Enabled = False
         DBSheetCols.AutoResizeColumns()
     End Sub
 
@@ -611,7 +617,7 @@ Public Class DBSheetCreateForm
             End Try
             tableSchemaReader.Close()
             FormDisabled = False
-            ' after changing the column no more change to table allowed !!
+            ' after changing the columns no more change to table allowed !!
             TableEditable(False)
         Catch ex As System.Exception
             UserMsg("Exception in addAllFields_Click: " + ex.Message)
@@ -932,6 +938,7 @@ Public Class DBSheetCreateForm
                 .Filter = "XML files (*.xml)|*.xml",
                 .RestoreDirectory = True
             }
+            Dim loadOK As Boolean = True
             Dim result As DialogResult = openFileDialog1.ShowDialog()
             If result = Windows.Forms.DialogResult.OK Then
                 ' remember path for possible storing in DBSheetParams
@@ -967,13 +974,15 @@ Public Class DBSheetCreateForm
                     newRow.outer = DBSheetConfig.getEntry("outer", DBSheetColumnDef) <> ""
                     newRow.primkey = DBSheetConfig.getEntry("primkey", DBSheetColumnDef) <> ""
                     If Not TableDataTypes.ContainsKey(newRow.name) Then
-                        UserMsg("couldn't find type information for field " + newRow.name + " in database (maybe wrong non null-able information for field in definition) !", "DBSheet Definition Error")
-                        Exit Sub
-                    End If
-                    newRow.type = TableDataTypes(newRow.name)
-                    If newRow.type = "" Then
-                        UserMsg("empty type information for field " + newRow.name + " in database !", "DBSheet Definition Error")
-                        Exit Sub
+                        UserMsg("couldn't retrieve information for field " + newRow.name + " in database (maybe wrong non null-able information for field in definition) !", "DBSheet Definition Error")
+                        loadOK = False
+                        Continue For
+                    Else
+                        newRow.type = TableDataTypes(newRow.name)
+                        If newRow.type = "" Then
+                            UserMsg("empty type information for field " + newRow.name + " in database !", "DBSheet Definition Error")
+                            loadOK = False
+                        End If
                     End If
                     Dim sortMode As String = DBSheetConfig.getEntry("sort", DBSheetColumnDef)
                     ' legacy naming: Ascending/Descending
@@ -997,7 +1006,7 @@ Public Class DBSheetCreateForm
                 DBSheetColsEditable(True)
                 saveEnabled(True)
                 setLinkLabel(currentFilepath)
-                assignDBSheet.Enabled = True
+                If loadOK Then assignDBSheet.Enabled = True
             End If
         Catch ex As System.Exception
             UserMsg("Exception in loadDefs_Click: " + ex.Message)
@@ -1035,7 +1044,8 @@ Public Class DBSheetCreateForm
                 }
                 Dim result As DialogResult = saveFileDialog1.ShowDialog()
                 If result = Windows.Forms.DialogResult.OK Then
-                    setLinkLabel(saveFileDialog1.FileName)
+                    currentFilepath = saveFileDialog1.FileName
+                    setLinkLabel(currentFilepath)
                 Else
                     Exit Sub
                 End If
@@ -1049,13 +1059,14 @@ Public Class DBSheetCreateForm
         End Try
     End Sub
 
+    Private linklabelToolTip As System.Windows.Forms.ToolTip
     ''' <summary>sets current definition file path hyperlink label. Displayed is only the filename, full path is stored in tag and visible in tooltip</summary>
-    ''' <param name="currentFilepath">definition file path</param>
-    Private Sub setLinkLabel(currentFilepath As String)
-        CurrentFileLinkLabel.Text = Strings.Mid(currentFilepath, InStrRev(currentFilepath, "\") + 1)
-        CurrentFileLinkLabel.Tag = currentFilepath
-        Dim ToolTip As System.Windows.Forms.ToolTip = New System.Windows.Forms.ToolTip()
-        ToolTip.SetToolTip(CurrentFileLinkLabel, currentFilepath)
+    ''' <param name="filepath">definition file path</param>
+    Private Sub setLinkLabel(filepath As String)
+        CurrentFileLinkLabel.Text = Strings.Mid(filepath, InStrRev(filepath, "\") + 1)
+        CurrentFileLinkLabel.Tag = filepath
+        If IsNothing(linklabelToolTip) Then linklabelToolTip = New System.Windows.Forms.ToolTip()
+        linklabelToolTip.SetToolTip(CurrentFileLinkLabel, filepath)
     End Sub
 
     ''' <summary>creates xml DBsheet parameter string from the data entered in theDBSheetCreateForm</summary>
@@ -1181,6 +1192,14 @@ Public Class DBSheetCreateForm
         Next
     End Function
 
+    Private Sub Query_TextChanged(sender As Object, e As EventArgs) Handles Query.TextChanged
+        assignDBSheet.Enabled = False
+    End Sub
+
+    Private Sub WhereClause_TextChanged(sender As Object, e As EventArgs) Handles WhereClause.TextChanged
+        assignDBSheet.Enabled = False
+    End Sub
+
 #End Region
 End Class