Skip to content

Commit 8fb2424

Browse files
PiJoCoderPiJoCoder
committed
Merge branch 'asavioli-ansavio_add_columns_dm_db_stats_prop'
2 parents db7fdc4 + 82de290 commit 8fb2424

File tree

5 files changed

+47
-28
lines changed

5 files changed

+47
-28
lines changed

‎RowsetImportEngine/TextRowsets.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,12 +1612,16 @@
16121612
<Rowset name="tbl_resource_governor_workload_groups" enabled="True" identifier="-- sys.resource_governor_workload_groups --" type="RowsetImportEngine.TextRowset">
16131613
<KnownColumns>
16141614
<Column name="group_id" type="RowsetImportEngine.IntColumn" />
1615-
<Column name="request_max_memory_grant_percent" type="RowsetImportEngine.IntColumn" />
1615+
<Column name="name" type="RowsetImportEngine.NVarCharColumn" />
1616+
<Column name="importance" type="RowsetImportEngine.NVarCharColumn" />
1617+
<Column name="request_max_memory_grant_percent" type="RowsetImportEngine.IntColumn" />
16161618
<Column name="request_max_cpu_time_sec" type="RowsetImportEngine.IntColumn" />
16171619
<Column name="request_memory_grant_timeout_sec" type="RowsetImportEngine.IntColumn" />
16181620
<Column name="max_dop" type="RowsetImportEngine.IntColumn" />
16191621
<Column name="group_max_requests" type="RowsetImportEngine.IntColumn" />
16201622
<Column name="pool_id" type="RowsetImportEngine.IntColumn" />
1623+
<Column name="external_pool_id" type="RowsetImportEngine.IntColumn" />
1624+
<Column name="request_max_memory_grant_percent_numeric" type="RowsetImportEngine.FloatColumn" />
16211625
<Column name="statistics_start_time" type="RowsetImportEngine.DateTimeColumn" />
16221626
<Column name="total_request_count" type="RowsetImportEngine.BigIntColumn" />
16231627
<Column name="total_queued_request_count" type="RowsetImportEngine.BigIntColumn" />
@@ -1765,18 +1769,22 @@
17651769
<Column name="DiagDate" type="RowsetImportEngine.DateTimeColumn" />
17661770
</Rowset>
17671771

1768-
<Rowset name="tbl_dm_db_stats_properties" enabled="true" identifier="-sys.dm_db_stats_properties-" type="RowsetImportEngine.TextRowset">
1769-
<Column name="database_id" type="RowsetImportEngine.IntColumn" />
1772+
<Rowset name="tbl_dm_db_stats_properties" enabled="true" identifier="-- sys.dm_db_stats_properties --" type="RowsetImportEngine.TextRowset">
1773+
<Column name="rownum" type="RowsetImportEngine.BigIntColumn" length="24" valuetoken="ROWNUMBER" />
1774+
<Column name="database_id" type="RowsetImportEngine.IntColumn" />
17701775
<Column name="database_name" type="RowsetImportEngine.NVarCharColumn" />
1776+
<Column name="schema_name" type="RowsetImportEngine.NVarCharColumn" />
17711777
<Column name="object_name" type="RowsetImportEngine.NVarCharColumn" />
17721778
<Column name="object_id" type="RowsetImportEngine.IntColumn" />
17731779
<Column name="stats_id" type="RowsetImportEngine.IntColumn" />
1780+
<Column name="statistics_name" type="RowsetImportEngine.NVarCharColumn" />
17741781
<Column name="last_updated" type="RowsetImportEngine.DateTimeColumn" />
17751782
<Column name="rows" type="RowsetImportEngine.IntColumn" />
17761783
<Column name="rows_sampled" type="RowsetImportEngine.IntColumn" />
17771784
<Column name="steps" type="RowsetImportEngine.IntColumn" />
17781785
<Column name="unfiltered_rows" type="RowsetImportEngine.IntColumn" />
17791786
<Column name="modification_counter" type="RowsetImportEngine.IntColumn" />
1787+
<Column name="persisted_sample_percent" type="RowsetImportEngine.FloatColumn" />
17801788
</Rowset>
17811789

17821790

