Merge branch 'release/1.2.0'

abbgrade · Aug 24, 2023 · db71b18 · db71b18
2 parents 729d1ed + 872c6e5
commit db71b18
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.0] - 2023-08-24
+
+### Changed
+
+- Verbose script execution prints the filepath.
+
 ## [1.1.0] - 2022-08-18
 
 ### Added

diff --git a/src/PsSmo/InvokeCommandCommand.cs b/src/PsSmo/InvokeCommandCommand.cs
@@ -45,7 +45,7 @@ protected override void ProcessRecord()
                     break;
 
                 case "File":
-                    WriteVerbose("Execute SQL script from file.");
+                    WriteVerbose($"Execute SQL script from file '{ InputFile.FullName }'.");
                     Text = File.ReadAllText(InputFile.FullName);
                     break;
 
@@ -54,14 +54,19 @@ protected override void ProcessRecord()
             }
             try
             {
-                Instance.ConnectionContext.ExecuteNonQuery(sqlCommand: processSqlCmdText(Text, processVariables(Variables)));
-            } catch (Exception ex)
+                Instance.ConnectionContext.ExecuteNonQuery(sqlCommand: ProcessSqlCmdText(Text, ProcessVariables(Variables)));
+            }
+            catch (PipelineStoppedException)
+            {
+                throw;
+            }
+            catch (Exception ex)
             {
                 WriteError(new ErrorRecord(ex, ex.GetType().Name, ErrorCategory.NotSpecified, Text));
             }
         }
 
-        private Dictionary<string, string> processVariables(Hashtable variables)
+        private static Dictionary<string, string> ProcessVariables(Hashtable variables)
         {
             var variableDictionary = new Dictionary<string, string>();
 
@@ -76,12 +81,9 @@ private Dictionary<string, string> processVariables(Hashtable variables)
             return variableDictionary;
         }
 
-        private string processSqlCmdText(string text, Dictionary<string, string> variables)
+        private string ProcessSqlCmdText(string text, Dictionary<string, string> variables)
         {
-            if (variables == null)
-            {
-                variables = new Dictionary<string, string>();
-            }
+            variables ??= new Dictionary<string, string>();
 
             var result = new List<string>();
             var variableRegex = new Regex(@"\$\((\w*)\)");

diff --git a/src/PsSmo/PsSmo.psd1 b/src/PsSmo/PsSmo.psd1
@@ -12,7 +12,7 @@
 RootModule = 'PsSmo.dll'
 
 # Version number of this module.
-ModuleVersion = '1.1.0'
+ModuleVersion = '1.2.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()