Merge pull request #7 from gmarginet/4-feature-request-give-the-user-the-possibility-to-generate-a-dto-class-for-the-result-of-a-query

4 feature request give the user the possibility to generate a dto class for the result of a query

Author: gmarginet

README.md

@@ -36,6 +36,11 @@ The connection string can be set in the .csproj file you just added the sql file
 
 ![image](https://github.com/gmarginet/SqlQueryTools/blob/master/art/ConnectionString.png?raw=true)
 
+As of version 1.4 you can use the the properties window to edit the connection string, you just need to select the project file in the sollution explorer and open the properties window.
+
+![image](https://github.com/gmarginet/SqlQueryTools/blob/master/art/ConnectionString_PropertiesWindow.png?raw=true)
+
+
 Now you can start writing your sql query.
 You can remove all comments but if you use parameters in your query you should put the parameter declarations above the 'End Of Parameter Declaration' marker.
 And your actual query below the marker.
@@ -62,10 +67,39 @@ The solution explorer will now look like this.
 ![image](https://github.com/gmarginet/SqlQueryTools/blob/master/art/SolutionExplorer.png?raw=true)
 
 If you don't like the file suffixes or the parameter declaration marker.
-These can be changed via 'Tools/Options/SqlQueryTools
+These can be changed via 'Tools/Options/SqlQueryTools'
 
 ![image](https://github.com/gmarginet/SqlQueryTools/blob/master/art/Options.png?raw=true)
 
+### Parameters
+
+By default SqlQueryTools was generating const fields for every parameter that you declared in the parameter declaration section.
+
+As of version 1.4 this can be turned of in the properties window while the sql file is selected in the solution explorer.
+
+![image](https://github.com/gmarginet/SqlQueryTools/blob/master/art/Sql_ParametersWindow.png?raw=true)
+
+In 'Tools/Options/SqlQueryTools' you can change the default for new files that are created with the SqlQueryTools 'Add Sql File' context menu item.
+
+![image](https://github.com/gmarginet/SqlQueryTools/blob/master/art/Options_Extra.png?raw=true)
+
+### Poco class
+
+From version 1.4 you can also ask SqlQueryTools to generate a poco class for the result that you get back from your query.
+
+Lets use the following sql as an example
+
+![image](https://github.com/gmarginet/SqlQueryTools/blob/master/art/ExampleSql_Poco.png?raw=true)
+
+The code generated for this sql with 'Generate Poco' turned on would be the following:
+
+![image](https://github.com/gmarginet/SqlQueryTools/blob/master/art/ExampleCode_Poco.png?raw=true)
+
+You can turn on this feature at sql file level by using the properties window of the file, or change the default for new files via 'Tools/Options/SqlQueryTools'.
+
+
+
+
 ### License
 
 MIT

art/ConnectionString_PropertiesWindow.png

@@ -26,9 +26,9 @@ jobs:
     displayName: 'Restore nuget packages for SqlQueryTools solution'
     inputs:
       command: 'restore'
-      restoreSolution: '**/SqlQueryTools.sln'
+      restoreSolution: 'src/SqlQueryTools.sln'
       feedsToUse: 'config'
-      nugetConfigPath: '**/NuGet.config'
+      nugetConfigPath: 'src/NuGet.config'
 
   - task: VSBuild@1
     displayName: 'Build SqlQueryTools solution'
@@ -164,4 +164,4 @@ jobs:
         $publishManifestPath = Resolve-Path $(Build.StagingDirectory)\Artifact\publish.extension.manifest.json
         $Installation = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -prerelease -format json | ConvertFrom-Json
         $vsixPublisher = Join-Path -Path $Installation.installationPath -ChildPath "VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe" -Resolve
-        & $vsixPublisher publish -payload $payloadPath -publishManifest $publishManifestPath -personalAccessToken $pat -ignoreWarnings "VSIXValidatorWarning01,VSIXValidatorWarning02,VSIXValidatorWarning08"
+        & $vsixPublisher publish -payload $payloadPath -publishManifest $publishManifestPath -personalAccessToken $pat -ignoreWarnings "VSIXValidatorWarning01,VSIXValidatorWarning02,VSIXValidatorWarning08"

art/ExampleCode_Poco.png

@@ -7,8 +7,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlQueryTools", "SqlQueryTo
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CECF109E-D547-4A4E-B312-056E93D989D2}"
 	ProjectSection(SolutionItems) = preProject
-		..\LICENSE = ..\LICENSE
+		..\publish.extension.manifest.json = ..\publish.extension.manifest.json
 		..\README.md = ..\README.md
+		..\sqlQueryTools-CI-CD.yml = ..\sqlQueryTools-CI-CD.yml
 	EndProjectSection
 EndProject
 Global

art/ExampleSql_Poco.png

@@ -15,14 +15,15 @@ internal sealed class AddSqlFileCommand : BaseCommand<AddSqlFileCommand>
         protected override Task InitializeCompletedAsync()
         {
             Command.Supported = false;
+            
             return base.InitializeCompletedAsync();
         }
 
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
             var solutionExplorer = await VS.Windows.GetSolutionExplorerWindowAsync();
-
-            var selectedItemList = (await solutionExplorer.GetSelectionAsync()).ToList();
+            var selectedItems = await solutionExplorer.GetSelectionAsync();
+            var selectedItemList = selectedItems.ToList();
             if (selectedItemList.Count != 1
                 || selectedItemList[0].Type != SolutionItemType.PhysicalFile
                 || selectedItemList[0].Name.EndsWith(".cs", StringComparison.InvariantCultureIgnoreCase) == false)
@@ -31,7 +32,7 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
                 await OutputPane.WriteLineAsync("Sql file can not be added, please select a single .cs file.");
                 return;
             }
-            var selectedPhisicalFile = selectedItemList.First() as PhysicalFile;
+            var selectedPhisicalFile = selectedItemList[0] as PhysicalFile;
 
             var project = selectedPhisicalFile.ContainingProject;
             if (project == null)
@@ -73,10 +74,19 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
 
             await project.AddNestedFileAsync(newFileFullName, selectedPhisicalFile);
 
+            var newPhisicalFile = project.GetPhysicalFile(newFileFullName);
+            if (newPhisicalFile != null)
+            {
+                await newPhisicalFile.TrySetGenerateParameterNamesAsync(options.GenerateParameterNames);
+                await newPhisicalFile.TrySetGeneratePocoClassAsync(options.GeneratePocoClass);
+            }
+
             await VS.Documents.OpenAsync(newFileFullName);
 
             await OutputPane.ActivateAsync();
             await OutputPane.WriteLineAsync($"Successfully added sql file '{newFileFullName}'.");
+            await OutputPane.WriteLineAsync();
+            await OutputPane.WriteLineAsync($"Do you like this extension? Help spread the word by leaving a review on https://marketplace.visualstudio.com/items?itemName=GertMarginet.SqlQueryTools&ssr=false#review-details");
         }
     }
 }

art/Options_Extra.png

@@ -1,10 +1,10 @@
 <Window x:Class="SqlQueryTools.Dialogs.FileNameDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:SqlQueryTools.Dialogs"
+    xmlns:toolkit="clr-namespace:Community.VisualStudio.Toolkit;assembly=Community.VisualStudio.Toolkit"
     Title="Add new sql file" Height="250" Width="450" ResizeMode="NoResize" ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen" SizeToContent="Width"
-    local:VsTheme.UseVsTheme="True">
+    toolkit:Themes.UseVsTheme="True">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
@@ -40,7 +40,7 @@
         <TextBox Grid.Row="2" Grid.Column="1"
                  Name="tFileName" TextChanged="FileName_TextChanged"
                  VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Stretch"
-                 Height="23" TextWrapping="Wrap" MinWidth="210" />
+                 TextWrapping="Wrap" MinWidth="210" />
 
         <Button Grid.Row="2" Grid.Column="2"
                 Name="bAddFile" IsEnabled="False" Content="Add file" Click="AddFile_Click"