@@ -2184,8 +2192,12 @@
21842192
<Column name="key_algorithm" type="RowsetImportEngine.NVarCharColumn"/>
21852193
<Column name="key_length" type="RowsetImportEngine.IntColumn"/>
21862194
<Column name="encryptor_thumbprint" type="RowsetImportEngine.VarBinaryColumn"/>
2187-
<Column name="encryptor_type" type="RowsetImportEngine.NVarCharColumn"/>
21882195
<Column name="percent_complete" type="RowsetImportEngine.IntColumn"/>
2196+
<Column name="encryptor_type" type="RowsetImportEngine.NVarCharColumn"/>
2197+
<Column name="encryption_state_desc" type="RowsetImportEngine.NVarCharColumn"/>
2198+
<Column name="encryption_scan_state" type="RowsetImportEngine.IntColumn"/>
2199+
<Column name="encryption_scan_state_desc" type="RowsetImportEngine.NVarCharColumn"/>
2200+
<Column name="encryption_scan_modify_date" type="RowsetImportEngine.DateTimeColumn"/>
21892201
</KnownColumns>
21902202
</Rowset>
21912203

‎sqlnexus/TextRowsets.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,12 +1612,16 @@
16121612
<Rowset name="tbl_resource_governor_workload_groups" enabled="True" identifier="-- sys.resource_governor_workload_groups --" type="RowsetImportEngine.TextRowset">
16131613
<KnownColumns>
16141614
<Column name="group_id" type="RowsetImportEngine.IntColumn" />
1615-
<Column name="request_max_memory_grant_percent" type="RowsetImportEngine.IntColumn" />
1615+
<Column name="name" type="RowsetImportEngine.NVarCharColumn" />
1616+
<Column name="importance" type="RowsetImportEngine.NVarCharColumn" />
1617+
<Column name="request_max_memory_grant_percent" type="RowsetImportEngine.IntColumn" />
16161618
<Column name="request_max_cpu_time_sec" type="RowsetImportEngine.IntColumn" />
16171619
<Column name="request_memory_grant_timeout_sec" type="RowsetImportEngine.IntColumn" />
16181620
<Column name="max_dop" type="RowsetImportEngine.IntColumn" />
16191621
<Column name="group_max_requests" type="RowsetImportEngine.IntColumn" />
16201622
<Column name="pool_id" type="RowsetImportEngine.IntColumn" />
1623+
<Column name="external_pool_id" type="RowsetImportEngine.IntColumn" />
1624+
<Column name="request_max_memory_grant_percent_numeric" type="RowsetImportEngine.FloatColumn" />
16211625
<Column name="statistics_start_time" type="RowsetImportEngine.DateTimeColumn" />
16221626
<Column name="total_request_count" type="RowsetImportEngine.BigIntColumn" />
16231627
<Column name="total_queued_request_count" type="RowsetImportEngine.BigIntColumn" />
@@ -1765,18 +1769,22 @@
17651769
<Column name="DiagDate" type="RowsetImportEngine.DateTimeColumn" />
17661770
</Rowset>
17671771

1768-
<Rowset name="tbl_dm_db_stats_properties" enabled="true" identifier="-sys.dm_db_stats_properties-" type="RowsetImportEngine.TextRowset">
1769-
<Column name="database_id" type="RowsetImportEngine.IntColumn" />
1772+
<Rowset name="tbl_dm_db_stats_properties" enabled="true" identifier="-- sys.dm_db_stats_properties --" type="RowsetImportEngine.TextRowset">
1773+
<Column name="rownum" type="RowsetImportEngine.BigIntColumn" length="24" valuetoken="ROWNUMBER" />
1774+
<Column name="database_id" type="RowsetImportEngine.IntColumn" />
17701775
<Column name="database_name" type="RowsetImportEngine.NVarCharColumn" />
1776+
<Column name="schema_name" type="RowsetImportEngine.NVarCharColumn" />
17711777
<Column name="object_name" type="RowsetImportEngine.NVarCharColumn" />
17721778
<Column name="object_id" type="RowsetImportEngine.IntColumn" />
17731779
<Column name="stats_id" type="RowsetImportEngine.IntColumn" />
1780+
<Column name="statistics_name" type="RowsetImportEngine.NVarCharColumn" />
17741781
<Column name="last_updated" type="RowsetImportEngine.DateTimeColumn" />
17751782
<Column name="rows" type="RowsetImportEngine.IntColumn" />
17761783
<Column name="rows_sampled" type="RowsetImportEngine.IntColumn" />
17771784
<Column name="steps" type="RowsetImportEngine.IntColumn" />
17781785
<Column name="unfiltered_rows" type="RowsetImportEngine.IntColumn" />
17791786
<Column name="modification_counter" type="RowsetImportEngine.IntColumn" />
1787+
<Column name="persisted_sample_percent" type="RowsetImportEngine.FloatColumn" />
17801788
</Rowset>
17811789

17821790

