Fixed the concat on join procedure for prefix string

Author: tduguid

CS/Scripts/Formula.cs

@@ -1395,7 +1395,7 @@ public static void PlSqlMergeValues()
                     Ribbon.AppVariables.ScriptRange += "MERGE INTO " + tableAlias + " AS T" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "USING " + tableAliasTemp + " AS S" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "ON --< Update the join to the correct unique key for the table" + Environment.NewLine;
-                    Ribbon.AppVariables.ScriptRange += Ribbon.ConcatenateColumnNamesJoin(tbl.Range, "T", "S") + "WHEN NOT MATCHED" + Environment.NewLine;
+                    Ribbon.AppVariables.ScriptRange += Ribbon.ConcatenateColumnNamesJoin(tbl.Range, "T", "S", "AND") + "WHEN NOT MATCHED" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "THEN INSERT" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "(" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += Ribbon.ConcatenateColumnNames(tbl.Range, "", "[", "]") + Environment.NewLine;
@@ -1406,7 +1406,7 @@ public static void PlSqlMergeValues()
                     Ribbon.AppVariables.ScriptRange += ")" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "WHEN MATCHED" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "THEN UPDATE SET" + Environment.NewLine;
-                    Ribbon.AppVariables.ScriptRange += Ribbon.ConcatenateColumnNamesJoin(tbl.Range, "T", "S") + "--WHEN NOT MATCHED THEN DELETE WHERE --< You may want to add a WHERE clause here" + Environment.NewLine + Environment.NewLine;
+                    Ribbon.AppVariables.ScriptRange += Ribbon.ConcatenateColumnNamesJoin(tbl.Range, "T", "S", ",") + "--WHEN NOT MATCHED THEN DELETE WHERE --< You may want to add a WHERE clause here" + Environment.NewLine + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "ROLLBACK;" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "--COMMIT;" + Environment.NewLine + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "END;";
@@ -2105,7 +2105,7 @@ public static void TSqlMergeValues()
                     Ribbon.AppVariables.ScriptRange += "MERGE " + tableAlias + " AS T" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "USING " + tableAliasTemp + " AS S" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "ON --< Update the join to the correct unique key for the table" + Environment.NewLine;
-                    Ribbon.AppVariables.ScriptRange += Ribbon.ConcatenateColumnNamesJoin(tbl.Range, "T", "S") + "WHEN NOT MATCHED BY TARGET" + Environment.NewLine;
+                    Ribbon.AppVariables.ScriptRange += Ribbon.ConcatenateColumnNamesJoin(tbl.Range, "T", "S", "AND ") + "WHEN NOT MATCHED BY TARGET" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "THEN INSERT" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "(" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "   " + Ribbon.ConcatenateColumnNames(tbl.Range, "", "[", "]") + Environment.NewLine;
@@ -2116,7 +2116,7 @@ public static void TSqlMergeValues()
                     Ribbon.AppVariables.ScriptRange += ")" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "WHEN MATCHED" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "THEN UPDATE SET" + Environment.NewLine;
-                    Ribbon.AppVariables.ScriptRange += Ribbon.ConcatenateColumnNamesJoin(tbl.Range, "T", "S") + "--WHEN NOT MATCHED BY SOURCE --< You may want to add a WHERE clause here" + Environment.NewLine;
+                    Ribbon.AppVariables.ScriptRange += Ribbon.ConcatenateColumnNamesJoin(tbl.Range, "T", "S", ", ") + "--WHEN NOT MATCHED BY SOURCE --< You may want to add a WHERE clause here" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "--THEN DELETE" + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "OUTPUT @@SERVERNAME AS [Server Name], DB_NAME() AS [Database Name], $action, inserted.*, deleted.*;" + Environment.NewLine + Environment.NewLine;
                     Ribbon.AppVariables.ScriptRange += "ROLLBACK TRANSACTION;" + Environment.NewLine;

CS/Scripts/Ribbon.cs

@@ -1362,8 +1362,9 @@ public static string ConcatenateColumnNames(Excel.Range rng, string tableAliasNa
         /// <param name="rng">Represents the Excel Range value</param>
         /// <param name="tableAliasNameTarget">Table alias used to prefix column names</param>
         /// <param name="tableAliasNameSource">Table alias used to prefix column names</param>
+        /// <param name="joinPrefix">Used for update or table join</param>
         /// <returns>A method that returns a string of the column names</returns>
-        public static string ConcatenateColumnNamesJoin(Excel.Range rng, string tableAliasNameTarget, string tableAliasNameSource)
+        public static string ConcatenateColumnNamesJoin(Excel.Range rng, string tableAliasNameTarget, string tableAliasNameSource, string joinPrefix)
         {
             try
             {
@@ -1372,10 +1373,10 @@ public static string ConcatenateColumnNamesJoin(Excel.Range rng, string tableAli
                 {
                     if (rng.Columns.EntireColumn[i].Hidden == false)
                     {
-                        columnNames = columnNames + ", " + tableAliasNameTarget + ".[" + ((Excel.Range)rng.Cells[1, i]).Value2 + "] = " + tableAliasNameSource + ".[" + ((Excel.Range)rng.Cells[1, i]).Value2 + "]" + Environment.NewLine;
+                        columnNames = columnNames + joinPrefix + tableAliasNameTarget + ".[" + ((Excel.Range)rng.Cells[1, i]).Value2 + "] = " + tableAliasNameSource + ".[" + ((Excel.Range)rng.Cells[1, i]).Value2 + "]" + Environment.NewLine;
                     }
                 }
-                columnNames = "  " + columnNames.Substring(2, columnNames.Length - 2);
+                columnNames = new string(' ', joinPrefix.Length) + columnNames.Substring(joinPrefix.Length, columnNames.Length - joinPrefix.Length);
                 return columnNames;
             }
             catch (Exception)