@@ -2184,8 +2192,12 @@
21842192
<Column name="key_algorithm" type="RowsetImportEngine.NVarCharColumn"/>
21852193
<Column name="key_length" type="RowsetImportEngine.IntColumn"/>
21862194
<Column name="encryptor_thumbprint" type="RowsetImportEngine.VarBinaryColumn"/>
2187-
<Column name="encryptor_type" type="RowsetImportEngine.NVarCharColumn"/>
21882195
<Column name="percent_complete" type="RowsetImportEngine.IntColumn"/>
2196+
<Column name="encryptor_type" type="RowsetImportEngine.NVarCharColumn"/>
2197+
<Column name="encryption_state_desc" type="RowsetImportEngine.NVarCharColumn"/>
2198+
<Column name="encryption_scan_state" type="RowsetImportEngine.IntColumn"/>
2199+
<Column name="encryption_scan_state_desc" type="RowsetImportEngine.NVarCharColumn"/>
2200+
<Column name="encryption_scan_modify_date" type="RowsetImportEngine.DateTimeColumn"/>
21892201
</KnownColumns>
21902202
</Rowset>
21912203

‎sqlnexus/app.config

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="sqlnexus.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
5+
<section name="sqlnexus.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
66
</sectionGroup>
77
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
8-
<section name="sqlnexus.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
8+
<section name="sqlnexus.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
99
</sectionGroup>
1010
</configSections>
1111
<appSettings>
1212
<!-- User application and configured property settings go here.-->
1313
<!-- Example: <add key="settingName" value="settingValue"/> -->
14-
<add key="rbWindows.Checked" value="True"/>
15-
<add key="ClientSettingsProvider.ServiceUri" value=""/>
14+
<add key="rbWindows.Checked" value="True" />
15+
<add key="ClientSettingsProvider.ServiceUri" value="" />
1616
</appSettings>
1717
<userSettings>
1818
<sqlnexus.Properties.Settings>
@@ -71,20 +71,20 @@
7171
</sqlnexus.Properties.Settings>
7272
</applicationSettings>
7373
<startup>
74-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
74+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
7575
</startup>
7676
<runtime>
77-
<loadFromRemoteSources enabled="true"/>
77+
<loadFromRemoteSources enabled="true" />
7878
</runtime>
7979
<system.web>
8080
<membership defaultProvider="ClientAuthenticationMembershipProvider">
8181
<providers>
82-
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
82+
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
8383
</providers>
8484
</membership>
8585
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
8686
<providers>
87-
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
87+
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
8888
</providers>
8989
</roleManager>
9090
</system.web>

‎sqlnexus/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.ReportingServices.ReportViewerControl.WebForms.Preview" version="130.1700.305" targetFramework="net461" />
4+
</packages>

‎sqlnexus/sqlnexus.csproj

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<ItemGroup>
8383
<Reference Include="Microsoft.ReportViewer.WinForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8484
<SpecificVersion>False</SpecificVersion>
85-
<HintPath>..\..\..\..\..\..\Windows\assembly\GAC_MSIL\Microsoft.ReportViewer.WinForms\13.0.0.0__89845dcd8080cc91\Microsoft.ReportViewer.WinForms.dll</HintPath>
85+
<HintPath>..\..\..\..\..\..\Windows\assembly\GAC_MSIL\Microsoft.ReportViewer.WinForms\13.0.0.0__89845dcd8080cc91\Microsoft.ReportViewer.WinForms.DLL</HintPath>
8686
</Reference>
8787
<Reference Include="Microsoft.VisualBasic" />
8888
<Reference Include="System" />
@@ -354,6 +354,7 @@
354354
<Content Include="PostProcess.cmd">
355355
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
356356
</Content>
357+
<None Include="packages.config" />
357358
<None Include="Properties\Settings.settings">
358359
<Generator>SettingsSingleFileGenerator</Generator>
359360
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -697,16 +698,6 @@
697698
<IncludeHash>True</IncludeHash>
698699
<FileType>File</FileType>
699700
</PublishFile>
700-
<PublishFile Include="Microsoft.ReportViewer.WinForms">
701-
<Visible>False</Visible>
702-
<Group>
703-
</Group>
704-
<TargetPath>
705-
</TargetPath>
706-
<PublishState>Exclude</PublishState>
707-
<IncludeHash>True</IncludeHash>
708-
<FileType>Assembly</FileType>
709-
</PublishFile>
710701
<PublishFile Include="Microsoft.SqlServer.Types">
711702
<Visible>False</Visible>
712703
<Group>

0 commit comments

Comments
 (0)